Skip to content

fix(tokens): use vault relayer address corr to env #7557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shoom3301 merged 12 commits into from
May 25, 2026
Merged

fix(tokens): use vault relayer address corr to env #7557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c6d3414
fix(tokens): use vault relayer address corr to env
shoom3301 May 21, 2026
87f72c8
ci: fix eslint rule
shoom3301 May 21, 2026
5b870eb
Merge branch 'develop' into fix/approve-vault-staging
elena-zh May 21, 2026
739dea6
chore: disable no-restricted-imports in tests
shoom3301 May 21, 2026
021d219
Merge remote-tracking branch 'origin/fix/approve-vault-staging' into …
shoom3301 May 21, 2026
1c00b8d
chore: fix lint
shoom3301 May 21, 2026
5af335a
chore: fix test
shoom3301 May 21, 2026
f0720d9
chore: fix lint
shoom3301 May 21, 2026
d7bdb1a
Merge branch 'develop' of https://github.com/cowprotocol/cowswap into…
shoom3301 May 25, 2026
9cf8cb1
chore: enforce eslint
shoom3301 May 25, 2026
1563dce
chore: fix lint
shoom3301 May 25, 2026
6584955
Merge branch 'develop' into fix/approve-vault-staging
fairlighteth May 25, 2026
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
1 change: 1 addition & 0 deletions apps/cowswap-frontend/src/common/hooks/useContract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from '@cowprotocol/common-const'
import { isEns, isProd, isStaging, COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS } from '@cowprotocol/common-utils'
import {
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS as COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS_PROD,
CowEnv,
SupportedChainId,
Expand Down
9 changes: 7 additions & 2 deletions apps/cowswap-frontend/src/legacy/components/Tokens/TokensTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ import { ReactNode, useCallback, useMemo } from 'react'
import iconEtherscanSrc from '@cowprotocol/assets/cow-swap/etherscan-icon.svg'
import { TokenWithLogo } from '@cowprotocol/common-const'
import { useTheme } from '@cowprotocol/common-hooks'
import { getBlockExplorerUrl, getIsNativeToken, isFractionFalsy } from '@cowprotocol/common-utils'
import { COW_PROTOCOL_VAULT_RELAYER_ADDRESS, MAX_UINT256, getAddressKey } from '@cowprotocol/cow-sdk'
import {
getBlockExplorerUrl,
getIsNativeToken,
isFractionFalsy,
COW_PROTOCOL_VAULT_RELAYER_ADDRESS,
} from '@cowprotocol/common-utils'
import { MAX_UINT256, getAddressKey } from '@cowprotocol/cow-sdk'
import { CurrencyAmount, Token } from '@cowprotocol/currency'
import { useAreThereTokensWithSameSymbol } from '@cowprotocol/tokens'
import { Command } from '@cowprotocol/types'
Expand Down
8 changes: 4 additions & 4 deletions apps/cowswap-frontend/src/legacy/components/Version/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import svgCarretDownSrc from '@cowprotocol/assets/images/carret-down.svg'
import svgXSrc from '@cowprotocol/assets/images/x.svg'
import { CODE_LINK } from '@cowprotocol/common-const'
import { useOnClickOutside } from '@cowprotocol/common-hooks'
import { getEtherscanLink, isBarnBackendEnv } from '@cowprotocol/common-utils'
import {
CONTRACTS_PKG_VERSION,
getEtherscanLink,
isBarnBackendEnv,
COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS,
COW_PROTOCOL_VAULT_RELAYER_ADDRESS,
SupportedChainId as ChainId,
} from '@cowprotocol/cow-sdk'
} from '@cowprotocol/common-utils'
import { CONTRACTS_PKG_VERSION, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
import { ExternalLink, Media, UI } from '@cowprotocol/ui'
import { useWalletInfo } from '@cowprotocol/wallet'

Expand Down
3 changes: 2 additions & 1 deletion apps/cowswap-frontend/src/modules/ethFlow/services/ethFlow/transactionsMocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { COW_PROTOCOL_VAULT_RELAYER_ADDRESS, SupportedChainId } from '@cowprotocol/cow-sdk'
import { COW_PROTOCOL_VAULT_RELAYER_ADDRESS } from '@cowprotocol/common-utils'
import { SupportedChainId } from '@cowprotocol/cow-sdk'

import { cowSwapStore } from '../../../../legacy/state'
import { addTransaction, finalizeTransaction } from '../../../../legacy/state/enhancedTransactions/actions'
Expand Down
1 change: 1 addition & 0 deletions apps/cowswap-frontend/src/modules/twap/utils/buildTwapParts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
ContractsOrder,
OrderParameters,
SupportedChainId,
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS as COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS_PROD,
AddressPerChain,
} from '@cowprotocol/cow-sdk'
Expand Down
19 changes: 14 additions & 5 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ module.exports = [
message:
"Please import COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS and COW_PROTOCOL_VAULT_RELAYER_ADDRESS from '@cowprotocol/common-utils', which provides environment-aware versions of these constants.",
},
{
name: 'ethers',
message: "Please import from '@ethersproject/module' directly to support tree-shaking.",
},
{
name: 'styled-components',
message: 'Please import from styled-components/macro.',
Expand Down Expand Up @@ -235,7 +231,7 @@ module.exports = [
position: 'before',
},
{
pattern: '{@cowprotocol,@uniswap,@safe-global,@ethersproject,@web3-react}/**',
pattern: '{@cowprotocol,@uniswap,@safe-global}/**',
group: 'external',
position: 'before',
},
Expand Down Expand Up @@ -297,6 +293,12 @@ module.exports = [
'error',
{
paths: [
{
name: '@cowprotocol/cow-sdk',
importNames: ['COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS', 'COW_PROTOCOL_VAULT_RELAYER_ADDRESS'],
message:
"Please import COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS and COW_PROTOCOL_VAULT_RELAYER_ADDRESS from '@cowprotocol/common-utils', which provides environment-aware versions of these constants.",
},
{
name: 'react-router',
importNames: ['useNavigate'],
Expand Down Expand Up @@ -343,6 +345,12 @@ module.exports = [
message:
'common/** must stay module-agnostic. Move domain logic into modules/<domain> or extract shared logic into common/lib.',
},
{
name: '@cowprotocol/cow-sdk',
importNames: ['COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS', 'COW_PROTOCOL_VAULT_RELAYER_ADDRESS'],
message:
"Please import COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS and COW_PROTOCOL_VAULT_RELAYER_ADDRESS from '@cowprotocol/common-utils', which provides environment-aware versions of these constants.",
},
],
patterns: ['modules/*'],
},
Expand All @@ -364,6 +372,7 @@ module.exports = [
rules: {
complexity: ['error', 100],
'max-lines-per-function': ['error', { max: 300, skipBlankLines: true, skipComments: true }],
'@typescript-eslint/no-restricted-imports': 'warn',
},
},

Expand Down
Loading