fix(sdk): smart account transactions on non-original chain

Author: gregfromstl

packages/thirdweb/src/wallets/smart/index.ts

@@ -56,6 +56,11 @@ import type {
   UserOperationV06,
   UserOperationV07,
 } from "./types.js";
+import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
+import {
+  confirmContractDeployment,
+  deploySmartAccount,
+} from "./lib/signing.js";
 /**
  * Checks if the provided wallet is a smart wallet.
  *
@@ -214,16 +219,16 @@ async function createSmartAccount(
     }
   }
 
-  const { accountContract } = options;
+  let accountContract = options.accountContract;
   const account: Account = {
     address: getAddress(accountContract.address),
     async sendTransaction(transaction: SendTransactionOption) {
       // if erc20 paymaster - check allowance and approve if needed
       let paymasterOverride:
         | undefined
         | ((
-            userOp: UserOperationV06 | UserOperationV07,
-          ) => Promise<PaymasterResult>) = undefined;
+          userOp: UserOperationV06 | UserOperationV07,
+        ) => Promise<PaymasterResult>) = undefined;
       if (erc20Paymaster) {
         await approveERC20({
           accountContract,
@@ -241,21 +246,17 @@ async function createSmartAccount(
         paymasterOverride = options.overrides?.paymaster;
       }
 
-      const accountContractForTransaction = (() => {
-        // If this transaction is for a different chain than the initial one, get the account contract for that chain
-        if (transaction.chainId !== accountContract.chain.id) {
-          return getContract({
-            address: account.address,
-            chain: getCachedChain(transaction.chainId),
-            client: options.client,
-          });
-        }
-        // Default to the existing account contract
-        return accountContract;
-      })();
+      // If this transaction is for a different chain than the initial one, get the account contract for that chain
+      if (transaction.chainId !== accountContract.chain.id) {
+        accountContract = getContract({
+          address: account.address,
+          chain: getCachedChain(transaction.chainId),
+          client: options.client,
+        });
+      }
 
       const executeTx = prepareExecute({
-        accountContract: accountContractForTransaction,
+        accountContract: accountContract,
         transaction,
         executeOverride: options.overrides?.execute,
       });

packages/thirdweb/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -158,7 +158,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(isValid).toEqual(true);
     });
 
-    it("can send a transaction on another chain", async () => {
+    it.only("can send a transaction on another chain", async () => {
       const tx = await sendAndConfirmTransaction({
         transaction: prepareTransaction({
           to: TEST_WALLET_A,