From e6647ff580d3317d74cee9bcc2196d6a24353408 Mon Sep 17 00:00:00 2001 From: pedromcunha Date: Fri, 1 Sep 2023 16:29:26 -0400 Subject: [PATCH 01/15] add goerli dev --- utils/chains.ts | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/utils/chains.ts b/utils/chains.ts index 87bd7ee0b..578716277 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -1,7 +1,16 @@ import { Currency } from '@reservoir0x/reservoir-kit-ui' import wrappedContracts from './wrappedContracts' import { zeroAddress } from 'viem' -import { arbitrum, mainnet, polygon, optimism, Chain, bsc, avalanche } from 'wagmi/chains' +import { + arbitrum, + mainnet, + polygon, + optimism, + Chain, + bsc, + avalanche, + goerli, +} from 'wagmi/chains' import usdcContracts from './usdcContracts' //Chains that are missing from wagmi: @@ -341,4 +350,29 @@ export default [ collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, }, + { + ...goerli, + lightIconUrl: '/icons/goerli-icon-dark.svg', + darkIconUrl: '/icons/goerli-icon-light.svg', + reservoirBaseUrl: 'https://api-goerli.dev.reservoir.tools', + proxyApi: '/api/reservoir/goerli', + routePrefix: 'goerli', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'goerli-eth', + collectionSetId: process.env.NEXT_PUBLIC_GOERLI_COLLECTION_SET_ID, + community: process.env.NEXT_PUBLIC_GOERLI_COMMUNITY, + listingCurrencies: [ + nativeCurrencyBase, + { + ...usdcCurrencyBase, + contract: usdcContracts[goerli.id], + }, + { + symbol: 'WETH', + contract: wrappedContracts[goerli.id], + decimals: 18, + coinGeckoId: 'weth', + }, + ], + }, ] as ReservoirChain[] From e750d0d83c1cdc8a7a813ae37a215b5a1b745ff0 Mon Sep 17 00:00:00 2001 From: pedromcunha Date: Thu, 7 Sep 2023 15:24:03 -0400 Subject: [PATCH 02/15] Add zksync to chains --- public/icons/zksync-icon-dark.svg | 14 ++++++++++++++ public/icons/zksync-icon-light.svg | 14 ++++++++++++++ utils/chains.ts | 26 +++++++++++++++++++++++--- utils/wrappedContracts.ts | 1 + 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 public/icons/zksync-icon-dark.svg create mode 100644 public/icons/zksync-icon-light.svg diff --git a/public/icons/zksync-icon-dark.svg b/public/icons/zksync-icon-dark.svg new file mode 100644 index 000000000..a857f7034 --- /dev/null +++ b/public/icons/zksync-icon-dark.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/public/icons/zksync-icon-light.svg b/public/icons/zksync-icon-light.svg new file mode 100644 index 000000000..55021930f --- /dev/null +++ b/public/icons/zksync-icon-light.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/utils/chains.ts b/utils/chains.ts index 87bd7ee0b..ee0711e41 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -1,7 +1,15 @@ import { Currency } from '@reservoir0x/reservoir-kit-ui' -import wrappedContracts from './wrappedContracts' import { zeroAddress } from 'viem' -import { arbitrum, mainnet, polygon, optimism, Chain, bsc, avalanche } from 'wagmi/chains' +import { + arbitrum, + mainnet, + polygon, + optimism, + Chain, + bsc, + avalanche, + zkSync, +} from 'wagmi/chains' import usdcContracts from './usdcContracts' //Chains that are missing from wagmi: @@ -334,11 +342,23 @@ export default [ darkIconUrl: '/icons/linea-icon-light.svg', reservoirBaseUrl: 'https://api-linea.reservoir.tools', proxyApi: '/api/reservoir/linea', - routePrefix: 'linea', apiKey: process.env.RESERVOIR_API_KEY, coingeckoId: 'ethereum', collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, }, + { + ...zkSync, + name: 'zkSync', + lightIconUrl: '/icons/zksync-icon-dark.svg', + darkIconUrl: '/icons/zksync-icon-light.svg', + reservoirBaseUrl: 'https://api-zksync.reservoir.tools', + proxyApi: '/api/reservoir/zksync', + routePrefix: 'zksync', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'ethereum', + collectionSetId: process.env.NEXT_PUBLIC_ZKSYNC_COLLECTION_SET_ID, + community: process.env.NEXT_PUBLIC_ZKSYNC_COMMUNITY, + }, ] as ReservoirChain[] diff --git a/utils/wrappedContracts.ts b/utils/wrappedContracts.ts index c5a81e970..0c23ad286 100644 --- a/utils/wrappedContracts.ts +++ b/utils/wrappedContracts.ts @@ -4,6 +4,7 @@ const wrappedContracts: Record = { 10: '0x4200000000000000000000000000000000000006', //optimism 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', //bnb 137: '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270', //polygon + 324: '0x5aea5775959fbc2557cc8789bc1bf90a239d9a91', //zksync 42161: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1', //arbitrum 43114: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7', //avalance 42170: '0x722e8bdd2ce80a4422e880164f2079488e115365', //arbitrum nova From a569969c39f5d70e19efe063bed161d8e10be2c9 Mon Sep 17 00:00:00 2001 From: pedromcunha Date: Fri, 8 Sep 2023 13:53:37 -0400 Subject: [PATCH 03/15] resolve conflicts --- utils/chains.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/chains.ts b/utils/chains.ts index 9848cb37d..af9696dca 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -12,6 +12,7 @@ import { zkSync, } from 'wagmi/chains' import usdcContracts from './usdcContracts' +import wrappedContracts from 'utils/wrappedContracts' //Chains that are missing from wagmi: export const zora = { From 584286f0160c5e7427acc06c6b9e9376cda4f291 Mon Sep 17 00:00:00 2001 From: pedromcunha Date: Fri, 8 Sep 2023 13:53:57 -0400 Subject: [PATCH 04/15] resolve conflicts --- utils/chains.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/chains.ts b/utils/chains.ts index af9696dca..b46a0834f 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -12,7 +12,7 @@ import { zkSync, } from 'wagmi/chains' import usdcContracts from './usdcContracts' -import wrappedContracts from 'utils/wrappedContracts' +import wrappedContracts from './wrappedContracts' //Chains that are missing from wagmi: export const zora = { From 0695ae7c3a696358f936e3bbd105a8a76cf40349 Mon Sep 17 00:00:00 2001 From: armando Date: Thu, 21 Sep 2023 08:26:15 -0700 Subject: [PATCH 05/15] feat: Add zkEvm --- utils/chains.ts | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/utils/chains.ts b/utils/chains.ts index 75a1c2b3b..fda890962 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -1,5 +1,4 @@ import { Currency } from '@reservoir0x/reservoir-kit-ui' -import wrappedContracts from './wrappedContracts' import { zeroAddress } from 'viem' import { arbitrum, @@ -9,6 +8,7 @@ import { Chain, bsc, avalanche, + polygonZkEvm, } from 'wagmi/chains' import usdcContracts from './usdcContracts' @@ -352,4 +352,30 @@ export default [ collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, }, + { + ...linea, + lightIconUrl: '/icons/linea-icon-dark.svg', + darkIconUrl: '/icons/linea-icon-light.svg', + reservoirBaseUrl: 'https://api-linea.reservoir.tools', + proxyApi: '/api/reservoir/linea', + + routePrefix: 'linea', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'ethereum', + collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, + community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, + }, + { + ...polygonZkEvm, + lightIconUrl: '/icons/polygon-zkevm-icon-dark.svg', + darkIconUrl: '/icons/polygon-zkevm-icon-light.svg', + reservoirBaseUrl: 'https://api-polygon-zkevm.reservoir.tools', + proxyApi: '/api/reservoir/polygon-zkevm', + + routePrefix: 'polygon-zkevm', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'ethereum', + collectionSetId: process.env.NEXT_PUBLIC_POLYGON_ZKEVM_COLLECTION_SET_ID, + community: process.env.NEXT_PUBLIC_POLYGON_ZKEVM_COMMUNITY, + }, ] as ReservoirChain[] From cd004d2cd59145a0cf0470d69af1477b7200219c Mon Sep 17 00:00:00 2001 From: armando Date: Thu, 21 Sep 2023 12:08:40 -0700 Subject: [PATCH 06/15] feat: Update polygon icons --- public/icons/polygon-icon-dark.svg | 4 ++-- public/icons/polygon-icon-light.svg | 5 +++-- public/icons/polygon-zkevm-icon-dark.svg | 4 ++++ public/icons/polygon-zkevm-icon-light.svg | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 public/icons/polygon-zkevm-icon-dark.svg create mode 100644 public/icons/polygon-zkevm-icon-light.svg diff --git a/public/icons/polygon-icon-dark.svg b/public/icons/polygon-icon-dark.svg index 80df989b7..4d2a896d2 100644 --- a/public/icons/polygon-icon-dark.svg +++ b/public/icons/polygon-icon-dark.svg @@ -1,3 +1,3 @@ - - + + diff --git a/public/icons/polygon-icon-light.svg b/public/icons/polygon-icon-light.svg index bfbe25f70..438698b49 100644 --- a/public/icons/polygon-icon-light.svg +++ b/public/icons/polygon-icon-light.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/public/icons/polygon-zkevm-icon-dark.svg b/public/icons/polygon-zkevm-icon-dark.svg new file mode 100644 index 000000000..cb7ff4a26 --- /dev/null +++ b/public/icons/polygon-zkevm-icon-dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/icons/polygon-zkevm-icon-light.svg b/public/icons/polygon-zkevm-icon-light.svg new file mode 100644 index 000000000..aacd64192 --- /dev/null +++ b/public/icons/polygon-zkevm-icon-light.svg @@ -0,0 +1,4 @@ + + + + From 978151b5e129a2617b02fa67aa36c0e4a2eb3c20 Mon Sep 17 00:00:00 2001 From: armando Date: Thu, 21 Sep 2023 12:18:44 -0700 Subject: [PATCH 07/15] feat: Update icons --- public/icons/polygon-icon-dark.svg | 3 ++- public/icons/polygon-icon-light.svg | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/icons/polygon-icon-dark.svg b/public/icons/polygon-icon-dark.svg index 4d2a896d2..438698b49 100644 --- a/public/icons/polygon-icon-dark.svg +++ b/public/icons/polygon-icon-dark.svg @@ -1,3 +1,4 @@ - + + diff --git a/public/icons/polygon-icon-light.svg b/public/icons/polygon-icon-light.svg index 438698b49..4d2a896d2 100644 --- a/public/icons/polygon-icon-light.svg +++ b/public/icons/polygon-icon-light.svg @@ -1,4 +1,3 @@ - - + From 5940e27104d1fc76da9258455f64b98ccc9990ee Mon Sep 17 00:00:00 2001 From: pedromcunha Date: Fri, 22 Sep 2023 13:15:29 -0400 Subject: [PATCH 08/15] remove goerli dev --- utils/chains.ts | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/utils/chains.ts b/utils/chains.ts index 9f4140282..61e3d03a6 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -8,11 +8,9 @@ import { Chain, bsc, avalanche, - goerli, zkSync, } from 'wagmi/chains' import usdcContracts from './usdcContracts' -import wrappedContracts from './wrappedContracts' //Chains that are missing from wagmi: export const zora = { @@ -353,32 +351,6 @@ export default [ collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, }, - { - ...goerli, - lightIconUrl: '/icons/goerli-icon-dark.svg', - darkIconUrl: '/icons/goerli-icon-light.svg', - reservoirBaseUrl: 'https://api-goerli.dev.reservoir.tools', - proxyApi: '/api/reservoir/goerli', - routePrefix: 'goerli', - apiKey: process.env.RESERVOIR_API_KEY, - coingeckoId: 'goerli-eth', - collectionSetId: process.env.NEXT_PUBLIC_GOERLI_COLLECTION_SET_ID, - community: process.env.NEXT_PUBLIC_GOERLI_COMMUNITY, - listingCurrencies: [ - nativeCurrencyBase, - { - ...usdcCurrencyBase, - contract: usdcContracts[goerli.id], - }, - { - symbol: 'WETH', - contract: wrappedContracts[goerli.id], - decimals: 18, - coinGeckoId: 'weth', - }, - ], - oracleBidsEnabled: true, - }, { ...zkSync, name: 'zkSync', From f9cc78adf40bb23a527a62624e08fd26f24ecd1a Mon Sep 17 00:00:00 2001 From: armando Date: Fri, 22 Sep 2023 11:43:31 -0700 Subject: [PATCH 09/15] feat: Upgrade RK --- package.json | 2 +- yarn.lock | 158 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 96 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index 72de8fef4..05330cc13 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "^1.0.2", "@rainbow-me/rainbowkit": "^1.0.9", - "@reservoir0x/reservoir-kit-ui": "1.8.5", + "@reservoir0x/reservoir-kit-ui": "1.9.1", "@sentry/nextjs": "^7.53.1", "@types/uuid": "^9.0.1", "dayjs": "^1.11.6", diff --git a/yarn.lock b/yarn.lock index 0873949f7..ec4bb232b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,11 +15,11 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.13.10": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" - integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" + integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== dependencies: - regenerator-runtime "^0.13.11" + regenerator-runtime "^0.14.0" "@babel/runtime@^7.17.2": version "7.20.6" @@ -353,10 +353,12 @@ resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.7.3.tgz#d274116678ffae87f6b60e90f88cc4083eefab86" integrity sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg== -"@floating-ui/core@^1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.6.tgz#d21ace437cc919cdd8f1640302fa8851e65e75c0" - integrity sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg== +"@floating-ui/core@^1.4.2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.0.tgz#5c05c60d5ae2d05101c3021c1a2a350ddc027f8c" + integrity sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg== + dependencies: + "@floating-ui/utils" "^0.1.3" "@floating-ui/dom@^0.5.3": version "0.5.4" @@ -365,12 +367,13 @@ dependencies: "@floating-ui/core" "^0.7.3" -"@floating-ui/dom@^1.2.7": - version "1.2.9" - resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.9.tgz#b9ed1c15d30963419a6736f1b7feb350dd49c603" - integrity sha512-sosQxsqgxMNkV3C+3UqTS6LxP7isRLwX8WMepp843Rb3/b0Wz8+MdUkxJksByip3C2WwLugLHN1b4ibn//zKwQ== +"@floating-ui/dom@^1.5.1": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa" + integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA== dependencies: - "@floating-ui/core" "^1.2.6" + "@floating-ui/core" "^1.4.2" + "@floating-ui/utils" "^0.1.3" "@floating-ui/react-dom@0.7.2": version "0.7.2" @@ -381,28 +384,33 @@ use-isomorphic-layout-effect "^1.1.1" "@floating-ui/react-dom@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.0.tgz#7514baac526c818892bbcc84e1c3115008c029f9" - integrity sha512-Ke0oU3SeuABC2C4OFu2mSAwHIP5WUiV98O9YWoHV4Q5aT6E9k06DV0Khi5uYspR8xmmBk08t8ZDcz3TR3ARkEg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.2.tgz#fab244d64db08e6bed7be4b5fcce65315ef44d20" + integrity sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ== dependencies: - "@floating-ui/dom" "^1.2.7" + "@floating-ui/dom" "^1.5.1" + +"@floating-ui/utils@^0.1.3": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.4.tgz#19654d1026cc410975d46445180e70a5089b3e7d" + integrity sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA== "@fortawesome/fontawesome-common-types@6.2.1": version "6.2.1" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073" integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ== -"@fortawesome/fontawesome-common-types@6.4.0": - version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz#88da2b70d6ca18aaa6ed3687832e11f39e80624b" - integrity sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ== +"@fortawesome/fontawesome-common-types@6.4.2": + version "6.4.2" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz#1766039cad33f8ad87f9467b98e0d18fbc8f01c5" + integrity sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA== "@fortawesome/fontawesome-svg-core@^6.1.1": - version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz#3727552eff9179506e9203d72feb5b1063c11a21" - integrity sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw== + version "6.4.2" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz#37f4507d5ec645c8b50df6db14eced32a6f9be09" + integrity sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg== dependencies: - "@fortawesome/fontawesome-common-types" "6.4.0" + "@fortawesome/fontawesome-common-types" "6.4.2" "@fortawesome/fontawesome-svg-core@^6.2.1": version "6.2.1" @@ -419,11 +427,11 @@ "@fortawesome/fontawesome-common-types" "6.2.1" "@fortawesome/free-solid-svg-icons@^6.1.1": - version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz#48c0e790847fa56299e2f26b82b39663b8ad7119" - integrity sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ== + version "6.4.2" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz#33a02c4cb6aa28abea7bc082a9626b7922099df4" + integrity sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA== dependencies: - "@fortawesome/fontawesome-common-types" "6.4.0" + "@fortawesome/fontawesome-common-types" "6.4.2" "@fortawesome/free-solid-svg-icons@^6.2.1": version "6.2.1" @@ -481,7 +489,17 @@ semver "^7.3.8" superstruct "^1.0.3" -"@motionone/animation@^10.12.0", "@motionone/animation@^10.15.1": +"@motionone/animation@^10.12.0": + version "10.16.3" + resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.16.3.tgz#f5b71e27fd8b88b61f983adb0ed6c8e3e89281f9" + integrity sha512-QUGWpLbMFLhyqKlngjZhjtxM8IqiJQjLK0DF+XOF6od9nhSvlaeEpOY/UMCRVcZn/9Tr2rZO22EkuCIjYdI74g== + dependencies: + "@motionone/easing" "^10.16.3" + "@motionone/types" "^10.16.3" + "@motionone/utils" "^10.16.3" + tslib "^2.3.1" + +"@motionone/animation@^10.15.1": version "10.15.1" resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ== @@ -515,15 +533,24 @@ hey-listen "^1.0.8" tslib "^2.3.1" -"@motionone/easing@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693" - integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw== +"@motionone/easing@^10.15.1", "@motionone/easing@^10.16.3": + version "10.16.3" + resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.16.3.tgz#a62abe0ba2841861f167f286782e287eab8d7466" + integrity sha512-HWTMZbTmZojzwEuKT/xCdvoMPXjYSyQvuVM6jmM0yoGU6BWzsmYMeB4bn38UFf618fJCNtP9XeC/zxtKWfbr0w== dependencies: - "@motionone/utils" "^10.15.1" + "@motionone/utils" "^10.16.3" tslib "^2.3.1" -"@motionone/generators@^10.12.0", "@motionone/generators@^10.15.1": +"@motionone/generators@^10.12.0": + version "10.16.4" + resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.16.4.tgz#4a38708244bce733bfcebd4a26d19f4bbabd36af" + integrity sha512-geFZ3w0Rm0ZXXpctWsSf3REGywmLLujEjxPYpBR0j+ymYwof0xbV6S5kGqqsDKgyWKVWpUInqQYvQfL6fRbXeg== + dependencies: + "@motionone/types" "^10.16.3" + "@motionone/utils" "^10.16.3" + tslib "^2.3.1" + +"@motionone/generators@^10.15.1": version "10.15.1" resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c" integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ== @@ -540,17 +567,17 @@ "@motionone/dom" "^10.16.2" tslib "^2.3.1" -"@motionone/types@^10.12.0", "@motionone/types@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb" - integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA== +"@motionone/types@^10.12.0", "@motionone/types@^10.15.1", "@motionone/types@^10.16.3": + version "10.16.3" + resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.16.3.tgz#9284ea8a52f6b32c51c54b617214f20e43ac6c59" + integrity sha512-W4jkEGFifDq73DlaZs3HUfamV2t1wM35zN/zX7Q79LfZ2sc6C0R1baUHZmqc/K5F3vSw3PavgQ6HyHLd/MXcWg== -"@motionone/utils@^10.12.0", "@motionone/utils@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438" - integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw== +"@motionone/utils@^10.12.0", "@motionone/utils@^10.15.1", "@motionone/utils@^10.16.3": + version "10.16.3" + resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.16.3.tgz#ddf07ab6cf3000d89e3bcbdc9a8c3e1fd64f8520" + integrity sha512-WNWDksJIxQkaI9p9Z9z0+K27xdqISGNFy1SsWVGaiedTHq0iaT6iZujby8fT/ZnZxj1EOaxJtSfUPCFNU5CRoA== dependencies: - "@motionone/types" "^10.15.1" + "@motionone/types" "^10.16.3" hey-listen "^1.0.8" tslib "^2.3.1" @@ -1557,10 +1584,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-1.8.5.tgz#a47bef428202308f9fd3f9d8bca290b215278398" - integrity sha512-VacuTvrGMTS87unYZQ6g9fh+pSKPr4hs+i9tNFTXdUGHhr6PnFL11/maNupm9C9ofS2qdlRklQB4DVmucapwEQ== +"@reservoir0x/reservoir-kit-ui@1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-1.9.1.tgz#0229acb114d71eba111e2e089a05bc30589fb1e5" + integrity sha512-Z0CEDKPMaHmNokJRAGAB2hgAWZBfYpP5I3pNkrdmQUDnUni9+rgzA7Gtmgw3eOp472+Pl5AHVpFGMVx0I/sWnQ== dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1575,7 +1602,7 @@ "@radix-ui/react-toggle-group" "1.0.4" "@radix-ui/react-tooltip" "1.0.6" "@react-hookz/web" "^19.2.0" - "@reservoir0x/reservoir-sdk" "1.4.2" + "@reservoir0x/reservoir-sdk" "1.4.4" "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1583,10 +1610,10 @@ react-flatpickr "^3.10.13" swr "2.0.1" -"@reservoir0x/reservoir-sdk@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-1.4.2.tgz#eff0919cf72647f90cfeac7166e173fdef6a8120" - integrity sha512-5pYWmz8XnzX/GyMKAJsbN3IZQmvvb51thlNZ99+QuF3I6U4UGnki53KOy1vIiRYrHy4AEWc9KAOfR3cJL7CD9g== +"@reservoir0x/reservoir-sdk@1.4.4": + version "1.4.4" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-1.4.4.tgz#9279b0e7d71bb447a590e1833150cf45ece6b1f3" + integrity sha512-oMLDJ52IQfnVdCKkDF66+63PkjsLhpbaYXW3kBdXe+yO09zWgGN5D0PISQgC6qde7I7ymvpdsbGSsMov/0cKhg== dependencies: axios "^0.27.2" @@ -2964,9 +2991,9 @@ csstype@^3.0.4, csstype@^3.0.7: integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== dayjs@^1.11.4: - version "1.11.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" - integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== + version "1.11.10" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" + integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== dayjs@^1.11.6: version "1.11.6" @@ -3262,9 +3289,9 @@ flatpickr@^4.6.13, flatpickr@^4.6.2: integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== follow-redirects@^1.14.9: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== for-each@^0.3.3: version "0.3.3" @@ -4628,6 +4655,11 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -4945,9 +4977,9 @@ tslib@1.14.1, tslib@^1.9.0, tslib@^1.9.3: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338" - integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA== + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== tslib@^2.4.0: version "2.4.0" From 080581a5862907e40f1c2dd6c78bb6cf19edb8d7 Mon Sep 17 00:00:00 2001 From: armando Date: Mon, 25 Sep 2023 16:08:32 -0400 Subject: [PATCH 10/15] remove zsync --- public/icons/zksync-icon-dark.svg | 14 -------------- public/icons/zksync-icon-light.svg | 14 -------------- utils/wrappedContracts.ts | 2 +- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 public/icons/zksync-icon-dark.svg delete mode 100644 public/icons/zksync-icon-light.svg diff --git a/public/icons/zksync-icon-dark.svg b/public/icons/zksync-icon-dark.svg deleted file mode 100644 index a857f7034..000000000 --- a/public/icons/zksync-icon-dark.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/public/icons/zksync-icon-light.svg b/public/icons/zksync-icon-light.svg deleted file mode 100644 index 55021930f..000000000 --- a/public/icons/zksync-icon-light.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/utils/wrappedContracts.ts b/utils/wrappedContracts.ts index 0c23ad286..d60ea7edb 100644 --- a/utils/wrappedContracts.ts +++ b/utils/wrappedContracts.ts @@ -4,7 +4,7 @@ const wrappedContracts: Record = { 10: '0x4200000000000000000000000000000000000006', //optimism 56: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', //bnb 137: '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270', //polygon - 324: '0x5aea5775959fbc2557cc8789bc1bf90a239d9a91', //zksync + 1101: '0x4f9a0e7fd2bf6067db6994cf12e4495df938e6e9', // zkEVM 42161: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1', //arbitrum 43114: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7', //avalance 42170: '0x722e8bdd2ce80a4422e880164f2079488e115365', //arbitrum nova From dc9312bbba3ae84374383c2db8ead8da1fd3a76e Mon Sep 17 00:00:00 2001 From: armando Date: Mon, 25 Sep 2023 16:20:54 -0400 Subject: [PATCH 11/15] feat: Add new icons --- public/icons/polygon-icon-dark.svg | 3 +-- public/icons/polygon-icon-light.svg | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/icons/polygon-icon-dark.svg b/public/icons/polygon-icon-dark.svg index 438698b49..4d2a896d2 100644 --- a/public/icons/polygon-icon-dark.svg +++ b/public/icons/polygon-icon-dark.svg @@ -1,4 +1,3 @@ - - + diff --git a/public/icons/polygon-icon-light.svg b/public/icons/polygon-icon-light.svg index 4d2a896d2..438698b49 100644 --- a/public/icons/polygon-icon-light.svg +++ b/public/icons/polygon-icon-light.svg @@ -1,3 +1,4 @@ - + + From 4fd533b187b1c24dd2c6483fa1a3fa67d23a13a9 Mon Sep 17 00:00:00 2001 From: armando Date: Mon, 25 Sep 2023 16:29:53 -0400 Subject: [PATCH 12/15] feat: Remove zksync --- utils/chains.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/utils/chains.ts b/utils/chains.ts index de0e18f69..c51dae6e1 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -9,7 +9,6 @@ import { bsc, avalanche, polygonZkEvm, - zkSync, } from 'wagmi/chains' import usdcContracts from './usdcContracts' @@ -378,17 +377,4 @@ export default [ collectionSetId: process.env.NEXT_PUBLIC_POLYGON_ZKEVM_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_POLYGON_ZKEVM_COMMUNITY, }, - { - ...zkSync, - name: 'zkSync', - lightIconUrl: '/icons/zksync-icon-dark.svg', - darkIconUrl: '/icons/zksync-icon-light.svg', - reservoirBaseUrl: 'https://api-zksync.reservoir.tools', - proxyApi: '/api/reservoir/zksync', - routePrefix: 'zksync', - apiKey: process.env.RESERVOIR_API_KEY, - coingeckoId: 'ethereum', - collectionSetId: process.env.NEXT_PUBLIC_ZKSYNC_COLLECTION_SET_ID, - community: process.env.NEXT_PUBLIC_ZKSYNC_COMMUNITY, - }, ] as ReservoirChain[] From 5c9102773ac9065a7db496080ed996250c4fe2fe Mon Sep 17 00:00:00 2001 From: armando Date: Mon, 25 Sep 2023 16:31:45 -0400 Subject: [PATCH 13/15] feat: Fix dup --- utils/chains.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/utils/chains.ts b/utils/chains.ts index c51dae6e1..29aa27e61 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -339,18 +339,6 @@ export default [ collectionSetId: process.env.NEXT_PUBLIC_BASE_COLLECTION_SET_ID, community: process.env.NEXT_PUBLIC_BASE_COMMUNITY, }, - { - ...linea, - lightIconUrl: '/icons/linea-icon-dark.svg', - darkIconUrl: '/icons/linea-icon-light.svg', - reservoirBaseUrl: 'https://api-linea.reservoir.tools', - proxyApi: '/api/reservoir/linea', - routePrefix: 'linea', - apiKey: process.env.RESERVOIR_API_KEY, - coingeckoId: 'ethereum', - collectionSetId: process.env.NEXT_PUBLIC_LINEA_COLLECTION_SET_ID, - community: process.env.NEXT_PUBLIC_LINEA_COMMUNITY, - }, { ...linea, lightIconUrl: '/icons/linea-icon-dark.svg', From 27d46602f310abd70154220df3e1bdcce3ba9816 Mon Sep 17 00:00:00 2001 From: armando Date: Mon, 25 Sep 2023 16:33:01 -0400 Subject: [PATCH 14/15] feat: rollback icons --- public/icons/polygon-icon-dark.svg | 4 ++-- public/icons/polygon-icon-light.svg | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/public/icons/polygon-icon-dark.svg b/public/icons/polygon-icon-dark.svg index 4d2a896d2..80df989b7 100644 --- a/public/icons/polygon-icon-dark.svg +++ b/public/icons/polygon-icon-dark.svg @@ -1,3 +1,3 @@ - - + + diff --git a/public/icons/polygon-icon-light.svg b/public/icons/polygon-icon-light.svg index 438698b49..bfbe25f70 100644 --- a/public/icons/polygon-icon-light.svg +++ b/public/icons/polygon-icon-light.svg @@ -1,4 +1,3 @@ - - - + + From c04568e1fce2be586ba3a4886d736455474b809e Mon Sep 17 00:00:00 2001 From: armando Date: Tue, 26 Sep 2023 16:21:47 -0400 Subject: [PATCH 15/15] feat: Bring back wrapped contracts --- utils/chains.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/chains.ts b/utils/chains.ts index 29aa27e61..deb760494 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -1,4 +1,5 @@ import { Currency } from '@reservoir0x/reservoir-kit-ui' +import wrappedContracts from './wrappedContracts' import { zeroAddress } from 'viem' import { arbitrum,