fix: optimistic implementation for getNonce() and cache for isAccount…

…Deployed

packages/account/package.json

@@ -47,6 +47,8 @@
     "@biconomy/node-client": "^3.1.0",
     "@biconomy/paymaster": "^3.1.0",
     "@ethersproject/providers": "^5.7.2",
-    "ethers": "^5.7.0"
+    "ethers": "^5.7.0",
+    "loglevel": "^1.8.1",
+    "lru-cache": "^10.0.1"
   }
 }

packages/account/src/BaseSmartAccount.ts

@@ -11,6 +11,7 @@ import { BaseSmartAccountConfig, Overrides, TransactionDetailsForUserOp } from "
 import { GasOverheads } from "./utils/Preverificaiton";
 import { EntryPoint, EntryPoint__factory } from "@account-abstraction/contracts";
 import { DEFAULT_ENTRYPOINT_ADDRESS } from "./utils/Constants";
+import LRUCache = require("lru-cache");
 
 type UserOperationKey = keyof UserOperation;
 
@@ -35,6 +36,10 @@ export abstract class BaseSmartAccount implements IBaseSmartAccount {
   // entryPoint connected to "zero" address. allowed to make static calls (e.g. to getSenderAddress)
   private readonly entryPoint!: EntryPoint;
 
+  private isContractDeployedCache = new LRUCache({
+    max: 500,
+  });
+
   constructor(_smartAccountConfig: BaseSmartAccountConfig) {
     this.index = _smartAccountConfig.index ?? 0;
     this.overheads = _smartAccountConfig.overheads;
@@ -242,8 +247,9 @@ export abstract class BaseSmartAccount implements IBaseSmartAccount {
       delete userOp.maxFeePerGas;
       delete userOp.maxPriorityFeePerGas;
       // Making call to bundler to get gas estimations for userOp
-      const { callGasLimit, verificationGasLimit, preVerificationGas, maxFeePerGas, maxPriorityFeePerGas } =
-        await this.bundler.estimateUserOpGas(userOp);
+      const { callGasLimit, verificationGasLimit, preVerificationGas, maxFeePerGas, maxPriorityFeePerGas } = await this.bundler.estimateUserOpGas(
+        userOp,
+      );
       // if neither user sent gas fee nor the bundler, estimate gas from provider
       if (!userOp.maxFeePerGas && !userOp.maxPriorityFeePerGas && (!maxFeePerGas || !maxPriorityFeePerGas)) {
         const feeData = await this.provider.getFeeData();
@@ -270,10 +276,15 @@ export abstract class BaseSmartAccount implements IBaseSmartAccount {
   }
 
   async isAccountDeployed(address: string): Promise<boolean> {
+    if (this.isContractDeployedCache.get(address)) {
+      return true;
+    }
+
     this.isProviderDefined();
     let isDeployed = false;
     const contractCode = await this.provider.getCode(address);
     if (contractCode.length > 2) {
+      this.isContractDeployedCache.set(address, true);
       isDeployed = true;
     } else {
       isDeployed = false;

packages/account/src/BiconomySmartAccountV2.ts

@@ -32,6 +32,7 @@ import {
   DEFAULT_FALLBACK_HANDLER_ADDRESS,
   PROXY_CREATION_CODE,
 } from "./utils/Constants";
+import log from "loglevel";
 
 type UserOperationKey = keyof UserOperation;
 export class BiconomySmartAccountV2 extends BaseSmartAccount {
@@ -130,11 +131,14 @@ export class BiconomySmartAccountV2 extends BaseSmartAccount {
   // Could call it nonce space
   async getNonce(nonceKey?: number): Promise<BigNumber> {
     const nonceSpace = nonceKey ?? 0;
-    if (await this.isAccountDeployed(await this.getAccountAddress())) {
+    try {
       const accountContract = await this._getAccountContract();
-      return accountContract.nonce(nonceSpace);
+      const nonce = await accountContract.nonce(nonceSpace);
+      return nonce;
+    } catch (e) {
+      log.debug("Failed to get nonce from deployed account. Returning 0 as nonce");
+      return BigNumber.from(0);
     }
-    return BigNumber.from(0);
   }
 
   /**

packages/account/src/SmartAccount.ts

@@ -124,8 +124,9 @@ export abstract class SmartAccount implements ISmartAccount {
       delete userOp.maxFeePerGas;
       delete userOp.maxPriorityFeePerGas;
       // Making call to bundler to get gas estimations for userOp
-      const { callGasLimit, verificationGasLimit, preVerificationGas, maxFeePerGas, maxPriorityFeePerGas } =
-        await this.bundler.estimateUserOpGas(userOp);
+      const { callGasLimit, verificationGasLimit, preVerificationGas, maxFeePerGas, maxPriorityFeePerGas } = await this.bundler.estimateUserOpGas(
+        userOp,
+      );
       if (!userOp.maxFeePerGas && !userOp.maxPriorityFeePerGas && (!maxFeePerGas || !maxPriorityFeePerGas)) {
         const feeData = await this.provider.getFeeData();
         finalUserOp.maxFeePerGas = feeData.maxFeePerGas ?? feeData.gasPrice ?? (await this.provider.getGasPrice());

packages/web3-auth-native/src/SocialLogin.ts

@@ -31,8 +31,9 @@ class SocialLogin {
   }
 
   async whitelistUrl(origin: string): Promise<string> {
-    const whiteListUrlResponse: WhiteListSignatureResponse =
-      await this.nodeClient.whitelistUrl(origin)
+    const whiteListUrlResponse: WhiteListSignatureResponse = await this.nodeClient.whitelistUrl(
+      origin
+    )
     return whiteListUrlResponse.data
   }