From d0e7f390478b7702d9c4cd00320652d6e5b2e60c Mon Sep 17 00:00:00 2001 From: Alex V <80408352+avsavsavs@users.noreply.github.com> Date: Tue, 4 Jan 2022 09:13:23 -0500 Subject: [PATCH 1/4] FAQ REBRANDING - NOT TO MERGE UNTIL ANNOUNCEMENT (#2022) * REBRANDING - NOT TO MERGE UNTIL ANNOUNCEMENT This PR rebrands all mentions to GnosisDAO, Gnosis, Gnosis Protocol or GPv2 to CoW Protocol & CowDAO. * Fix code style issues with Prettier * escape apostrophe Co-authored-by: Lint Action Co-authored-by: David W3stside --- src/custom/pages/Faq/index.tsx | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/custom/pages/Faq/index.tsx b/src/custom/pages/Faq/index.tsx index 1c2b06c66..5c9bf8c46 100644 --- a/src/custom/pages/Faq/index.tsx +++ b/src/custom/pages/Faq/index.tsx @@ -171,7 +171,7 @@ export default function Faq() {

General

What is CowSwap?

-

CowSwap is the first trading interface built on top of Gnosis Protocol v2.

+

CowSwap is the first trading interface built on top of CoW Protocol.

CowSwap is a Meta DEX aggregator that allows you to buy and sell tokens using gasless orders that are settled peer-to-peer among its users, or into any on-chain liquidity source while providing MEV protection. @@ -179,7 +179,7 @@ export default function Faq() {

What makes CowSwap a "Meta" DEX aggregator?

- Cowswap is built on top of the Gnosis protocol which matches trades via batch auctions for a variety of + Cowswap is built on top of the CoW Protocol which matches trades via batch auctions for a variety of on-chain liquidity sources.

@@ -187,7 +187,7 @@ export default function Faq() { pool/path offers the best price. It is thus essentially acting as a DexAggregator of the DexAggregators.

- In addition to that, before finding the best price for a trade from available on-chain liquidity, Gnosis + In addition to that, before finding the best price for a trade from available on-chain liquidity, CoW Protocol first seeks a coincidence of wants within the existing batch to offer an even better price than any pool can.

@@ -290,7 +290,7 @@ export default function Faq() {

As of August 11th, 2021, CowSwap is no longer in alpha and moves to a final, stable version. The underlying - Gnosis Protocol Smart contracts have been upgraded to integrate tightly with Balancer v2. + CoW Protocol Smart contracts have been upgraded to integrate tightly with Balancer v2.

@@ -357,9 +357,9 @@ export default function Faq() {

CowSwap can connect to all on-chain liquidity.

When CowSwap does not have enough CoWs (Coincidence of Wants) among the orders available for a batch, it - taps other AMMs’ liquidity to be able to settle the traders’ orders. Gnosis Protocol v2 can be connected to - any on-chain liquidity sources and can therefore enjoy the benefits of concentrating the fragmented - liquidity across decentralized finance. + taps other AMMs’ liquidity to be able to settle the traders’ orders. CoW Protocol can be connected to any + on-chain liquidity sources and can therefore enjoy the benefits of concentrating the fragmented liquidity + across decentralized finance.

How is CowSwap able to offer better prices? @@ -415,9 +415,9 @@ export default function Faq() { Smart Contract support for more information.

-

What are Gnosis Protocol v2 Solvers?

+

What are CoW Protocol's Solvers?

- In GPv2, instead of using a central operator or a constant function market maker to determine trade + In CoW Protocol, instead of using a central operator or a constant function market maker to determine trade settlements, the protocol uses a party called a "solver", who is the party in charge of providing the settlement solution to the batch auctions. Solvers compete against each other to submit the best possible batch settlement solution. Each time a solver submits a successful batch settlement solution, the @@ -427,16 +427,16 @@ export default function Faq() {

  1. To become a solver, an Ethereum address needs to deposit a bond in the form of tokens. Asset type and - amounts are pending to be defined by the GnosisDAO or GnosisProtocolDAO. + amounts are pending to be defined by the CowDAO.
  2. - Once the tokens have been staked (locked up), GnosisDAO/GnosisProtocolDAO must vote to approve or reject - the Ethereum address that will identify the solver. If the vote is successful, the solver Ethereum address - will be included in the allowlist (verification) solvers contract. + Once the tokens have been staked (locked up), CowDAO must vote to approve or reject the Ethereum address + that will identify the solver. If the vote is successful, the solver Ethereum address will be included in + the allowlist (verification) solvers contract.
  3. Additionally, a solver must have the technical knowledge to create the appropriate batch settlement - solutions, or take the risk of being slashed by the GnosisDAO/GnosisProtocolDAO for wrongdoing. + solutions, or take the risk of being slashed by the CowDAO for wrongdoing.

@@ -683,7 +683,7 @@ export default function Faq() {

When an order is executed, the settlement contract withdraws the sell amount from the trader’s token balance - via the GPv2 Vault Relayer (for more information read{' '} + via the CoW Protocol Vault Relayer (for more information read{' '} Smart Contract Architecture - ). In order to allow that to happen, the trader must first approve the GPv2 Vault Relayer contract to spend - tokens on their behalf. The smart contract logic ensures that no token can be spent without deliberately - signing an order for it. + ). In order to allow that to happen, the trader must first approve the CoW Protocol Vault Relayer contract + to spend tokens on their behalf. The smart contract logic ensures that no token can be spent without + deliberately signing an order for it.

From caafc51e5b380fe0d2880f0231b45e830becc3f6 Mon Sep 17 00:00:00 2001 From: Alex V <80408352+avsavsavs@users.noreply.github.com> Date: Tue, 4 Jan 2022 09:13:03 -0500 Subject: [PATCH 2/4] ABOUT REBRANDING - NOT TO MERGE UNTIL ANNOUNCEMENT (#2024) * REBRANDING - NOT TO MERGE UNTIL ANNOUNCEMENT This PR rebrands all mentions to GnosisDAO, Gnosis, Gnosis Protocol or GPv2 to CoW Protocol & CowDAO. * Update README.md * Update index.html * Update index.tsx * Update index.ts --- README.md | 2 +- public/index.html | 4 ++-- src/custom/constants/index.ts | 2 +- src/custom/pages/About/index.tsx | 2 +- src/custom/pages/App/index.tsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f286fd39d..912766902 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ It allows you to buy and sell tokens using gas-less orders that are settled peer - ENS Website (alternative): , or if you have MetaMask or an ENS compatible browser. - The website can also be run locally, or from IPFS. Every release will have an IPFS hash associated, available in the [Releases](https://github.com/gnosis/gp-swap-ui/releases) section. -- Docs: +- Docs: - Stats: - Twitter: [@gnosisPM](https://twitter.com/gnosisPM) - Reddit: [/r/gnosisPM](https://www.reddit.com/r/gnosisPM) diff --git a/public/index.html b/public/index.html index dfa9c88c8..20b969c41 100644 --- a/public/index.html +++ b/public/index.html @@ -60,7 +60,7 @@ @@ -69,4 +69,4 @@
- \ No newline at end of file + diff --git a/src/custom/constants/index.ts b/src/custom/constants/index.ts index f678f25b9..48660c248 100644 --- a/src/custom/constants/index.ts +++ b/src/custom/constants/index.ts @@ -79,7 +79,7 @@ export const XDAI_LOGO_URI = // 0.1 balance threshold export const LOW_NATIVE_BALANCE_THRESHOLD = new Fraction('1', '10') -export const DOCS_LINK = 'https://docs.cowswap.exchange' +export const DOCS_LINK = 'https://docs.cow.fi' export const CONTRACTS_CODE_LINK = 'https://github.com/gnosis/gp-v2-contracts' export const CODE_LINK = 'https://github.com/gnosis/gp-swap-ui' export const DISCORD_LINK = 'https://chat.cowswap.exchange' diff --git a/src/custom/pages/About/index.tsx b/src/custom/pages/About/index.tsx index 3f6ffa9b5..55a73a9e8 100644 --- a/src/custom/pages/About/index.tsx +++ b/src/custom/pages/About/index.tsx @@ -29,7 +29,7 @@ export default function About() { About -

CowSwap is the first trading interface built on top of Gnosis Protocol v2.

+

CowSwap is the first trading interface built on top of CoW Protocol.

It allows you to buy and sell tokens using gas-less orders that are settled peer-to-peer among its users or into any on-chain liquidity source while providing MEV protection. diff --git a/src/custom/pages/App/index.tsx b/src/custom/pages/App/index.tsx index 45a64b189..62ef7484e 100644 --- a/src/custom/pages/App/index.tsx +++ b/src/custom/pages/App/index.tsx @@ -80,7 +80,7 @@ export default function App() { - + Date: Thu, 6 Jan 2022 14:28:58 -0300 Subject: [PATCH 3/4] [Rebranding] Update Explorer FE and BE api URLs (#2047) * issue #2011 update explorer URL (Barn and prod only) * issue #2012 update explorer backend URLs * Revert BARN urls + update default urls + Add profile URL * Update .env.production Co-authored-by: Leandro Boscariol * Update src/custom/api/gnosisProtocol/api.ts Co-authored-by: Leandro Boscariol Co-authored-by: Leandro Boscariol --- .env.production | 10 +++++----- src/custom/api/gnosisProtocol/api.ts | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.env.production b/.env.production index 4479a7f3f..776c3452c 100644 --- a/.env.production +++ b/.env.production @@ -56,9 +56,9 @@ REACT_APP_PATH_REGEX_ENS="/ipfs" #REACT_APP_SENTRY_AUTH_TOKEN='' # API -#REACT_APP_API_URL_PROD_MAINNET=https://protocol-mainnet.gnosis.io/api -#REACT_APP_API_URL_PROD_RINKEBY=https://protocol-rinkeby.gnosis.io/api -#REACT_APP_API_URL_PROD_XDAI=https://protocol-xdai.gnosis.io/api +#REACT_APP_API_URL_PROD_MAINNET=https://api.cow.fi/mainnet/api +#REACT_APP_API_URL_PROD_RINKEBY=https://api.cow.fi/rinkeby/api +#REACT_APP_API_URL_PROD_XDAI=https://api.cow.fi/xdai/api #REACT_APP_API_URL_STAGING_MAINNET=https://protocol-mainnet.dev.gnosisdev.com/api #REACT_APP_API_URL_STAGING_RINKEBY=https://protocol-rinkeby.dev.gnosisdev.com/api #REACT_APP_API_URL_STAGING_XDAI=https://protocol-xdai.dev.gnosisdev.com/api @@ -66,8 +66,8 @@ REACT_APP_PATH_REGEX_ENS="/ipfs" # EXPLORER #REACT_APP_EXPLORER_URL_DEV=https://protocol-explorer.dev.gnosisdev.com #REACT_APP_EXPLORER_URL_STAGING=https://protocol-explorer.staging.gnosisdev.com -#REACT_APP_EXPLORER_URL_PROD=https://gnosis-protocol.io -#REACT_APP_EXPLORER_URL_BARN=https://barn.gnosis-protocol.io +#REACT_APP_EXPLORER_URL_PROD=https://explorer.cow.fi +#REACT_APP_EXPLORER_URL_BARN=https://barn.explorer.cow.fi # Enables mock mode (default = false) REACT_APP_MOCK=false diff --git a/src/custom/api/gnosisProtocol/api.ts b/src/custom/api/gnosisProtocol/api.ts index 2314dd79a..bf7a841e8 100644 --- a/src/custom/api/gnosisProtocol/api.ts +++ b/src/custom/api/gnosisProtocol/api.ts @@ -39,9 +39,9 @@ function getGnosisProtocolUrl(): Partial> { // Production, staging, ens, ... return { - [ChainId.MAINNET]: process.env.REACT_APP_API_URL_PROD_MAINNET || 'https://protocol-mainnet.gnosis.io/api', - [ChainId.RINKEBY]: process.env.REACT_APP_API_URL_PROD_RINKEBY || 'https://protocol-rinkeby.gnosis.io/api', - [ChainId.XDAI]: process.env.REACT_APP_API_URL_PROD_XDAI || 'https://protocol-xdai.gnosis.io/api', + [ChainId.MAINNET]: process.env.REACT_APP_API_URL_PROD_MAINNET || 'https://api.cow.fi/mainnet/api', + [ChainId.RINKEBY]: process.env.REACT_APP_API_URL_PROD_RINKEBY || 'https://api.cow.fi/rinkeby/api', + [ChainId.XDAI]: process.env.REACT_APP_API_URL_PROD_XDAI || 'https://api.cow.fi/xdai/api', } } @@ -55,8 +55,7 @@ function getProfileUrl(): Partial> { // Production, staging, ens, ... return { - [ChainId.MAINNET]: - process.env.REACT_APP_PROFILE_API_URL_STAGING_MAINNET || 'https://protocol-affiliate.gnosis.io/api', + [ChainId.MAINNET]: process.env.REACT_APP_PROFILE_API_URL_STAGING_MAINNET || 'https://api.cow.fi/affiliate/api', } } const STRATEGY_URL_BASE = 'https://raw.githubusercontent.com/gnosis/cowswap/configuration/config/strategies' From 8f58f260ecca41f6bf0fb76ca852d9972b87fc95 Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Thu, 6 Jan 2022 15:07:38 -0300 Subject: [PATCH 4/4] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a3637b8c..fedfcef1a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "CowSwap - Gnosis Protocol", "homepage": ".", "private": true, - "version": "1.8.0", + "version": "1.8.1-rc.0", "engines": { "node": ">=14.0.0" },