[AA] Option to not deploy SW on sign message (#2222)

thirdweb-dev · Jan 26, 2024 · bf90fa5 · bf90fa5
1 parent 3d63a2c
commit bf90fa5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/.changeset/cool-planets-help.md b/.changeset/cool-planets-help.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/wallets": patch
+---
+
+[AA] Option to not deploy SW on sign message
diff --git a/packages/unity-js-bridge/src/thirdweb-bridge.ts b/packages/unity-js-bridge/src/thirdweb-bridge.ts
@@ -229,6 +229,7 @@ class ThirdwebBridge implements TWBridge {
             paymasterUrl: sdkOptions.smartWalletConfig?.paymasterUrl,
             // paymasterAPI: sdkOptions.smartWalletConfig?.paymasterAPI,
             entryPointAddress: sdkOptions.smartWalletConfig?.entryPointAddress,
+            deployOnSign: sdkOptions.smartWalletConfig?.deployOnSign,
           };
           walletInstance = new SmartWallet(config);
           break;

diff --git a/packages/wallets/src/evm/connectors/smart-wallet/index.ts b/packages/wallets/src/evm/connectors/smart-wallet/index.ts
@@ -54,6 +54,7 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
       this.config.paymasterUrl ||
       `https://${this.chainId}.bundler.thirdweb.com/v2`;
     const entryPointAddress = config.entryPointAddress || ENTRYPOINT_ADDRESS;
+    const deployOnSign = config.deployOnSign ?? true;
     const localSigner = await params.personalWallet.getSigner();
     const providerConfig: ProviderConfig = {
       chain: config.chain,
@@ -69,6 +70,7 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
             this.config.secretKey,
           ),
       gasless: config.gasless,
+      deployOnSign: deployOnSign,
       factoryAddress: config.factoryAddress,
       accountAddress: params.accountAddress,
       factoryInfo: config.factoryInfo || this.defaultFactoryInfo(),

diff --git a/packages/wallets/src/evm/connectors/smart-wallet/lib/erc4337-signer.ts b/packages/wallets/src/evm/connectors/smart-wallet/lib/erc4337-signer.ts
@@ -139,17 +139,18 @@ Code: ${errorCode}`;
   }
 
   async signMessage(message: Bytes | string): Promise<string> {
-    const isNotDeployed = await this.smartAccountAPI.checkAccountPhantom();
-    if (isNotDeployed) {
-      console.log(
-        "Account contract not deployed yet. Deploying account before signing message",
-      );
-      const tx = await this.sendTransaction({
-        to: await this.getAddress(),
-        data: "0x",
-      });
-      await tx.wait();
-    }
+      const isNotDeployed = await this.smartAccountAPI.checkAccountPhantom();
+      if (isNotDeployed && this.config.deployOnSign) {
+        console.log(
+          "Account contract not deployed yet. Deploying account before signing message",
+        );
+        const tx = await this.sendTransaction({
+          to: await this.getAddress(),
+          data: "0x",
+        });
+        await tx.wait();
+      }
+
     return await this.originalSigner.signMessage(message);
   }
 

diff --git a/packages/wallets/src/evm/connectors/smart-wallet/types.ts b/packages/wallets/src/evm/connectors/smart-wallet/types.ts
@@ -22,6 +22,7 @@ export type SmartWalletConfig = {
   paymasterUrl?: string;
   paymasterAPI?: PaymasterAPI;
   entryPointAddress?: string;
+  deployOnSign?: boolean;
 } & ContractInfoInput &
   WalletConnectReceiverConfig;
 
@@ -42,6 +43,7 @@ export interface ProviderConfig extends ContractInfo {
   accountAddress?: string;
   paymasterAPI: PaymasterAPI;
   gasless: boolean;
+  deployOnSign?: boolean;
 }
 
 export type ContractInfoInput = {