thirdweb 5.67.0-nightly-734707e28b829262a1b40f7db8c005d2adeaeaf9-20241107000509 → 5.67.1-nightly-a9375ce5939db3ddfe382b646a5c907b8f975b65-20241109000328

package/src/wallets/smart/index.ts

@@ -501,6 +501,7 @@ function createZkSyncAccount(args: {
         value: transaction.value ?? 0n,
         chain: getCachedChain(transaction.chainId),
         client: connectionOptions.client,
+        eip712: transaction.eip712,
       };
 
       let serializableTransaction = await populateEip712Transaction({
@@ -508,7 +509,7 @@ function createZkSyncAccount(args: {
         transaction: prepTx,
       });
 
-      if (args.sponsorGas) {
+      if (args.sponsorGas && !serializableTransaction.paymaster) {
         // get paymaster input
         const pmData = await getZkPaymasterData({
           options: {

package/src/wallets/smart/smart-wallet-dev.test.ts

@@ -1,9 +1,10 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { zkSyncSepolia } from "../../chains/chain-definitions/zksync-sepolia.js";
+import { defineChain } from "../../chains/utils.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { balanceOf } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
+import { deployPublishedContract } from "../../extensions/prebuilts/deploy-published.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
@@ -20,7 +21,7 @@ let smartWalletAddress: Address;
 let personalAccount: Account;
 let accountContract: ThirdwebContract;
 
-const chain = zkSyncSepolia;
+const chain = defineChain(531050104);
 const client = TEST_CLIENT;
 const contract = getContract({
   client,
@@ -69,7 +70,7 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
       expect(isDeployed).toEqual(true);
     });
 
-    it("should send a transaction", async () => {
+    it.skip("should send a transaction", async () => {
       const tx = prepareTransaction({
         client,
         chain,
@@ -106,5 +107,29 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
       });
       expect(balance).toEqual(1n);
     });
+
+    it("should deploy a published autofactory contract", async () => {
+      const address = await deployPublishedContract({
+        client: TEST_CLIENT,
+        chain,
+        account: smartAccount,
+        contractId: "DropERC721",
+        contractParams: {
+          defaultAdmin: smartAccount.address, // defaultAdmin
+          name: "test", // name
+          symbol: "test", // symbol
+          contractURI: "", // contractURI
+          trustedForwarders: [], // trustedForwarders
+          saleRecipient: smartAccount.address, // saleRecipient
+          royaltyRecipient: smartAccount.address, // royaltyRecipient
+          royaltyBps: 0n, // royaltyBps
+          platformFeeBps: 0n, // platformFeeBps
+          platformFeeRecipient: smartAccount.address, // platformFeeRecipient
+        },
+      });
+      console.log("deployed address", address);
+      expect(address).toBeDefined();
+      expect(address.length).toBe(42);
+    });
   },
 );

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -285,29 +285,8 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
     });
 
     it("can switch chains", async () => {
-      const baseSepoliaEdition = getContract({
-        address: "0x638263e3eAa3917a53630e61B1fBa685308024fa",
-        chain: baseSepolia,
-        client: TEST_CLIENT,
-      });
       await wallet.switchChain(baseSepolia);
-      const tx = await sendAndConfirmTransaction({
-        transaction: claimTo({
-          contract: baseSepoliaEdition,
-          quantity: 1n,
-          to: smartWalletAddress,
-          tokenId: 0n,
-        }),
-        // biome-ignore lint/style/noNonNullAssertion: should be set after switching chains
-        account: wallet.getAccount()!,
-      });
-      expect(tx.transactionHash).toHaveLength(66);
-      const balance = await balanceOf({
-        contract: baseSepoliaEdition,
-        owner: smartWalletAddress,
-        tokenId: 0n,
-      });
-      expect(balance).toEqual(1n);
+      expect(wallet.getChain()?.id).toEqual(baseSepolia.id);
     });
 
     it("can execute a 2 tx in parallel", async () => {

package/src/wallets/smart/smart-wallet.ts

@@ -167,6 +167,7 @@ export function smartWallet(
         client: options.client,
         walletType: "smart",
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;
@@ -187,6 +188,7 @@ export function smartWallet(
         client: options.client,
         walletType: "smart",
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       emitter.emit("accountChanged", account);