From 2d0557883a433cc22c1a95fea3d805a29a1f3045 Mon Sep 17 00:00:00 2001 From: Jaden Date: Fri, 31 May 2024 13:02:10 -0400 Subject: [PATCH 1/3] feat: adding sei chain --- package.json | 4 ++++ public/icons/sei-icon-dark.svg | 10 ++++++++++ public/icons/sei-icon-light.svg | 10 ++++++++++ utils/chains.ts | 13 +++++++++++++ utils/paymentTokens.ts | 18 ++++++++++++++++++ utils/wrappedContracts.ts | 1 + yarn.lock | 18 ++++++++++++++++++ 7 files changed, 74 insertions(+) create mode 100644 public/icons/sei-icon-dark.svg create mode 100644 public/icons/sei-icon-light.svg diff --git a/package.json b/package.json index 5f805e9d6..838451dfb 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,11 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "1.0.6", "@rainbow-me/rainbowkit": "2.0.0", +<<<<<<< Updated upstream "@reservoir0x/reservoir-kit-ui": "^2.5.17", +======= + "@reservoir0x/reservoir-kit-ui": "^2.5.18", +>>>>>>> Stashed changes "@sentry/nextjs": "^7.85.0", "@tanstack/react-query": "5.20.2", "@types/uuid": "^9.0.1", diff --git a/public/icons/sei-icon-dark.svg b/public/icons/sei-icon-dark.svg new file mode 100644 index 000000000..f3ba975fb --- /dev/null +++ b/public/icons/sei-icon-dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/public/icons/sei-icon-light.svg b/public/icons/sei-icon-light.svg new file mode 100644 index 000000000..0c250e10b --- /dev/null +++ b/public/icons/sei-icon-light.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/utils/chains.ts b/utils/chains.ts index 0d89c4557..c0b642d09 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -477,4 +477,17 @@ export default [ oracleBidsEnabled: true, checkPollingInterval: reservoirChains.bitlayer.checkPollingInterval, }, + { + ...customChains.sei, + name: 'Sei', + lightIconUrl: '/icons/sei-icon-light.svg', + darkIconUrl: '/icons/sei-icon-dark.svg', + reservoirBaseUrl: reservoirChains.sei.baseApiUrl, + proxyApi: '/api/reservoir/sei', + routePrefix: 'sei', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'sei-network', + oracleBidsEnabled: true, + checkPollingInterval: reservoirChains.sei.checkPollingInterval, + }, ] as ReservoirChain[] diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index bd37f63ed..b89d60038 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -688,4 +688,22 @@ export const chainPaymentTokensMap = { decimals: 18, }, ], + + // sei + 1329: [ + { + chainId: 1329, + address: zeroAddress, + symbol: 'SEI', + name: 'Sei', + decimals: 18, + }, + { + chainId: 1329, + address: '0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7', + symbol: 'WSEI', + name: 'Wrapped Sei', + decimals: 18, + }, + ], } as Record diff --git a/utils/wrappedContracts.ts b/utils/wrappedContracts.ts index a94222ae1..e2150a080 100644 --- a/utils/wrappedContracts.ts +++ b/utils/wrappedContracts.ts @@ -24,6 +24,7 @@ const wrappedContracts: Record = { 1482601649: '0xab01bad2c86e24d371a13ed6367bdca819589c5d', // nebula 7560: '0x4200000000000000000000000000000000000006', // cyber 200901: '0xff204e2681a6fa0e2c3fade68a1b28fb90e4fc5f', // bitlayer + 1329: '0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7', // sei } export default wrappedContracts diff --git a/yarn.lock b/yarn.lock index 319783ec8..270d21df6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1895,10 +1895,17 @@ dependencies: merge-options "^3.0.4" +<<<<<<< Updated upstream "@reservoir0x/reservoir-kit-ui@^2.5.17": version "2.5.17" resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.17.tgz#736f4cf14070f990d82e3f28de27f1c8ef68673b" integrity sha512-1IsjYlBt4Ej0LUSEWIQhT+cyDMt0Dc3ZpnZ4bMfc/eMigIyXW230ysbfHv2K4aWxVBuRt+UbThLf48JmYdKP3g== +======= +"@reservoir0x/reservoir-kit-ui@^2.5.18": + version "2.5.18" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.18.tgz#bbf22b1f76822180cb4c6ab8eb05c7b73b61c90c" + integrity sha512-Zp5u396m3rJjXe5gddxYXx/jPJRTq1pWQPJAGwIjexvOxXofED7vQEmea1GBOSB5YdJP471XFSMBO3QobPEFSw== +>>>>>>> Stashed changes dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1914,7 +1921,11 @@ "@radix-ui/react-toggle-group" "1.0.4" "@radix-ui/react-tooltip" "1.0.6" "@react-hookz/web" "^19.2.0" +<<<<<<< Updated upstream "@reservoir0x/reservoir-sdk" "2.2.7" +======= + "@reservoir0x/reservoir-sdk" "2.2.8" +>>>>>>> Stashed changes "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1922,10 +1933,17 @@ react-flatpickr "^3.10.13" swr "2.0.1" +<<<<<<< Updated upstream "@reservoir0x/reservoir-sdk@2.2.7": version "2.2.7" resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.7.tgz#b0e31343d16874594a5c47c92a58f6936043f521" integrity sha512-xSreQz9jkITqeQv42MyZIhQ4971r70YiLUO1UMNBxZBbIPRxnBkEd5fJKm/RfHkllH+zGdbSTcYZKuhSWipKgw== +======= +"@reservoir0x/reservoir-sdk@2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.8.tgz#54cd5c370c4dbd1335c7f6f50b234f88e2847be8" + integrity sha512-8Gjae9cr20VJbNGoRi/nx5JwrR/iGRMtt9ElU8LyDxsyQ1m7HtxMOfdaa81OmZbUA5w8jEGWN5YpH9fLBYfDjg== +>>>>>>> Stashed changes dependencies: axios "^1.6.7" From a0180d2b16275c14abe3abb79e74b09aa477e8eb Mon Sep 17 00:00:00 2001 From: Jaden Date: Tue, 4 Jun 2024 13:19:18 -0400 Subject: [PATCH 2/3] feat: removing WSEI from payment tokens --- utils/paymentTokens.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index b89d60038..3e10a2e4f 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -698,12 +698,5 @@ export const chainPaymentTokensMap = { name: 'Sei', decimals: 18, }, - { - chainId: 1329, - address: '0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7', - symbol: 'WSEI', - name: 'Wrapped Sei', - decimals: 18, - }, ], } as Record From 801f9ff55febb9511e18da7f14356c14875b604e Mon Sep 17 00:00:00 2001 From: Jaden Date: Tue, 4 Jun 2024 18:08:50 -0400 Subject: [PATCH 3/3] feat: fixing merge conflicts --- package.json | 4 ---- yarn.lock | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/package.json b/package.json index 838451dfb..abe16c40c 100644 --- a/package.json +++ b/package.json @@ -29,11 +29,7 @@ "@radix-ui/react-toggle-group": "^1.0.1", "@radix-ui/react-tooltip": "1.0.6", "@rainbow-me/rainbowkit": "2.0.0", -<<<<<<< Updated upstream - "@reservoir0x/reservoir-kit-ui": "^2.5.17", -======= "@reservoir0x/reservoir-kit-ui": "^2.5.18", ->>>>>>> Stashed changes "@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 270d21df6..f785863e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1895,17 +1895,10 @@ dependencies: merge-options "^3.0.4" -<<<<<<< Updated upstream -"@reservoir0x/reservoir-kit-ui@^2.5.17": - version "2.5.17" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.17.tgz#736f4cf14070f990d82e3f28de27f1c8ef68673b" - integrity sha512-1IsjYlBt4Ej0LUSEWIQhT+cyDMt0Dc3ZpnZ4bMfc/eMigIyXW230ysbfHv2K4aWxVBuRt+UbThLf48JmYdKP3g== -======= "@reservoir0x/reservoir-kit-ui@^2.5.18": version "2.5.18" resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.18.tgz#bbf22b1f76822180cb4c6ab8eb05c7b73b61c90c" integrity sha512-Zp5u396m3rJjXe5gddxYXx/jPJRTq1pWQPJAGwIjexvOxXofED7vQEmea1GBOSB5YdJP471XFSMBO3QobPEFSw== ->>>>>>> Stashed changes dependencies: "@fortawesome/fontawesome-svg-core" "^6.1.1" "@fortawesome/free-solid-svg-icons" "^6.1.1" @@ -1921,11 +1914,7 @@ "@radix-ui/react-toggle-group" "1.0.4" "@radix-ui/react-tooltip" "1.0.6" "@react-hookz/web" "^19.2.0" -<<<<<<< Updated upstream - "@reservoir0x/reservoir-sdk" "2.2.7" -======= "@reservoir0x/reservoir-sdk" "2.2.8" ->>>>>>> Stashed changes "@stitches/react" "1.3.1-1" dayjs "^1.11.4" flatpickr "^4.6.13" @@ -1933,17 +1922,10 @@ react-flatpickr "^3.10.13" swr "2.0.1" -<<<<<<< Updated upstream -"@reservoir0x/reservoir-sdk@2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.7.tgz#b0e31343d16874594a5c47c92a58f6936043f521" - integrity sha512-xSreQz9jkITqeQv42MyZIhQ4971r70YiLUO1UMNBxZBbIPRxnBkEd5fJKm/RfHkllH+zGdbSTcYZKuhSWipKgw== -======= "@reservoir0x/reservoir-sdk@2.2.8": version "2.2.8" resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.8.tgz#54cd5c370c4dbd1335c7f6f50b234f88e2847be8" integrity sha512-8Gjae9cr20VJbNGoRi/nx5JwrR/iGRMtt9ElU8LyDxsyQ1m7HtxMOfdaa81OmZbUA5w8jEGWN5YpH9fLBYfDjg== ->>>>>>> Stashed changes dependencies: axios "^1.6.7"