thirdweb 5.48.2 → 5.48.3-nightly-a8e2bc58c9e8fe5b75d6c27d406e6b80d5d067e2-20240828000339

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

@@ -200,7 +200,7 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       expect(logs.some((l) => l.args.isAdmin)).toBe(true);
     });
 
-    it("can use a different factory without replay protectin", async () => {
+    it("can use a different factory without replay protection", async () => {
       const wallet = smartWallet({
         chain,
         factoryAddress: factoryAddress,

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

@@ -6,6 +6,7 @@ import { zkSyncSepolia } from "../../chains/chain-definitions/zksync-sepolia.js"
 import { defineChain } from "../../chains/utils.js";
 import { getContract } from "../../contract/contract.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.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";
 import type { Account, Wallet } from "../interfaces/wallet.js";
@@ -50,7 +51,7 @@ describe.runIf(process.env.TW_SECRET_KEY).skip(
     });
 
     it("should send a transactions", async () => {
-      const tx = await sendTransaction({
+      const tx = await sendAndConfirmTransaction({
         transaction: claimTo({
           contract,
           quantity: 1n,
@@ -107,9 +108,8 @@ describe.runIf(process.env.TW_SECRET_KEY).skip(
           to: account.address,
           tokenId: 0n,
         }),
-        account: smartAccount,
+        account: account,
       });
-      console.log("tx", tx.transactionHash);
       expect(tx.transactionHash.length).toBe(66);
     });
   },

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

@@ -9,7 +9,7 @@ import type {
   CreateWalletArgs,
   WalletConnectionOption,
 } from "../wallet-types.js";
-import { DEFAULT_ACCOUNT_FACTORY } from "./lib/constants.js";
+import { getDefaultAccountFactory } from "./lib/constants.js";
 
 /**
  * Creates a ERC4337 smart wallet based on a admin account.
@@ -170,7 +170,9 @@ export function smartWallet(
       }
       // check if factory is deployed
       const factory = getContract({
-        address: createOptions.factoryAddress || DEFAULT_ACCOUNT_FACTORY,
+        address:
+          createOptions.factoryAddress ||
+          getDefaultAccountFactory(createOptions.overrides?.entrypointAddress),
         chain: newChain,
         client: lastConnectOptions.client,
       });

package/src/wallets/smart/types.ts

@@ -21,7 +21,9 @@ export type SmartWalletOptions = Prettify<
         address: string;
         token: string;
       };
-      paymaster?: (userOp: UserOperation) => Promise<PaymasterResult>;
+      paymaster?: (
+        userOp: UserOperationV06 | UserOperationV07,
+      ) => Promise<PaymasterResult>;
       predictAddress?: (factoryContract: ThirdwebContract) => Promise<string>;
       createAccount?: (
         factoryContract: ThirdwebContract,
@@ -74,21 +76,51 @@ export type SmartWalletConnectionOptions = {
   chain?: Chain;
 };
 
-export type UserOperation = {
+export type UserOperationV06 = {
   sender: Address;
   nonce: bigint;
-  initCode: Hex | Uint8Array;
-  callData: Hex | Uint8Array;
+  initCode: Hex;
+  callData: Hex;
   callGasLimit: bigint;
   verificationGasLimit: bigint;
   preVerificationGas: bigint;
   maxFeePerGas: bigint;
   maxPriorityFeePerGas: bigint;
-  paymasterAndData: Hex | Uint8Array;
-  signature: Hex | Uint8Array;
+  paymasterAndData: Hex;
+  signature: Hex;
+};
+
+export type UserOperationV07 = {
+  sender: string; // address
+  nonce: bigint; // uint256
+  factory: string | undefined; // address
+  factoryData: Hex; // bytes
+  callData: Hex; // bytes
+  callGasLimit: bigint; // uint256
+  verificationGasLimit: bigint; // uint256
+  preVerificationGas: bigint; // uint256
+  maxFeePerGas: bigint; // uint256
+  maxPriorityFeePerGas: bigint; // uint256
+  paymaster: string | undefined; // address
+  paymasterData: Hex; // bytes
+  paymasterVerificationGasLimit: bigint; // uint256
+  paymasterPostOpGasLimit: bigint; // uint256
+  signature: Hex; // bytes
+};
+
+export type PackedUserOperation = {
+  sender: string; // address
+  nonce: bigint; // uint256
+  initCode: Hex; // bytes
+  callData: Hex; // bytes
+  accountGasLimits: Hex; // bytes32
+  preVerificationGas: bigint; // uint256
+  gasFees: Hex; // bytes32
+  paymasterAndData: Hex; // bytes
+  signature: Hex; // bytes
 };
 
-export type UserOperationHexed = {
+export type UserOperationV06Hexed = {
   sender: Address;
   nonce: Hex;
   initCode: Hex;
@@ -102,18 +134,50 @@ export type UserOperationHexed = {
   signature: Hex;
 };
 
+export type UserOperationV07Hexed = {
+  sender: Hex;
+  nonce: Hex;
+  factory: Hex;
+  factoryData: Hex;
+  callData: Hex;
+  callGasLimit: Hex;
+  verificationGasLimit: Hex;
+  preVerificationGas: Hex;
+  maxFeePerGas: Hex;
+  maxPriorityFeePerGas: Hex;
+  paymaster: Hex;
+  paymasterVerificationGasLimit: Hex;
+  paymasterPostOpGasLimit: Hex;
+  paymasterData: Hex;
+  signature: Hex;
+};
+
 export type PaymasterResult = {
-  paymasterAndData: string;
   preVerificationGas?: bigint;
   verificationGasLimit?: bigint;
   callGasLimit?: bigint;
-};
+} & (
+  | {
+      // v0.6 types
+      paymasterAndData: string;
+    }
+  | {
+      // v0.7 types
+      paymaster: string;
+      paymasterData: string;
+      paymasterVerificationGasLimit?: bigint;
+      paymasterPostOpGasLimit?: bigint;
+    }
+);
 
 export type EstimationResult = {
   preVerificationGas: bigint;
   verificationGas: bigint;
   verificationGasLimit: bigint;
   callGasLimit: bigint;
+  // v0.7 types
+  paymasterVerificationGasLimit?: bigint;
+  paymasterPostOpGasLimit?: bigint;
 };
 
 export type GasPriceResult = {