From 2dd58247848f040a60ede491b32d687af1a7106c Mon Sep 17 00:00:00 2001 From: Jaden Date: Thu, 30 Jan 2025 16:16:43 -0500 Subject: [PATCH 1/2] feat: adding berachain --- package.json | 2 +- public/icons/berachain-icon-dark.svg | 17 +++++++++++++++ public/icons/berachain-icon-light.svg | 5 +++++ utils/chains.ts | 31 +++++++++++++++++++++++++++ utils/paymentTokens.ts | 19 +++++++++++++++- utils/wrappedContracts.ts | 1 + yarn.lock | 18 ++++++++-------- 7 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 public/icons/berachain-icon-dark.svg create mode 100644 public/icons/berachain-icon-light.svg diff --git a/package.json b/package.json index 774b2d395..29fd0d945 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.8.2", + "@reservoir0x/reservoir-kit-ui": "^2.8.4", "@sentry/nextjs": "^7.85.0", "@tanstack/react-query": "5.20.2", "@types/uuid": "^9.0.1", diff --git a/public/icons/berachain-icon-dark.svg b/public/icons/berachain-icon-dark.svg new file mode 100644 index 000000000..0dc83a3a1 --- /dev/null +++ b/public/icons/berachain-icon-dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/public/icons/berachain-icon-light.svg b/public/icons/berachain-icon-light.svg new file mode 100644 index 000000000..7fbfbac48 --- /dev/null +++ b/public/icons/berachain-icon-light.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/utils/chains.ts b/utils/chains.ts index ff12fa177..e19368d0f 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -674,4 +674,35 @@ export default [ oracleBidsEnabled: true, checkPollingInterval: reservoirChains.abstract.checkPollingInterval, }, + { + ...customChains.berachain, + rpcUrls: { + default: { + http: [process.env.NEXT_PUBLIC_RPC_BERACHAIN], + }, + public: { + http: [process.env.NEXT_PUBLIC_RPC_BERACHAIN], + }, + }, + blockExplorers: { + etherscan: { + name: 'Berachain Explorer', + url: process.env.NEXT_PUBLIC_EXPLORER_BERACHAIN, + }, + default: { + name: 'Berachain Explorer', + url: process.env.NEXT_PUBLIC_EXPLORER_BERACHAIN, + }, + }, + name: 'Berachain', + lightIconUrl: '/icons/berachain-icon-light.svg', + darkIconUrl: '/icons/berachain-icon-dark.svg', + reservoirBaseUrl: reservoirChains.berachain.baseApiUrl, + proxyApi: '/api/reservoir/berachain', + routePrefix: 'berachain', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'berachain-bera', + oracleBidsEnabled: true, + checkPollingInterval: reservoirChains.berachain.checkPollingInterval, + }, ] as ReservoirChain[] diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index 84e5dec12..d5a415d03 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -1038,7 +1038,6 @@ export const chainPaymentTokensMap = { }, ], - // Abstract 2741: [ { @@ -1056,4 +1055,22 @@ export const chainPaymentTokensMap = { decimals: 18, }, ], + + // Berachain + 80094: [ + { + chainId: 80094, + address: zeroAddress, + symbol: 'BERA', + name: 'BERA', + decimals: 18, + }, + { + chainId: 80094, + address: '0x6969696969696969696969696969696969696969', + symbol: 'WBERA', + name: 'WBERA', + decimals: 18, + }, + ], } as Record diff --git a/utils/wrappedContracts.ts b/utils/wrappedContracts.ts index 6f8f20445..23ddbea92 100644 --- a/utils/wrappedContracts.ts +++ b/utils/wrappedContracts.ts @@ -35,6 +35,7 @@ const wrappedContracts: Record = { 2187: '0xfa3ed70386b9255fC04aA008A8ad1B0CDa816Fac', // game7 1868: '0x4200000000000000000000000000000000000006', // soneium 2741: '0x3439153eb7af838ad19d56e1571fbd09333c2809', // abstract + 80094: '0x6969696969696969696969696969696969696969', // berachain } export default wrappedContracts diff --git a/yarn.lock b/yarn.lock index 064f8816e..daca313bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1753,10 +1753,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@^2.8.2": - version "2.8.2" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.8.2.tgz#1c6ebac0fdc6c7f8d4a8fcaa486cd29da3ef9cd4" - integrity sha512-2abprRVhqF9Dt4Rvei7A8rA+JFRdDD/eQrzfpK/pCWFFrj9Bmo9eFplEu97NwQi227ocJDkipEESdSB7BUhAow== +"@reservoir0x/reservoir-kit-ui@^2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.8.4.tgz#9449d7ac975bd47fe15e7ac7f5f658e6de6cb562" + integrity sha512-8ZQ1mepaVyPoYvEp9UUuww6RzG9TRHQTo4JFW3qn/60KNYk1s3h/41LF1UijSP0EkV6uLhWKYxB5nps9koaVvA== 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.5.2" + "@reservoir0x/reservoir-sdk" "2.5.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.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.5.2.tgz#47d45e91d466310c71c932d81ea5a494e5d2d3a4" - integrity sha512-M6L4JYYJY1kTWZj34g9JFR1Ux5CUWiN+PkpoQXMXpyELeuxMCFCIXg0dsNt/KwJmhrn427R7984l/B3QJ8/Lew== +"@reservoir0x/reservoir-sdk@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.5.4.tgz#f561e0c72302180902b14cdb0b7f87c7788edca8" + integrity sha512-QCDMFo8hfHkWopxeLk//beqTargCJYxPV/rKPfUbSPAuSWRt4b7eoniq+zD65zaWwTaUyoYNvuB6Wemd/G3mXg== dependencies: axios "^1.6.7" From 20291e061350d93380b4bc845ed104ef970b83ff Mon Sep 17 00:00:00 2001 From: Jaden Date: Thu, 6 Feb 2025 10:48:31 -0500 Subject: [PATCH 2/2] feat: updating berachain --- package.json | 2 +- utils/chains.ts | 18 ------------------ yarn.lock | 18 +++++++++--------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 29fd0d945..8313d2f90 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.8.4", + "@reservoir0x/reservoir-kit-ui": "^2.8.5", "@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 e19368d0f..d5c3e8462 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -676,24 +676,6 @@ export default [ }, { ...customChains.berachain, - rpcUrls: { - default: { - http: [process.env.NEXT_PUBLIC_RPC_BERACHAIN], - }, - public: { - http: [process.env.NEXT_PUBLIC_RPC_BERACHAIN], - }, - }, - blockExplorers: { - etherscan: { - name: 'Berachain Explorer', - url: process.env.NEXT_PUBLIC_EXPLORER_BERACHAIN, - }, - default: { - name: 'Berachain Explorer', - url: process.env.NEXT_PUBLIC_EXPLORER_BERACHAIN, - }, - }, name: 'Berachain', lightIconUrl: '/icons/berachain-icon-light.svg', darkIconUrl: '/icons/berachain-icon-dark.svg', diff --git a/yarn.lock b/yarn.lock index daca313bb..77b3e7edf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1753,10 +1753,10 @@ dependencies: "@react-hookz/deep-equal" "^1.0.3" -"@reservoir0x/reservoir-kit-ui@^2.8.4": - version "2.8.4" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.8.4.tgz#9449d7ac975bd47fe15e7ac7f5f658e6de6cb562" - integrity sha512-8ZQ1mepaVyPoYvEp9UUuww6RzG9TRHQTo4JFW3qn/60KNYk1s3h/41LF1UijSP0EkV6uLhWKYxB5nps9koaVvA== +"@reservoir0x/reservoir-kit-ui@^2.8.5": + version "2.8.5" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.8.5.tgz#bae5dfd003fc84d2a00fb337fb27dd1512e956a5" + integrity sha512-7puFjhU2VSa4V5CoXZIBHpe21Zild4LVstIOeHj/aOxBE4TKo5NixEjqFHRIheZIUyWZrvGVdcRrmAeKX35pdQ== 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.5.4" + "@reservoir0x/reservoir-sdk" "2.5.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.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.5.4.tgz#f561e0c72302180902b14cdb0b7f87c7788edca8" - integrity sha512-QCDMFo8hfHkWopxeLk//beqTargCJYxPV/rKPfUbSPAuSWRt4b7eoniq+zD65zaWwTaUyoYNvuB6Wemd/G3mXg== +"@reservoir0x/reservoir-sdk@2.5.5": + version "2.5.5" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.5.5.tgz#2c0e017c894b838a55dd5d48cb93039f2c966f59" + integrity sha512-vy/8xj/sCIsCALPYGOPt8Uo39mjWrfWxYQ0qW+LSVfFkGFiomiqGWB4Z1AgtRyw0skYAPEZMtO+cPe9QF1QwAw== dependencies: axios "^1.6.7"