Merge branch 'main' of https://github.com/reservoirprotocol/reservoir…

…-kit into dev
reservoirprotocol · Mar 26, 2024 · 5690c16 · 5690c16
2 parents d3fdb33 + aebfb76
commit 5690c16
Show file tree

Hide file tree

Showing 20 changed files with 267 additions and 5 deletions.
diff --git a/demo/utils/chains.ts b/demo/utils/chains.ts
@@ -189,5 +189,8 @@ export default [
   },
   {
     ...reservoirChains.astarZkEVM,
+  },
+  {
+    ...reservoirChains.redstoneTestnet,
   }
 ]
diff --git a/packages/defender-relayer-adapter/CHANGELOG.md b/packages/defender-relayer-adapter/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @reservoir0x/defender-relayer-adapter
 
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [9c46f40]
+  - @reservoir0x/reservoir-sdk@2.0.11
+  - @reservoir0x/ethers-wallet-adapter@1.0.11
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [2198ecd]
+  - @reservoir0x/reservoir-sdk@2.0.10
+  - @reservoir0x/ethers-wallet-adapter@1.0.10
+
 ## 1.0.9
 
 ### Patch Changes

diff --git a/packages/defender-relayer-adapter/package.json b/packages/defender-relayer-adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@reservoir0x/defender-relayer-adapter",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "description": "An adapter that intergrates OpenZeppelins defender relayer wallet to a Reservoir Wallet for use in the @reservoir0x/reservoir-sdk",
     "exports": {
         ".": {

diff --git a/packages/ethers-wallet-adapter/CHANGELOG.md b/packages/ethers-wallet-adapter/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @reservoir0x/ethers-wallet-adapter
 
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [9c46f40]
+  - @reservoir0x/reservoir-sdk@2.0.11
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [2198ecd]
+  - @reservoir0x/reservoir-sdk@2.0.10
+
 ## 1.0.9
 
 ### Patch Changes

diff --git a/packages/ethers-wallet-adapter/package.json b/packages/ethers-wallet-adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@reservoir0x/ethers-wallet-adapter",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "description": "An adapter used to convert an ethersjs signer to a Reservoir Wallet for use in the @reservoir0x/reservoir-sdk",
     "exports": {
         ".": {

diff --git a/packages/gelato-adapter/CHANGELOG.md b/packages/gelato-adapter/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @reservoir0x/gelato-adapter
 
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [9c46f40]
+  - @reservoir0x/reservoir-sdk@2.0.11
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [2198ecd]
+  - @reservoir0x/reservoir-sdk@2.0.10
+
 ## 1.0.9
 
 ### Patch Changes

diff --git a/packages/gelato-adapter/package.json b/packages/gelato-adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@reservoir0x/gelato-adapter",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "description": "An adapter used to enhance a ethers wallet adapter with the gelato SDK for use in the @reservoir0x/reservoir-sdk to enable gasless transactions",
     "exports": {
         ".": {

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## 1.12.15
 
+## 2.0.11
+
+### Patch Changes
+
+- 9c46f40: Add redstone testnet configuration
+
+## 2.0.10
+
+### Patch Changes
+
+- 2198ecd: Add apex pop testnet configuration
+
 ## 2.0.9
 
 ### Patch Changes

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@reservoir0x/reservoir-sdk",
-    "version": "2.0.9",
+    "version": "2.0.11",
     "description": "An SDK that can be used in any javascript/typescript context to easily interact with Reservoir liquidity APIs",
     "author": "Reservoir Protocol",
     "license": "MIT",

diff --git a/packages/sdk/src/utils/customChains.ts b/packages/sdk/src/utils/customChains.ts
@@ -198,6 +198,30 @@ export const astarZkEVM = {
   },
 } as const satisfies Chain
 
+export const redstoneTestnet = {
+  id: 17001,
+  name: 'Redstone Testnet',
+  nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.holesky.redstone.xyz'],
+    },
+    public: {
+      http: ['https://rpc.holesky.redstone.xyz'],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: 'Redstone Testnet',
+      url: 'https://explorer.holesky.redstone.xyz',
+    },
+    default: {
+      name: 'Redstone Testnet',
+      url: 'https://explorer.holesky.redstone.xyz',
+    },
+  },
+} as const satisfies Chain
+
 export const customChains = {
   ancient8,
   ancient8Testnet,
@@ -207,4 +231,5 @@ export const customChains = {
   apexPopTestnet,
   blast,
   astarZkEVM,
+  redstoneTestnet,
 } as const satisfies Record<string, Chain>
diff --git a/packages/sdk/src/utils/paymentTokens.ts b/packages/sdk/src/utils/paymentTokens.ts
@@ -615,4 +615,21 @@ export const chainPaymentTokensMap = {
       decimals: 18,
     },
   ],
+  // Redstone Testnet
+  17001: [
+    {
+      chainId: 17001,
+      address: zeroAddress,
+      symbol: 'ETH',
+      name: 'ETH',
+      decimals: 18,
+    },
+    {
+      chainId: 17001,
+      address: '0x09d940117bd1df3165a22820517a946426605f60',
+      symbol: 'WETH',
+      name: 'WETH',
+      decimals: 18,
+    },
+  ],
 } as Record<number, PaymentToken[]>
diff --git a/packages/sdk/src/utils/reservoirChains.ts b/packages/sdk/src/utils/reservoirChains.ts
@@ -243,6 +243,14 @@ const astarZkEVM = {
   checkPollingInterval: 1000,
 } satisfies ReservoirBaseChain
 
+const redstoneTestnet = {
+  id: 17001,
+  name: 'Redstone Testnet',
+  baseApiUrl: 'https://api-redstone-testnet.reservoir.tools',
+  paymentTokens: chainPaymentTokensMap[17001],
+  checkPollingInterval: 1000,
+} satisfies ReservoirBaseChain
+
 export const reservoirChains = {
   mainnet,
   goerli,
@@ -273,4 +281,5 @@ export const reservoirChains = {
   apexPopTestnet,
   blast,
   astarZkEVM,
+  redstoneTestnet
 }
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,21 @@
 ## 1.25.10
 
+## 2.4.3
+
+### Patch Changes
+
+- 9c46f40: Add redstone testnet configuration
+- Updated dependencies [9c46f40]
+  - @reservoir0x/reservoir-sdk@2.0.11
+
+## 2.4.2
+
+### Patch Changes
+
+- 2198ecd: Add apex pop testnet configuration
+- Updated dependencies [2198ecd]
+  - @reservoir0x/reservoir-sdk@2.0.10
+
 ## 2.4.1
 
 ### Patch Changes

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@reservoir0x/reservoir-kit-ui",
   "description": "ReservoirKit is the official frontend kit to get you started building dApps with the ReservoirProtocol.",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "author": "Reservoir Protocol",
   "license": "MIT",
   "exports": {

diff --git a/packages/ui/src/constants/chainIcons.tsx b/packages/ui/src/constants/chainIcons.tsx
@@ -58,6 +58,9 @@ import BlastIconLight from '../img/chains/BlastIconLight'
 import AstarZkEVMLight from '../img/chains/AstarZkEVMLight'
 import AstarZkEVMDark from '../img/chains/AstarZkEVMDark'
 import AstarZkEVMColor from '../img/chains/AstarZkEVMColor'
+import RedstoneTestnetColor from '../img/chains/RedstoneTestnetColor'
+import RedstoneTestnetDark from '../img/chains/RedstoneTestnetDark'
+import RedstoneTestnetLight from '../img/chains/RedstoneTestnetLight'
 
 const chainIcons = {
   [reservoirChains.ancient8.id]: {
@@ -200,6 +203,11 @@ const chainIcons = {
     dark: <AstarZkEVMDark />,
     color: <AstarZkEVMColor />,
   },
+  [reservoirChains.redstoneTestnet.id]: {
+    light: <RedstoneTestnetLight />,
+    dark: <RedstoneTestnetDark />,
+    color: <RedstoneTestnetColor />,
+  },
 }
 
 export default chainIcons
diff --git a/packages/ui/src/constants/wrappedContractNames.ts b/packages/ui/src/constants/wrappedContractNames.ts
@@ -28,5 +28,6 @@ const wrappedContractNames: Record<number, string> = {
   70800: 'WETH', //apex pop testnet
   81457: 'WETH', //blast
   3776: 'WETH', // astar zkevm,
+  17001: 'WETH', // redstone testnet
 }
 export default wrappedContractNames
diff --git a/packages/ui/src/constants/wrappedContracts.ts b/packages/ui/src/constants/wrappedContracts.ts
@@ -28,6 +28,7 @@ const wrappedContracts: Record<number, string> = {
   70800: '0xBfB86801053600dd3C7FCBa6d5E85017a64cE728', //apex pop testnet
   81457: '0x4300000000000000000000000000000000000004', //blast
   3776: '0xE9CC37904875B459Fa5D0FE37680d36F1ED55e38', // astar zkEVM
+  17001: '0x09d940117bd1df3165a22820517a946426605f60', // redstone testnet
 }
 
 export default wrappedContracts
diff --git a/packages/ui/src/img/chains/RedstoneTestnetColor.tsx b/packages/ui/src/img/chains/RedstoneTestnetColor.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+
+export default () => (
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
+<rect width="200" height="200" fill="#F34242"/>
+<g clip-path="url(#clip0_1_376)">
+<path opacity="0.75" d="M84 84H68V68H84V84Z" fill="white"/>
+<path d="M84 100H68V84H84V100Z" fill="white"/>
+<path d="M84 116H68V100H84V116Z" fill="white"/>
+<path opacity="0.75" d="M84 132H68V116H84V132Z" fill="white"/>
+<path opacity="0.75" d="M132 84H116V68H132V84Z" fill="white"/>
+<path d="M132 100H116V84H132V100Z" fill="white"/>
+<path d="M132 116H116V100H132V116Z" fill="white"/>
+<path opacity="0.75" d="M132 132H116V116H132V132Z" fill="white"/>
+<path d="M100 132H84V116H100V132Z" fill="white"/>
+<path d="M116 132H100V116H116V132Z" fill="white"/>
+<path d="M100 84H84V68H100V84Z" fill="white"/>
+<path d="M116 84H100V68H116V84Z" fill="white"/>
+<path d="M100 36H84V52H100V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 148H100V132H116V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 100H132V116H148V100Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 116H52V100H68V116Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 52H100V68H116V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 36H100V52H116V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 164H84V148H100V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 164H100V148H116V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 84H148V100H164V84Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 100H148V116H164V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 116H36V100H52V116Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 100H36V84H52V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 52H84V68H100V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M100 148H84V132H100V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 84H132V100H148V84Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 100H52V84H68V100Z" fill="white" fill-opacity="0.75"/>
+</g>
+<defs>
+<clipPath id="clip0_1_376">
+<rect width="128" height="128" fill="white" transform="translate(36 36)"/>
+</clipPath>
+</defs>
+</svg>
+)
diff --git a/packages/ui/src/img/chains/RedstoneTestnetDark.tsx b/packages/ui/src/img/chains/RedstoneTestnetDark.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+
+export default () => (
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_639)">
+<path opacity="0.75" d="M84 84H68V68H84V84Z" fill="white"/>
+<path d="M84 100H68V84H84V100Z" fill="white"/>
+<path d="M84 116H68V100H84V116Z" fill="white"/>
+<path opacity="0.75" d="M84 132H68V116H84V132Z" fill="white"/>
+<path opacity="0.75" d="M132 84H116V68H132V84Z" fill="white"/>
+<path d="M132 100H116V84H132V100Z" fill="white"/>
+<path d="M132 116H116V100H132V116Z" fill="white"/>
+<path opacity="0.75" d="M132 132H116V116H132V132Z" fill="white"/>
+<path d="M100 132H84V116H100V132Z" fill="white"/>
+<path d="M116 132H100V116H116V132Z" fill="white"/>
+<path d="M100 84H84V68H100V84Z" fill="white"/>
+<path d="M116 84H100V68H116V84Z" fill="white"/>
+<path d="M100 36H84V52H100V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 148H100V132H116V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 100H132V116H148V100Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 116H52V100H68V116Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 52H100V68H116V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 36H100V52H116V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 164H84V148H100V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 164H100V148H116V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 84H148V100H164V84Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 100H148V116H164V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 116H36V100H52V116Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 100H36V84H52V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 52H84V68H100V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M100 148H84V132H100V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 84H132V100H148V84Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 100H52V84H68V100Z" fill="white" fill-opacity="0.75"/>
+</g>
+<defs>
+<clipPath id="clip0_1_639">
+<rect width="128" height="128" fill="white" transform="translate(36 36)"/>
+</clipPath>
+</defs>
+</svg>
+
+)
diff --git a/packages/ui/src/img/chains/RedstoneTestnetLight.tsx b/packages/ui/src/img/chains/RedstoneTestnetLight.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+
+export default () => (
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_639)">
+<path opacity="0.75" d="M84 84H68V68H84V84Z" fill="white"/>
+<path d="M84 100H68V84H84V100Z" fill="white"/>
+<path d="M84 116H68V100H84V116Z" fill="white"/>
+<path opacity="0.75" d="M84 132H68V116H84V132Z" fill="white"/>
+<path opacity="0.75" d="M132 84H116V68H132V84Z" fill="white"/>
+<path d="M132 100H116V84H132V100Z" fill="white"/>
+<path d="M132 116H116V100H132V116Z" fill="white"/>
+<path opacity="0.75" d="M132 132H116V116H132V132Z" fill="white"/>
+<path d="M100 132H84V116H100V132Z" fill="white"/>
+<path d="M116 132H100V116H116V132Z" fill="white"/>
+<path d="M100 84H84V68H100V84Z" fill="white"/>
+<path d="M116 84H100V68H116V84Z" fill="white"/>
+<path d="M100 36H84V52H100V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 148H100V132H116V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 100H132V116H148V100Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 116H52V100H68V116Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 52H100V68H116V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M116 36H100V52H116V36Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 164H84V148H100V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M116 164H100V148H116V164Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 84H148V100H164V84Z" fill="white" fill-opacity="0.25"/>
+<path d="M164 100H148V116H164V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 116H36V100H52V116Z" fill="white" fill-opacity="0.25"/>
+<path d="M52 100H36V84H52V100Z" fill="white" fill-opacity="0.25"/>
+<path d="M100 52H84V68H100V52Z" fill="white" fill-opacity="0.75"/>
+<path d="M100 148H84V132H100V148Z" fill="white" fill-opacity="0.75"/>
+<path d="M148 84H132V100H148V84Z" fill="white" fill-opacity="0.75"/>
+<path d="M68 100H52V84H68V100Z" fill="white" fill-opacity="0.75"/>
+</g>
+<defs>
+<clipPath id="clip0_1_639">
+<rect width="128" height="128" fill="white" transform="translate(36 36)"/>
+</clipPath>
+</defs>
+</svg>
+
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,5 +189,8 @@ export default [ @@
       },
       {
         ...reservoirChains.astarZkEVM,
+      },
+      {
+        ...reservoirChains.redstoneTestnet,
       }
     ]