From 2c508bc8a04b976379608828b8578d0b0713deea Mon Sep 17 00:00:00 2001 From: Ted Palmer Date: Sat, 13 Jul 2024 10:59:27 -0400 Subject: [PATCH 1/6] Add cross-chain payment tokens for zk sync --- utils/paymentTokens.ts | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index 3e10a2e4..17e9cc2a 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -487,6 +487,34 @@ export const chainPaymentTokensMap = { name: 'WETH', decimals: 18, }, + { + chainId: 1, + address: zeroAddress, + symbol: 'ETH', + name: 'ETH', + decimals: 18, + }, + { + chainId: 10, + address: zeroAddress, + symbol: 'ETH', + name: 'Optimism ETH', + decimals: 18, + }, + { + chainId: 8453, + address: zeroAddress, + symbol: 'ETH', + name: 'Base ETH', + decimals: 18, + }, + { + chainId: 42161, + address: zeroAddress, + symbol: 'ETH', + name: 'Arbitrum ETH', + decimals: 18, + }, ], // polygonZkEvm From dc69c0e0c7b1327bf2b7b63a9fb52c9d4b411539 Mon Sep 17 00:00:00 2001 From: Ted Palmer Date: Sat, 13 Jul 2024 11:04:38 -0400 Subject: [PATCH 2/6] Remove cross-chain tokens from zk sync --- utils/paymentTokens.ts | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index 17e9cc2a..3e10a2e4 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -487,34 +487,6 @@ export const chainPaymentTokensMap = { name: 'WETH', decimals: 18, }, - { - chainId: 1, - address: zeroAddress, - symbol: 'ETH', - name: 'ETH', - decimals: 18, - }, - { - chainId: 10, - address: zeroAddress, - symbol: 'ETH', - name: 'Optimism ETH', - decimals: 18, - }, - { - chainId: 8453, - address: zeroAddress, - symbol: 'ETH', - name: 'Base ETH', - decimals: 18, - }, - { - chainId: 42161, - address: zeroAddress, - symbol: 'ETH', - name: 'Arbitrum ETH', - decimals: 18, - }, ], // polygonZkEvm From ca51a330422d8485f0a5e561bbed0434c1597185 Mon Sep 17 00:00:00 2001 From: Ted Palmer Date: Sat, 13 Jul 2024 11:28:10 -0400 Subject: [PATCH 3/6] Add back payment tokens --- utils/paymentTokens.ts | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index 3e10a2e4..17e9cc2a 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -487,6 +487,34 @@ export const chainPaymentTokensMap = { name: 'WETH', decimals: 18, }, + { + chainId: 1, + address: zeroAddress, + symbol: 'ETH', + name: 'ETH', + decimals: 18, + }, + { + chainId: 10, + address: zeroAddress, + symbol: 'ETH', + name: 'Optimism ETH', + decimals: 18, + }, + { + chainId: 8453, + address: zeroAddress, + symbol: 'ETH', + name: 'Base ETH', + decimals: 18, + }, + { + chainId: 42161, + address: zeroAddress, + symbol: 'ETH', + name: 'Arbitrum ETH', + decimals: 18, + }, ], // polygonZkEvm From 42c4b76baf844fc6b459506cc2e91bd01eb617a1 Mon Sep 17 00:00:00 2001 From: Jaden Date: Mon, 15 Jul 2024 17:38:22 -0400 Subject: [PATCH 4/6] feat: adding convertLink for nebula --- package.json | 2 +- pages/_app.tsx | 26 ++++++++++++++++++++------ yarn.lock | 18 +++++++++--------- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 5f6205c5..ac7d0e6e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "1.0.6", "@rainbow-me/rainbowkit": "2.1.2", - "@reservoir0x/reservoir-kit-ui": "2.6.2", + "@reservoir0x/reservoir-kit-ui": "^2.6.3", "@sentry/nextjs": "^7.85.0", "@tanstack/react-query": "5.20.2", "@types/uuid": "^9.0.1", diff --git a/pages/_app.tsx b/pages/_app.tsx index 61db3010..69ace1b1 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -39,7 +39,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { WagmiProvider, http } from 'wagmi' import { chainIdToAlchemyNetworkMap } from 'utils/chainIdToAlchemyNetworkMap' import { _transports } from '@rainbow-me/rainbowkit/dist/config/getDefaultConfig' -import { Chain, mainnet } from 'viem/chains' +import { Chain, mainnet, skaleNebula } from 'viem/chains' //CONFIGURABLE: Use nextjs to load your own custom font: https://nextjs.org/docs/basic-features/font-optimization const inter = Inter({ @@ -63,14 +63,14 @@ const wagmiConfig = getDefaultConfig({ projectId: WALLET_CONNECT_PROJECT_ID, chains: (supportedChains.length === 0 ? [mainnet] : supportedChains) as [ Chain, - ...Chain[], + ...Chain[] ], ssr: true, transports: supportedChains.reduce((transportsConfig: _transports, chain) => { const network = chainIdToAlchemyNetworkMap[chain.id] if (network && ALCHEMY_API_KEY) { transportsConfig[chain.id] = http( - `https://${network}.g.alchemy.com/v2/${ALCHEMY_API_KEY}`, + `https://${network}.g.alchemy.com/v2/${ALCHEMY_API_KEY}` ) } else { transportsConfig[chain.id] = http() // Fallback to default HTTP transport @@ -141,14 +141,14 @@ function MyApp({ setRainbowKitTheme( rainbowDarkTheme({ borderRadius: 'small', - }), + }) ) } else { setReservoirKitTheme(reservoirLightTheme(reservoirKitThemeOverrides)) setRainbowKitTheme( rainbowLightTheme({ borderRadius: 'small', - }), + }) ) } }, [theme]) @@ -203,7 +203,7 @@ function MyApp({ checkPollingInterval: checkPollingInterval, paymentTokens: chainPaymentTokensMap[id], } - }, + } ), logLevel: 4, source: source, @@ -211,6 +211,20 @@ function MyApp({ //CONFIGURABLE: Set your marketplace fee and recipient, (fee is in BPS) // Note that this impacts orders created on your marketplace (offers/listings) // marketplaceFees: ['0x03508bB71268BBA25ECaCC8F620e01866650532c:250'], + convertLink: + marketplaceChain.id === skaleNebula.id + ? { + customUrl: ({ toCurrency }) => { + if (!toCurrency || toCurrency.symbol === 'ETH') { + return 'https://portal.skale.space/bridge?from=mainnet&to=green-giddy-denebola&token=eth&type=eth' + } else if (toCurrency) { + return `https://portal.skale.space/bridge?from=mainnet&to=green-giddy-denebola&token=${toCurrency.symbol}&type=erc20` + } else { + return 'https://portal.skale.space/bridge?from=mainnet&to=green-giddy-denebola' + } + }, + } + : undefined, }} theme={reservoirKitTheme} > diff --git a/yarn.lock b/yarn.lock index dd38097a..ac4f7fcb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1753,10 +1753,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.6.2.tgz#7a85f3f55090657bcd1e413a3bf0592d79abea8b" - integrity sha512-fPzR+IZdU0Q8g3cFfUdqOAJpGsSHCoanF+IgsJyDU0FUXq+sapPcTZ/bDYz7+oBy9A9qyrR7fhh1rLfUs8dBpg== +"@reservoir0x/reservoir-kit-ui@^2.6.3": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.6.3.tgz#2d42a767fb8af7653c8355b0bea9b054788bb2d7" + integrity sha512-VE8anDMGf7d8G1Q796nvkkUC1HWqJG2ZkFi3D0Jp0ODbNPa94+3E7vyts5BOx8Invhi6fyZcqCIEowxFxaNeqA== dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1772,7 +1772,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" "2.3.0" + "@reservoir0x/reservoir-sdk" "2.3.1" "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1780,10 +1780,10 @@ react-flatpickr "^3.10.13" swr "2.0.1" -"@reservoir0x/reservoir-sdk@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.3.0.tgz#a0568eee033e12b10f5672fe524f4b64f87488a4" - integrity sha512-u341EVzoOVM+VfG9nSax8mpxRCXbHpiSv25Wa6DYoYg88S2HIAFGDbQea6e7a9AZHA+Whw9dKnGEmDs/Ga4FMw== +"@reservoir0x/reservoir-sdk@2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.3.1.tgz#f5e16aca360978f5ea3ffc3ed5d666c96a791052" + integrity sha512-wOw61dnxEt/RqHw55dRm13B+YSCe5cqmJZUC4RQCnYFf/lfoGE1DZhu0Wy7E1+fAr5WqbkL3t9e4zTYRJYcoFA== dependencies: axios "^1.6.7" From f5275018a9aaffb56f77e466fc145dd6b6bc1459 Mon Sep 17 00:00:00 2001 From: Ted Palmer Date: Tue, 23 Jul 2024 09:42:03 -0400 Subject: [PATCH 5/6] Upgrade rk to 2.7.5 --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index ac7d0e6e..a7f0d43c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "1.0.6", "@rainbow-me/rainbowkit": "2.1.2", - "@reservoir0x/reservoir-kit-ui": "^2.6.3", + "@reservoir0x/reservoir-kit-ui": "2.7.5", "@sentry/nextjs": "^7.85.0", "@tanstack/react-query": "5.20.2", "@types/uuid": "^9.0.1", diff --git a/yarn.lock b/yarn.lock index ac4f7fcb..439a1014 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1753,10 +1753,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@^2.6.3": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.6.3.tgz#2d42a767fb8af7653c8355b0bea9b054788bb2d7" - integrity sha512-VE8anDMGf7d8G1Q796nvkkUC1HWqJG2ZkFi3D0Jp0ODbNPa94+3E7vyts5BOx8Invhi6fyZcqCIEowxFxaNeqA== +"@reservoir0x/reservoir-kit-ui@2.7.5": + version "2.7.5" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.5.tgz#835a686b6cd4e47db51b49a0096b6280af4bbf20" + integrity sha512-Ipbi7SMAOebj1ZL3A8PGF4dUl/kwfjqKUb7GrWC2Y4VScszqmIUfLjuJuAcjVZBx/Oe6ThcK50keijQMSSH+nw== dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1772,7 +1772,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" "2.3.1" + "@reservoir0x/reservoir-sdk" "2.4.4" "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1780,10 +1780,10 @@ react-flatpickr "^3.10.13" swr "2.0.1" -"@reservoir0x/reservoir-sdk@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.3.1.tgz#f5e16aca360978f5ea3ffc3ed5d666c96a791052" - integrity sha512-wOw61dnxEt/RqHw55dRm13B+YSCe5cqmJZUC4RQCnYFf/lfoGE1DZhu0Wy7E1+fAr5WqbkL3t9e4zTYRJYcoFA== +"@reservoir0x/reservoir-sdk@2.4.4": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.4.tgz#ced096c1180e9cb83c2f39f4d11dd84ce6097a9a" + integrity sha512-9OJE/Ciynd5EcicK2DIS1nYAMYjHHIYOXHMl3AUFonjvjaJwOB+UH0h5izxCKgj3o+d57yx6V5hTBUtrHN5waw== dependencies: axios "^1.6.7" From 4da7edec3a7e8620407183cd959989d388531c19 Mon Sep 17 00:00:00 2001 From: Jaden Date: Tue, 23 Jul 2024 18:00:06 -0400 Subject: [PATCH 6/6] feat: adding boss --- package.json | 2 +- utils/chains.ts | 13 +++++++++++++ yarn.lock | 18 +++++++++--------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a7f0d43c..37bfd5a8 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "1.0.6", "@rainbow-me/rainbowkit": "2.1.2", - "@reservoir0x/reservoir-kit-ui": "2.7.5", + "@reservoir0x/reservoir-kit-ui": "^2.7.6", "@sentry/nextjs": "^7.85.0", "@tanstack/react-query": "5.20.2", "@types/uuid": "^9.0.1", diff --git a/utils/chains.ts b/utils/chains.ts index 6bd32157..533beed0 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -486,4 +486,17 @@ export default [ oracleBidsEnabled: true, checkPollingInterval: reservoirChains.sei.checkPollingInterval, }, + { + ...customChains.boss, + name: 'Boss', + lightIconUrl: '/icons/apex-pop-icon-light.svg', + darkIconUrl: '/icons/apex-pop-icon-dark.svg', + reservoirBaseUrl: reservoirChains.boss.baseApiUrl, + proxyApi: '/api/reservoir/boss', + routePrefix: 'boss', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'ethereum', + oracleBidsEnabled: true, + checkPollingInterval: reservoirChains.boss.checkPollingInterval, + }, ] as ReservoirChain[] diff --git a/yarn.lock b/yarn.lock index 439a1014..b595036c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1753,10 +1753,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@2.7.5": - version "2.7.5" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.5.tgz#835a686b6cd4e47db51b49a0096b6280af4bbf20" - integrity sha512-Ipbi7SMAOebj1ZL3A8PGF4dUl/kwfjqKUb7GrWC2Y4VScszqmIUfLjuJuAcjVZBx/Oe6ThcK50keijQMSSH+nw== +"@reservoir0x/reservoir-kit-ui@^2.7.6": + version "2.7.6" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.6.tgz#3ba605655aa9d8ddbfaf2378a656e78d70159685" + integrity sha512-0DiqLDly60qlA1ohVCMLWYIx3jCYiDT9tUmVR4eyYqSrjfUDXPjAu2/tRoEw3IcazItb8V+LZdDw55eo3RCrTA== dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1772,7 +1772,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" "2.4.4" + "@reservoir0x/reservoir-sdk" "2.4.5" "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1780,10 +1780,10 @@ react-flatpickr "^3.10.13" swr "2.0.1" -"@reservoir0x/reservoir-sdk@2.4.4": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.4.tgz#ced096c1180e9cb83c2f39f4d11dd84ce6097a9a" - integrity sha512-9OJE/Ciynd5EcicK2DIS1nYAMYjHHIYOXHMl3AUFonjvjaJwOB+UH0h5izxCKgj3o+d57yx6V5hTBUtrHN5waw== +"@reservoir0x/reservoir-sdk@2.4.5": + version "2.4.5" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.5.tgz#6cf1c6c08fe418ae05ff7104ef9c6f27229f7552" + integrity sha512-26doyAOIzYtSmttup17qo1NQM19ZLPwkiqAVyoRACRJXAyktOFJwCnSqSx2gGl9QbMhkVUJ9Da3SQ397d3dI+g== dependencies: axios "^1.6.7"