Merge branch 'main' of github.com:KyberNetwork/kyberswap-interface in…

…to feat/auto-show-preview-after-approve
KyberNetwork · Feb 20, 2025 · 358cc39 · 358cc39
2 parents a1ffaf0 + 4e259a7
commit 358cc39
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 105 deletions.
diff --git a/cypress/support/constants.js b/cypress/support/constants.js
@@ -8,7 +8,6 @@ const Network = {
   MAINNET: 1,
   BSC: 56,
   POLYGON: 137,
-  ZKEVM: 1101,
   AVALANCHE: 43114,
   FANTOM: 250,
   ARBITRUM: 42161,

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@holdstation/paymaster-helper": "^2.0.20",
     "@kyberswap/ks-sdk-classic": "^1.0.3",
-    "@kyberswap/ks-sdk-core": "1.1.8",
+    "@kyberswap/ks-sdk-core": "1.1.9",
     "@kyberswap/ks-sdk-elastic": "^1.1.2",
     "@kyberswap/liquidity-widgets": "1.1.17",
     "@kyberswap/zap-migration-widgets": "1.0.7",
@@ -199,7 +199,7 @@
     "vite-tsconfig-paths": "^4.0.8"
   },
   "resolutions": {
-    "@kyberswap/ks-sdk-core": "1.1.8",
+    "@kyberswap/ks-sdk-core": "1.1.9",
     "babel-plugin-lodash/@babel/types": "~7.20.0",
     "react-error-overlay": "6.0.9"
   }

