Merge pull request #163 from pimlicolabs/reduce-chainid-call

use client's chain id if possible
pimlicolabs · Apr 10, 2024 · 7057b1a · 7057b1a
2 parents 8e154cf + 9cb81f6
commit 7057b1a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/silent-candles-wonder.md b/.changeset/silent-candles-wonder.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+Performance improvement - reduced network call for chain id
diff --git a/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts b/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts
@@ -259,7 +259,7 @@ export async function signerToBiconomySmartAccount<
                 fallbackHandlerAddress,
                 index
             }),
-        getChainId(client)
+        client.chain?.id ?? getChainId(client)
     ])
 
     if (!accountAddress) throw new Error("Account address not found")

diff --git a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts
@@ -279,7 +279,7 @@ export async function signerToEcdsaKernelSmartAccount<
                 deployedAccountAddress,
                 factoryAddress
             }),
-        getChainId(client)
+        client.chain?.id ?? getChainId(client)
     ])
 
     if (!accountAddress) throw new Error("Account address not found")

diff --git a/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts b/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts
@@ -628,7 +628,7 @@ export async function signerToSafeSmartAccount<
         setupTransactions = []
     }: SignerToSafeSmartAccountParameters<entryPoint, TSource, TAddress>
 ): Promise<SafeSmartAccount<entryPoint, TTransport, TChain>> {
-    const chainId = await getChainId(client)
+    const chainId = client.chain?.id ?? (await getChainId(client))
 
     const viemSigner: LocalAccount = {
         ...signer,

diff --git a/packages/permissionless/accounts/simple/signerToSimpleSmartAccount.ts b/packages/permissionless/accounts/simple/signerToSimpleSmartAccount.ts
@@ -153,7 +153,7 @@ export async function signerToSimpleSmartAccount<
                 owner: viemSigner.address,
                 index
             }),
-        getChainId(client)
+        client.chain?.id ?? getChainId(client)
     ])
 
     if (!accountAddress) throw new Error("Account address not found")