Update api-kit-interoperability

safe-global · Feb 5, 2025 · e145ac4 · e145ac4
1 parent bfe5591
commit e145ac4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/playground/config/run.ts b/playground/config/run.ts
@@ -17,9 +17,9 @@ const playgroundApiKitPaths = {
   'execute-transaction': 'api-kit/execute-transaction'
 }
 const playgroundRelayKitPaths = {
-  'api-kit-interoperability': 'relay-kit/api-kit-interoperability',
-  'relay-paid-transaction': 'relay-kit/paid-transaction',
-  'relay-sponsored-transaction': 'relay-kit/sponsored-transaction',
+  'gelato-paid-transaction': 'relay-kit/gelato-paid-transaction',
+  'gelato-sponsored-transaction': 'relay-kit/gelato-sponsored-transaction',
+  'userop-api-kit-interoperability': 'relay-kit/userop-api-kit-interoperability',
   userop: 'relay-kit/userop',
   'userop-counterfactual': 'relay-kit/userop-counterfactual',
   'userop-erc20-paymaster': 'relay-kit/userop-erc20-paymaster',

diff --git a/playground/relay-kit/paid-transaction.ts → ...ound/relay-kit/gelato-paid-transaction.ts b/playground/relay-kit/paid-transaction.ts → ...ound/relay-kit/gelato-paid-transaction.ts
diff --git a/...ground/relay-kit/sponsored-transaction.ts → ...relay-kit/gelato-sponsored-transaction.ts b/...ground/relay-kit/sponsored-transaction.ts → ...relay-kit/gelato-sponsored-transaction.ts
diff --git a/...und/relay-kit/api-kit-interoperability.ts → ...ay-kit/userop-api-kit-interoperability.ts b/...und/relay-kit/api-kit-interoperability.ts → ...ay-kit/userop-api-kit-interoperability.ts
@@ -1,22 +1,19 @@
 import { privateKeyToAddress } from 'viem/accounts'
-import { sepolia } from 'viem/chains'
 import SafeApiKit from '@safe-global/api-kit'
 import { Safe4337Pack } from '@safe-global/relay-kit'
 import { waitForOperationToFinish } from '../utils'
 
 // Variables
 const OWNER_1_PRIVATE_KEY = '0x'
 const OWNER_2_PRIVATE_KEY = '0x'
-const PIMLICO_API_KEY = ''
-const SAFE_ADDRESS = '' // Safe 2/N
+const SAFE_ADDRESS = '0x' // Safe 2/N
 
-const CHAIN_NAME = 'sepolia'
-const CHAIN_ID = sepolia.id
-const RPC_URL = sepolia.rpcUrls.default.http[0]
+const CHAIN_ID = '11155111'
+const RPC_URL = 'https://ethereum-sepolia-rpc.publicnode.com'
 
 // Constants
-const BUNDLER_URL = `https://api.pimlico.io/v2/${CHAIN_NAME}/rpc?apikey=${PIMLICO_API_KEY}`
-const PAYMASTER_URL = `https://api.pimlico.io/v2/${CHAIN_NAME}/rpc?apikey=${PIMLICO_API_KEY}`
+const BUNDLER_URL = 'https://...'
+const PAYMASTER_URL = 'https://...'
 
 async function main() {
   const apiKit = new SafeApiKit({ chainId: BigInt(CHAIN_ID) })
@@ -25,8 +22,12 @@ async function main() {
     provider: RPC_URL,
     signer: OWNER_1_PRIVATE_KEY,
     bundlerUrl: BUNDLER_URL,
+    safeModulesVersion: '0.2.0',
+    paymasterOptions: {
+      isSponsored: true,
+      paymasterUrl: PAYMASTER_URL
+    },
     options: {
-      owners: [OWNER_1_PRIVATE_KEY, OWNER_2_PRIVATE_KEY],
       safeAddress: SAFE_ADDRESS
     }
   })
@@ -60,6 +61,7 @@ async function main() {
     provider: RPC_URL,
     signer: OWNER_2_PRIVATE_KEY,
     bundlerUrl: BUNDLER_URL,
+    safeModulesVersion: '0.2.0',
     paymasterOptions: {
       isSponsored: true,
       paymasterUrl: PAYMASTER_URL
@@ -87,7 +89,7 @@ async function main() {
   })
   console.log('Executing the SafeOperation...')
 
-  await waitForOperationToFinish(userOperationHash, CHAIN_NAME, safe4337Pack)
+  await waitForOperationToFinish(userOperationHash, CHAIN_ID, safe4337Pack)
 }
 
 main()