Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Hotfix 1.8.1 - Rebranding #2058

Merged
merged 4 commits into from
Jan 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ REACT_APP_PATH_REGEX_ENS="/ipfs"
#REACT_APP_SENTRY_AUTH_TOKEN='<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

# 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ It allows you to buy and sell tokens using gas-less orders that are settled peer
- ENS Website (alternative): <https://cowswap.eth.link>, or <https://cowswap.eth/> 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: <https://docs.cowswap.exchange>
- Docs: <https://docs.cow.fi>
- Stats: <https://dune.xyz/gnosis.protocol/Gnosis-Protocol-V2>
- Twitter: [@gnosisPM](https://twitter.com/gnosisPM)
- Reddit: [/r/gnosisPM](https://www.reddit.com/r/gnosisPM)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<ul>
<li><a href="https://cowswap.exchange/">Home | CowSwap</a></li>
<li><a href="https://chat.cowswap.exchange">Chat</a></li>
<li><a href="https://docs.cowswap.exchange">Docs</a></li>
<li><a href="https://docs.cow.fi">Docs</a></li>
<li><a href="https://dune.xyz/gnosis.protocol/Gnosis-Protocol-V2">Stats</a></li>
<li><a href="https://twitter.com/MEVprotection">Twitter (@MEVprotection)</a></li>
</ul>
Expand All @@ -69,4 +69,4 @@
<div id="root"></div>
</body>

</html>
</html>
9 changes: 4 additions & 5 deletions src/custom/api/gnosisProtocol/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ function getGnosisProtocolUrl(): Partial<Record<ChainId, string>> {

// 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',
}
}

Expand All @@ -55,8 +55,7 @@ function getProfileUrl(): Partial<Record<ChainId, string>> {

// 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'
Expand Down
2 changes: 1 addition & 1 deletion src/custom/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/custom/pages/About/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function About() {
<Title>About</Title>

<Content>
<p>CowSwap is the first trading interface built on top of Gnosis Protocol v2.</p>
<p>CowSwap is the first trading interface built on top of CoW Protocol.</p>
<p>
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.
Expand Down
2 changes: 1 addition & 1 deletion src/custom/pages/App/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default function App() {
<Route exact strict path="/terms-and-conditions" component={TermsAndConditions} />

<Route exact strict path="/chat" component={createRedirectExternal('https://chat.cowswap.exchange')} />
<Route exact strict path="/docs" component={createRedirectExternal('https://docs.cowswap.exchange')} />
<Route exact strict path="/docs" component={createRedirectExternal('https://docs.cow.fi')} />
<Route
exact
strict
Expand Down
36 changes: 18 additions & 18 deletions src/custom/pages/Faq/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,23 @@ export default function Faq() {
<Content>
<h2 id="general">General</h2>
<h3 id="what-is-cowswap">What is CowSwap?</h3>
<p>CowSwap is the first trading interface built on top of Gnosis Protocol v2.</p>
<p>CowSwap is the first trading interface built on top of CoW Protocol.</p>
<p>
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.
</p>

<h3 id="why-is-cowswap-a-meta-dex-aggregator">What makes CowSwap a &quot;Meta&quot; DEX aggregator?</h3>
<p>
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.
</p>
<p>
Trades can be settled via underlying on-chain AMMs directly or via DEX Aggregators, depending on which
pool/path offers the best price. It is thus essentially acting as a DexAggregator of the DexAggregators.
</p>
<p>
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.
</p>
Expand Down Expand Up @@ -290,7 +290,7 @@ export default function Faq() {

<p>
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.
</p>

<p>
Expand Down Expand Up @@ -357,9 +357,9 @@ export default function Faq() {
<p>CowSwap can connect to all on-chain liquidity.</p>
<p>
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.
</p>
<h3 id="how-is-cowswap-able-to-offer-better-prices-than-aggregators-themselves">
How is CowSwap able to offer better prices?
Expand Down Expand Up @@ -415,9 +415,9 @@ export default function Faq() {
<LinkScrollable href={'#smart-contract-support'}>Smart Contract support</LinkScrollable> for more
information.
</p>
<h3 id="what-are-gnosis-protocol-v2-solvers">What are Gnosis Protocol v2 Solvers?</h3>
<h3 id="what-are-gnosis-protocol-v2-solvers">What are CoW Protocol&apos;s Solvers?</h3>
<p>
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 &quot;solver&quot;, 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
Expand All @@ -427,16 +427,16 @@ export default function Faq() {
<ol>
<li>
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.
</li>
<li>
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.
</li>
<li>
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.
</li>
</ol>
<h3 id="what-interactions-can-i-encounter-when-using-Cowswap">
Expand Down Expand Up @@ -683,17 +683,17 @@ export default function Faq() {

<p>
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{' '}
<ExternalLink
href="https://github.com/gnosis/gp-v2-contracts/blob/main/src/contracts/GPv2VaultRelayer.sol"
target="_blank"
rel="noopener noreferrer"
>
Smart Contract Architecture
</ExternalLink>
). 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.
</p>

<h3 id="why-do-i-sign-a-message-instead-of-sending-a-transaction-to-place-an-order">
Expand Down