diff --git a/src/components/ClassicElasticTab.tsx b/src/components/ClassicElasticTab.tsx
@@ -48,7 +48,6 @@ function ClassicElasticTab() {
   const upToMedium = useMedia(`(max-width: ${MEDIA_WIDTHS.upToMedium}px)`)
 
   const dontShowLegacy = [
-    ChainId.ZKEVM,
     ChainId.BASE,
     ChainId.LINEA,
     ChainId.SCROLL,

diff --git a/src/components/Web3Provider/index.tsx b/src/components/Web3Provider/index.tsx
@@ -16,7 +16,6 @@ import {
   mantle,
   optimism,
   polygon,
-  polygonZkEvm,
   scroll,
   sonic,
   zksync,
@@ -150,7 +149,6 @@ export const wagmiConfig = createConfig({
     optimism,
     zksync,
     polygon,
-    polygonZkEvm,
     base,
     bsc,
     linea,

diff --git a/src/constants/bases.ts b/src/constants/bases.ts
@@ -20,7 +20,6 @@ const WETH_ONLY: ChainTokenList = {
   [ChainId.OPTIMISM]: [WETH[ChainId.OPTIMISM]],
   [ChainId.ZKSYNC]: [WETH[ChainId.ZKSYNC]],
   [ChainId.LINEA]: [WETH[ChainId.LINEA]],
-  [ChainId.ZKEVM]: [WETH[ChainId.ZKEVM]],
   [ChainId.BASE]: [WETH[ChainId.BASE]],
   [ChainId.SCROLL]: [WETH[ChainId.SCROLL]],
   [ChainId.BLAST]: [WETH[ChainId.BLAST]],

diff --git a/src/constants/networks.ts b/src/constants/networks.ts
@@ -20,7 +20,6 @@ import {
   optimism,
   scroll,
   sonic,
-  zkEvm,
   zksync,
 } from './networks/index'
 import { NetworkInfo } from './networks/type'
@@ -41,7 +40,6 @@ const NETWORKS_INFO_CONFIG: NETWORKS_INFO_CONFIG_TYPE = {
   [ChainId.OPTIMISM]: optimism,
   [ChainId.ZKSYNC]: zksync,
   [ChainId.LINEA]: linea,
-  [ChainId.ZKEVM]: zkEvm,
   [ChainId.BASE]: base,
   [ChainId.SCROLL]: scroll,
   [ChainId.BLAST]: blast,
@@ -67,7 +65,6 @@ export const MAINNET_NETWORKS = [
   ChainId.OPTIMISM,
   ChainId.LINEA,
   ChainId.MATIC,
-  ChainId.ZKEVM,
   ChainId.ZKSYNC,
   ChainId.BASE,
   ChainId.SCROLL,
@@ -116,7 +113,6 @@ export const STATIC_FEE_OPTIONS: { [chainId: number]: number[] | undefined } = {
   [ChainId.GÖRLI]: [8, 10, 50, 300, 500, 1000],
   [ChainId.ZKSYNC]: [8, 10, 50, 300, 500, 1000],
   [ChainId.LINEA]: [8, 10, 50, 300, 500, 1000],
-  [ChainId.ZKEVM]: [8, 10, 50, 300, 500, 1000],
   [ChainId.BASE]: [8, 10, 50, 300, 500, 1000],
   [ChainId.SCROLL]: [8, 10, 50, 300, 500, 1000],
 }
@@ -127,7 +123,6 @@ export const ONLY_STATIC_FEE_CHAINS = [
   ChainId.GÖRLI,
   ChainId.ZKSYNC,
   ChainId.LINEA,
-  ChainId.ZKEVM,
   ChainId.BASE,
   ChainId.SCROLL,
 ]

diff --git a/src/constants/networks/index.ts b/src/constants/networks/index.ts
@@ -11,7 +11,6 @@ export { default as mumbai } from './mumbai'
 export { default as optimism } from './optimism'
 export { default as zksync } from './zksync'
 export { default as linea } from './linea'
-export { default as zkEvm } from './zkevm'
 export { default as base } from './base'
 export { default as scroll } from './scroll'
 export { default as blast } from './blast'

diff --git a/src/constants/networks/zkevm.ts b/src/constants/networks/zkevm.ts
diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
@@ -40,7 +40,6 @@ export const STABLE_COIN_ADDRESSES_TO_TAKE_FEE: Record<ChainId, string[]> = {
   [ChainId.FANTOM]: [],
   [ChainId.BSCMAINNET]: [],
   [ChainId.ARBITRUM]: [],
-  [ChainId.ZKEVM]: [],
   [ChainId.LINEA]: [],
   [ChainId.BASE]: [],
   [ChainId.SCROLL]: [],
@@ -105,11 +104,6 @@ export const SUPER_STABLE_COINS_ADDRESS: { [chainId in ChainId]: string[] } = {
   [ChainId.MUMBAI]: [],
   [ChainId.BSCTESTNET]: [],
   [ChainId.AVAXTESTNET]: [],
-  [ChainId.ZKEVM]: [
-    '0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035', // USDC
-    '0x1E4a5963aBFD975d8c9021ce480b42188849D41d', // USDT
-    '0xC5015b9d9161Dca7e18e32f6f25C4aD850731Fd4', // DAI
-  ],
   [ChainId.BASE]: [
     '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', // USDbC
     '0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb', // DAI
@@ -342,13 +336,6 @@ export const CORRELATED_COINS_ADDRESS: { [chainId in ChainId]: string[][] } = {
   [ChainId.MUMBAI]: [],
   [ChainId.BSCTESTNET]: [],
   [ChainId.AVAXTESTNET]: [],
-  [ChainId.ZKEVM]: [
-    [
-      // Eth/rEth:
-      '0x4f9a0e7fd2bf6067db6994cf12e4495df938e6e9',
-      '0xb23c20efce6e24acca0cef9b7b7aa196b84ec942',
-    ],
-  ],
   [ChainId.LINEA]: [
     [
       // Eth/wstEth:
@@ -409,7 +396,6 @@ export const KNC: { [chainId in ChainId]: Token } = {
   [ChainId.ARBITRUM]: new Token(ChainId.ARBITRUM, '0xe4DDDfe67E7164b0FE14E218d80dC4C08eDC01cB', 18, 'KNC', 'KNC'),
   [ChainId.OPTIMISM]: new Token(ChainId.OPTIMISM, '0xa00e3a3511aac35ca78530c85007afcd31753819', 18, 'KNC', 'KNC'),
   [ChainId.LINEA]: new Token(ChainId.LINEA, '0x3b2F62d42DB19B30588648bf1c184865D4C3B1D6', 18, 'KNC', 'KNC'),
-  [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0x6A80A465409ce8D36C513129C0FEEa61BEd579ba', 18, 'KNC', 'KNC'),
   [ChainId.BASE]: new Token(ChainId.BASE, '0x28fe69Ff6864C1C218878BDCA01482D36B9D57b1', 18, 'KNC', 'KNC'),
 
   // TODO(viet-nv): KNC does not exist on the below chain
@@ -441,7 +427,6 @@ export const DEFAULT_OUTPUT_TOKEN_BY_CHAIN: Partial<Record<ChainId, Token>> = {
   [ChainId.OPTIMISM]: new Token(ChainId.OPTIMISM, '0x7F5c764cBc14f9669B88837ca1490cCa17c31607', 6, 'USDC', 'USD Coin'),
   [ChainId.GÖRLI]: new Token(ChainId.GÖRLI, '0x2bf64acf7ead856209749d0d125e9ade2d908e7f', 18, 'USDT', 'Tether USD'),
   [ChainId.ZKSYNC]: new Token(ChainId.ZKSYNC, '0x3355df6D4c9C3035724Fd0e3914dE96A5a83aaf4', 6, 'USDC', 'USD Coin'),
-  [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0x1E4a5963aBFD975d8c9021ce480b42188849D41d', 6, 'USDT', 'Tether USD'),
   [ChainId.LINEA]: new Token(ChainId.LINEA, '0x176211869cA2b568f2A7D4EE941E073a821EE1ff', 6, 'USDC', 'USD Coin'),
   [ChainId.BASE]: new Token(ChainId.BASE, '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', 6, 'USDC', 'USD Coin'),
   [ChainId.SCROLL]: new Token(ChainId.SCROLL, '0xf55BEC9cafDbE8730f096Aa55dad6D22d44099Df', 6, 'USDT', 'Tether USD'),

diff --git a/src/pages/About/AboutKyberSwap/index.tsx b/src/pages/About/AboutKyberSwap/index.tsx
@@ -341,7 +341,6 @@ function AboutKyberSwap() {
               <OptimismLogoFull />
               <ZkSyncFull color={theme.text} />
               <LineaFull />
-              <img src={'https://i.imgur.com/QP6x5aC.png'} alt="zkevm" width="100%" />
               <img
                 src="https://raw.githubusercontent.com/base-org/brand-kit/001c0e9b40a67799ebe0418671ac4e02a0c683ce/logo/wordmark/Base_Wordmark_Blue.svg"
                 alt="Base"

diff --git a/src/pages/Earns/constants.ts b/src/pages/Earns/constants.ts
@@ -22,7 +22,6 @@ export const NFT_MANAGER_CONTRACT = {
     [ChainId.MANTLE]: '0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1',
     [ChainId.OPTIMISM]: '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
     [ChainId.SCROLL]: '0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1',
-    [ChainId.ZKEVM]: '0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1',
   },
   [PoolType.DEX_PANCAKESWAPV3]: '0x46A15B0b27311cedF172AB29E4f4766fbE7F4364',
   [PoolType.DEX_SUSHISWAPV3]: {
@@ -36,7 +35,6 @@ export const NFT_MANAGER_CONTRACT = {
     [ChainId.LINEA]: '0x80C7DD17B01855a6D2347444a0FCC36136a314de',
     [ChainId.OPTIMISM]: '0x1af415a1EbA07a4986a52B6f2e7dE7003D82231e',
     [ChainId.MATIC]: '0xb7402ee99F0A008e461098AC3A27F4957Df89a40',
-    [ChainId.ZKEVM]: '0xF4d73326C13a4Fc5FD7A064217e12780e9Bd62c3',
     [ChainId.SCROLL]: '0x0389879e0156033202C44BF784ac18fC02edeE4f',
   },
 }

diff --git a/yarn.lock b/yarn.lock
@@ -3741,10 +3741,10 @@
     tiny-warning "^1.0.3"
     toformat "^2.0.0"
 
-"@kyberswap/ks-sdk-core@1.1.8", "@kyberswap/ks-sdk-core@^1.0.5":
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/@kyberswap/ks-sdk-core/-/ks-sdk-core-1.1.8.tgz#611b1d55cbeccb1a3a3b526a2a75b2172ffb90d9"
-  integrity sha512-ae4S3JOhTw/I/VVmzhWCJiFwd9jCiqAPOuSVyo6kLyJ9OFk1/d48+noQkLVSns4BhsuyPYjeQaEUa3tYuIEYbg==
+"@kyberswap/ks-sdk-core@1.1.9", "@kyberswap/ks-sdk-core@^1.0.5":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@kyberswap/ks-sdk-core/-/ks-sdk-core-1.1.9.tgz#11b705da114f445a2f259bd61ab47a9a4e03474b"
+  integrity sha512-/euKHUpia/fYkDAKbKyfFLQlryFQZ4imY8FthXDwjEL4OY3hK9tjbr/cZVN0gLoVYJTF0e1ytiNLX8x2U1lk7A==
   dependencies:
     "@ethersproject/address" "^5.0.2"
     big.js "^5.2.2"