From 88c8ffb1b299e83fdc88f7b1c92fedd204d4831d Mon Sep 17 00:00:00 2001 From: Jaden Date: Fri, 3 Jan 2025 14:12:33 -0500 Subject: [PATCH 1/6] feat: updating rk --- package.json | 2 +- yarn.lock | 49 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 153e060f7..f3f2e1276 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.41", + "@reservoir0x/reservoir-kit-ui": "^2.7.47", "@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 712bccc60..67680d5e4 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.41": - version "2.7.41" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.41.tgz#e281a18bdfaf9b3371b817c56965f67881b7b94f" - integrity sha512-dpb9uzhL4fbNOweBGAF71vcD8A5yrNOX6q9jru2qJ3a7U9TKe44qWbvAO5I9W++gFzInRa+hDc4+Lmelzk2XxQ== +"@reservoir0x/reservoir-kit-ui@^2.7.47": + version "2.7.47" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.47.tgz#b18972604cc637972b61ccb6a6512fbc6937c945" + integrity sha512-3Bz9ZbAioSx3LJuo5YchUcbcbiAKNPXm4FTuC/CoAW4pAbY7x0/r6pYPqav1LA6Z+G9qBFFB6p+YoeBwnqtUjA== 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.32" + "@reservoir0x/reservoir-sdk" "2.4.37" "@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.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.32.tgz#fae0f8760af2046abfe1a3bfabd2113c4a8bb34b" - integrity sha512-LNIZ7s394LswdMbjjY4N/1ik4sxQymkhLAsiT9AZi+whKTNe5pAqbO+IugpS/ZlWQT7tRREtShWNybtxlpYSPw== +"@reservoir0x/reservoir-sdk@2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.37.tgz#749bec492e0ae3b79a67f8a5eb2949520044a444" + integrity sha512-ZuZreu1GbvQh7vLlMD+rxryk1XoVz2Ys8K1hzkEgawMnx0riEplCtrWtvA18skbjqUEUawBwOlIDU/HZj2Pd/Q== dependencies: axios "^1.6.7" @@ -6529,7 +6529,16 @@ strict-uri-encode@^2.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -6626,7 +6635,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -7219,7 +7235,7 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -7237,6 +7253,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 18222751e889cf6af661e74743efeda3a81c21a8 Mon Sep 17 00:00:00 2001 From: Jaden Date: Fri, 3 Jan 2025 14:42:03 -0500 Subject: [PATCH 2/6] feat: fixing mainnet rpc --- utils/chains.ts | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/utils/chains.ts b/utils/chains.ts index a39939155..c948530c7 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -57,7 +57,40 @@ const usdcCurrencyBase = { } export const DefaultChain: ReservoirChain = { - ...mainnet, + id: 1, + name: 'Ethereum', + nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, + rpcUrls: { + default: { + http: [ + 'https://ethereum-rpc.publicnode.com', + 'https://mainnet.gateway.tenderly.co', + 'https://rpc.flashbots.net', + 'https://rpc.mevblocker.io', + 'https://eth.drpc.org', + ], + }, + }, + blockExplorers: { + default: { + name: 'Etherscan', + url: 'https://etherscan.io', + apiUrl: 'https://api.etherscan.io/api', + }, + }, + contracts: { + ensRegistry: { + address: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e', + }, + ensUniversalResolver: { + address: '0xce01f8eee7E479C928F8919abD53E553a36CeF67', + blockCreated: 19_258_213, + }, + multicall3: { + address: '0xca11bde05977b3631167028862be2a173976ca11', + blockCreated: 14_353_601, + }, + }, // Any url to display the logo of the chain in light mode lightIconUrl: '/icons/eth-icon-dark.svg', // Any url to display the logo of the chain in dark mode From 68d0822ab0a595454e48b4437ddf5d898dd96dd1 Mon Sep 17 00:00:00 2001 From: Jaden Date: Tue, 14 Jan 2025 09:19:51 -0500 Subject: [PATCH 3/6] feat: updating rk --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d94c31850..ead7fa454 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.44", + "@reservoir0x/reservoir-kit-ui": "^2.7.49", "@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 b2d0b8876..98d09f3ce 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.44": - version "2.7.44" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.44.tgz#d180e3044ac124464ef472d1d3cea07a79f46f1c" - integrity sha512-AmYErBq+1YWlGPszilZZKOvxilLuz8T0M9LbkhuAJDSd1KHmlLq/e/GjdvYhjSmPv/C1H4MFIDKmXeU5LpCqNw== +"@reservoir0x/reservoir-kit-ui@^2.7.49": + version "2.7.49" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.49.tgz#06ce9d37a324e3e0e8e9ae346ea2ee68d1f1451f" + integrity sha512-N3hpJ9Rz07R2RxFi7x2wrRvV0FUm2/kTZDm6qdH2w4IcUzWUEl5g1zo4T+Na9XxKfhZs0e3gU4dcj7XtIB+j3g== 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.34" + "@reservoir0x/reservoir-sdk" "2.4.39" "@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.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.34.tgz#fc00ceed1a7f028902bebdb6092b0c89f1801e34" - integrity sha512-SRI3S+6VYYOgqpH8y4hDR8bTjipDyIAunpyvLCjJWgc2GPOMFSEuM56zX4ifcbTnMcp4ES9v/Pn/FJ0B2+kuvQ== +"@reservoir0x/reservoir-sdk@2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.39.tgz#0f4a2c188d0cf710ccfe4d700ce4ff917da044ef" + integrity sha512-QjOKprMX36NsSgtyMBLjBn6x47I254AcZKFmPdTlpqCPRLvmEUDK9+JRVmvMI16c6QQw4YjNSP29F/chcUBj8g== dependencies: axios "^1.6.7" From b7882b67071cae9a8d7cc6f7bf59cea3a224bea1 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 22:21:10 +0000 Subject: [PATCH 4/6] feat: add ink chain configuration and icons Co-Authored-By: jaden@unevenlabs.com --- public/icons/ink-icon-dark.svg | 10 ++++++++++ public/icons/ink-icon-light.svg | 10 ++++++++++ utils/chains.ts | 13 +++++++++++++ utils/paymentTokens.ts | 18 ++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 public/icons/ink-icon-dark.svg create mode 100644 public/icons/ink-icon-light.svg diff --git a/public/icons/ink-icon-dark.svg b/public/icons/ink-icon-dark.svg new file mode 100644 index 000000000..e9238c038 --- /dev/null +++ b/public/icons/ink-icon-dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/public/icons/ink-icon-light.svg b/public/icons/ink-icon-light.svg new file mode 100644 index 000000000..6501ceb49 --- /dev/null +++ b/public/icons/ink-icon-light.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/utils/chains.ts b/utils/chains.ts index 6760e37aa..417b6f962 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -661,4 +661,17 @@ export default [ oracleBidsEnabled: true, checkPollingInterval: reservoirChains.soneium.checkPollingInterval, }, + { + ...customChains.ink, + name: 'Ink', + lightIconUrl: '/icons/ink-icon-light.svg', + darkIconUrl: '/icons/ink-icon-dark.svg', + reservoirBaseUrl: reservoirChains.ink.baseApiUrl, + proxyApi: '/api/reservoir/ink', + routePrefix: 'ink', + apiKey: process.env.RESERVOIR_API_KEY, + coingeckoId: 'ethereum', + oracleBidsEnabled: true, + checkPollingInterval: reservoirChains.ink.checkPollingInterval, + }, ] as ReservoirChain[] diff --git a/utils/paymentTokens.ts b/utils/paymentTokens.ts index 791dc1b4e..96fb8deaf 100644 --- a/utils/paymentTokens.ts +++ b/utils/paymentTokens.ts @@ -638,6 +638,24 @@ export const chainPaymentTokensMap = { }, ], + // Ink + 57073: [ + { + chainId: 57073, + address: zeroAddress, + symbol: 'ETH', + name: 'ETH', + decimals: 18, + }, + { + chainId: 57073, + address: '0x4200000000000000000000000000000000000006', + symbol: 'WETH', + name: 'WETH', + decimals: 18, + }, + ], + // xai 660279: [ { From 2760ec0ee12c2453f28ae301035684f2b9a286d2 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 22:21:48 +0000 Subject: [PATCH 5/6] chore: upgrade reservoir-kit-ui to latest version Co-Authored-By: jaden@unevenlabs.com --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index ead7fa454..bf81f845a 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.49", + "@reservoir0x/reservoir-kit-ui": "^2.7.52", "@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 98d09f3ce..9dfd88b86 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.49": - version "2.7.49" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.49.tgz#06ce9d37a324e3e0e8e9ae346ea2ee68d1f1451f" - integrity sha512-N3hpJ9Rz07R2RxFi7x2wrRvV0FUm2/kTZDm6qdH2w4IcUzWUEl5g1zo4T+Na9XxKfhZs0e3gU4dcj7XtIB+j3g== +"@reservoir0x/reservoir-kit-ui@^2.7.52": + version "2.7.52" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.52.tgz#b2b3ee545ceb8a4f841d93b8f0a3fa95ae9ade1d" + integrity sha512-C7h4flZW492LrG/Rr+Jz8dewLYxv5JLnjiMtUQQhnRZWw78GC4mRnb6aSW4lysdgMgP6m/OQ+jPHutGVGkDXzA== 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.39" + "@reservoir0x/reservoir-sdk" "2.4.41" "@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.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.39.tgz#0f4a2c188d0cf710ccfe4d700ce4ff917da044ef" - integrity sha512-QjOKprMX36NsSgtyMBLjBn6x47I254AcZKFmPdTlpqCPRLvmEUDK9+JRVmvMI16c6QQw4YjNSP29F/chcUBj8g== +"@reservoir0x/reservoir-sdk@2.4.41": + version "2.4.41" + resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.41.tgz#c254b444e7ba5fcb56add54074c08fc4a5bbe7ce" + integrity sha512-mi+hovjT9rnILkgm2p9wYqRkqMIf+cmvuDk1Fq+Qrymf7XF6816iQLUiKSjaxsgSxUa87d79w8x0s0fGwxRyZQ== dependencies: axios "^1.6.7" From 062310acc77bb024828a112bda3f929402b4e5c2 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 22:29:43 +0000 Subject: [PATCH 6/6] feat: add wrapped contract definition for Ink chain Co-Authored-By: jaden@unevenlabs.com --- utils/chains.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/chains.ts b/utils/chains.ts index 417b6f962..74d23b5f2 100644 --- a/utils/chains.ts +++ b/utils/chains.ts @@ -671,6 +671,7 @@ export default [ routePrefix: 'ink', apiKey: process.env.RESERVOIR_API_KEY, coingeckoId: 'ethereum', + wrappedContract: '0x4200000000000000000000000000000000000006', oracleBidsEnabled: true, checkPollingInterval: reservoirChains.ink.checkPollingInterval, },