feat: added param to specify non aa rpc url and bump version

zerodevapp · Jan 16, 2024 · c651d53 · c651d53
1 parent aec48cd
commit c651d53
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.5.5",
+  "version": "4.6.0",
   "description": "A collection of ERC-4337 compliant smart contract account interfaces",
   "author": "ZeroDev",
   "license": "MIT",

diff --git a/packages/accounts/src/kernel-zerodev/__tests__/config/index.ts b/packages/accounts/src/kernel-zerodev/__tests__/config/index.ts
@@ -7,7 +7,7 @@ export const config = {
   ownerWallet: process.env.OWNER_WALLET,
   mockWallet: "0x48D4d3536cDe7A257087206870c6B6E76e3D4ff4",
   chain: polygonMumbai,
-  rpcProvider: "https://mumbai-bundler.etherspot.io/",
+  rpcProvider: process.env.RPC_URL,
   validatorAddress: "0xd9AB5096a832b9ce79914329DAEE236f8Eea0390" as Hex,
   accountFactoryAddress: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3" as Hex,
   entryPointAddress: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789" as Hex,

diff --git a/packages/accounts/src/kernel-zerodev/account.ts b/packages/accounts/src/kernel-zerodev/account.ts
@@ -92,7 +92,8 @@ export class KernelSmartContractAccount<
       typeof params.rpcClient === "string"
         ? createZeroDevPublicErc4337Client({
             chain,
-            rpcUrl: params.rpcClient ?? BUNDLER_URL,
+            rpcUrl: params.rpcClient,
+            bundlerRpcUrl: params.rpcClient ?? BUNDLER_URL,
             projectId: params.projectId,
             bundlerProvider: params.bundlerProvider,
           })

diff --git a/packages/accounts/src/kernel-zerodev/client/create-client.ts b/packages/accounts/src/kernel-zerodev/client/create-client.ts
@@ -12,6 +12,7 @@ interface ZeroDevClientConfig {
   chain: Chain;
   projectId: string;
   rpcUrl?: string;
+  bundlerRpcUrl?: string;
   bundlerProvider?: PaymasterAndBundlerProviders;
 }
 
@@ -37,20 +38,21 @@ function isMethodInErc4337RpcSchema(
 export const createZeroDevPublicErc4337Client = ({
   chain,
   rpcUrl,
+  bundlerRpcUrl,
   projectId,
   bundlerProvider,
 }: ZeroDevClientConfig): PublicErc4337Client<HttpTransport> => {
-  const erc4337Transport = http(rpcUrl, {
+  const erc4337Transport = http(bundlerRpcUrl ?? BUNDLER_URL, {
     fetchOptions: {
       // @ts-ignore
-      headers: rpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
+      headers: bundlerRpcUrl === BUNDLER_URL ? { projectId, bundlerProvider } : {},
     },
     name: "Connected bundler network",
     key: "connected-bundler-network",
     retryCount: 0,
     timeout: 35000,
   });
-  const publicTransport = http(CHAIN_ID_TO_NODE[chain.id]);
+  const publicTransport = http(rpcUrl ?? CHAIN_ID_TO_NODE[chain.id]);
   let client = createPublicErc4337FromClient(
     createPublicClient({
       chain,

diff --git a/packages/accounts/src/kernel-zerodev/provider.ts b/packages/accounts/src/kernel-zerodev/provider.ts
@@ -53,6 +53,7 @@ export type ZeroDevProviderConfig = {
   chain: Chain | number;
   entryPointAddress?: Address;
   rpcUrl?: string;
+  bundlerRpcUrl?: string;
   account?: KernelSmartContractAccount;
   bundlerProvider?: PaymasterAndBundlerProviders;
   opts?: SmartAccountProviderOpts & {
@@ -87,7 +88,8 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
     projectId,
     chain,
     entryPointAddress = ENTRYPOINT_ADDRESS,
-    rpcUrl = BUNDLER_URL,
+    rpcUrl,
+    bundlerRpcUrl = BUNDLER_URL,
     account,
     bundlerProvider,
     opts,
@@ -96,6 +98,7 @@ export class ZeroDevProvider extends SmartAccountProvider<HttpTransport> {
     const rpcClient = createZeroDevPublicErc4337Client({
       chain: _chain,
       rpcUrl,
+      bundlerRpcUrl,
       projectId,
       bundlerProvider,
     });