refrence working with overrides

Author: joaquim-verges

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

@@ -3,6 +3,7 @@ import {
   type TypedData,
   type TypedDataDefinition,
   type TypedDataDomain,
+  encodePacked,
   hashTypedData,
   maxUint96,
 } from "viem";
@@ -354,9 +355,9 @@ async function createSmartAccount(
         });
         if (isModularFactory) {
           // add validator address
-          sig = encodeAbiParameters(
-            [{ type: "address" }, { type: "bytes" }],
-            [ZERO_ADDRESS, sig],
+          sig = encodePacked(
+            ["address", "bytes"],
+            ["0x6DF8ea6FF6Ca55f367CDA45510CA40dC78993DEC", sig],
           );
         }
       } else {

packages/thirdweb/src/wallets/smart/lib/userop.ts

@@ -16,7 +16,7 @@ import type { PreparedTransaction } from "../../../transaction/prepare-transacti
 import type { TransactionReceipt } from "../../../transaction/types.js";
 import { encodeAbiParameters } from "../../../utils/abi/encodeAbiParameters.js";
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
-import { type Hex, toHex } from "../../../utils/encoding/hex.js";
+import type { Hex } from "../../../utils/encoding/hex.js";
 import { hexToBytes } from "../../../utils/encoding/to-bytes.js";
 import { isThirdwebUrl } from "../../../utils/fetch.js";
 import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
@@ -435,7 +435,7 @@ async function populateUserOp_v0_6(args: {
   sponsorGas: boolean;
   overrides?: SmartWalletOptions["overrides"];
   isDeployed: boolean;
-  nonce: bigint;
+  nonce: bigint | Hex;
   callData: Hex;
   callGasLimit?: bigint;
   maxFeePerGas: bigint;
@@ -651,7 +651,7 @@ async function getAccountNonce(options: {
   client: ThirdwebClient;
   entrypointAddress?: string;
   getNonceOverride?: (accountContract: ThirdwebContract) => Promise<bigint>;
-}) {
+}): Promise<bigint> {
   const {
     accountContract,
     chain,
@@ -662,7 +662,7 @@ async function getAccountNonce(options: {
   if (getNonceOverride) {
     return getNonceOverride(accountContract);
   }
-  const nonce = await getNonce({
+  return await getNonce({
     contract: getContract({
       address: entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
       chain,
@@ -671,11 +671,6 @@ async function getAccountNonce(options: {
     key: generateRandomUint192(),
     sender: accountContract.address,
   });
-  // FIXME - only for modular accounts to pass validator in
-  const withValidator = `0x${"0".repeat(40)}${toHex(nonce).slice(42)}`;
-  console.log("withValidator", withValidator);
-  console.log("withValidator", withValidator.length);
-  return withValidator;
 }
 
 /**

packages/thirdweb/src/wallets/smart/smart-wallet-modular.test.ts

@@ -1,9 +1,14 @@
+import { Hex } from "ox";
+import { encodePacked, stringToHex, toHex } from "viem";
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
 import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
+import { ZERO_ADDRESS } from "../../constants/addresses.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { getNonce } from "../../extensions/erc4337/__generated__/IEntryPoint/read/getNonce.js";
 import { encodeSingleInitMSA } from "../../extensions/erc7579/__generated__/Bootstrap/write/singleInitMSA.js";
+import { execute } from "../../extensions/erc7579/__generated__/IERC7579Account/write/execute.js";
 import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareContractCall } from "../../transaction/prepare-contract-call.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
@@ -14,6 +19,7 @@ import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js
 import { keccak256 } from "../../utils/hashing/keccak256.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { ENTRYPOINT_ADDRESS_v0_7 } from "./lib/constants.js";
+import { generateRandomUint192 } from "./lib/utils.js";
 import { smartWallet } from "./smart-wallet.js";
 let wallet: Wallet;
 let smartAccount: Account;
@@ -38,6 +44,7 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       // personalAccount = await generateAccount({
       //   client,
       //  });
+      const VALIDATOR_ADDRESS = "0x6DF8ea6FF6Ca55f367CDA45510CA40dC78993DEC";
       wallet = smartWallet({
         chain,
         gasless: true,
@@ -53,9 +60,9 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
                 encodeAbiParameters(
                   [{ type: "address" }, { type: "bytes" }],
                   [
-                    "0x1E919660050C68BFEf868945Cf5f9a26ad7E360b", // bootstrap
+                    "0xedd4503de72bac321dfeb65f1373d2def17403fc", // bootstrap
                     encodeSingleInitMSA({
-                      validator: "0x11D02847245Df7cF19f48C8907ace59289D8aCEe", // mock validator
+                      validator: VALIDATOR_ADDRESS, // simple validator
                       data: "0x",
                     }),
                   ],
@@ -73,16 +80,50 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
                 encodeAbiParameters(
                   [{ type: "address" }, { type: "bytes" }],
                   [
-                    "0x1E919660050C68BFEf868945Cf5f9a26ad7E360b", // bootstrap
+                    "0xedd4503de72bac321dfeb65f1373d2def17403fc", // bootstrap
                     encodeSingleInitMSA({
-                      validator: "0x11D02847245Df7cF19f48C8907ace59289D8aCEe", // mock validator
+                      validator: VALIDATOR_ADDRESS, // simple validator
                       data: "0x",
                     }),
                   ],
                 ),
               ],
             });
           },
+          execute(accountContract, transaction) {
+            return execute({
+              contract: accountContract,
+              async asyncParams() {
+                return {
+                  mode: stringToHex("", { size: 32 }), // single execution
+                  executionCalldata: encodePacked(
+                    ["address", "uint256", "bytes"],
+                    [
+                      transaction.to || ZERO_ADDRESS,
+                      transaction.value || 0n,
+                      transaction.data || "0x",
+                    ],
+                  ),
+                };
+              },
+            });
+          },
+          async getAccountNonce(accountContract) {
+            const nonce = await getNonce({
+              contract: getContract({
+                address: ENTRYPOINT_ADDRESS_v0_7,
+                chain,
+                client,
+              }),
+              key: generateRandomUint192(),
+              sender: accountContract.address,
+            });
+            // FIXME - only for modular accounts to pass validator in
+            const withValidator = `${VALIDATOR_ADDRESS}${toHex(nonce).slice(42)}`;
+            console.log("DEBUG withValidator", withValidator);
+            console.log("DEBUG withValidator", withValidator.length);
+            return Hex.toBigInt(withValidator as Hex.Hex);
+          },
         },
       });
       smartAccount = await wallet.connect({
@@ -101,7 +142,7 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       expect(smartWalletAddress).toHaveLength(42);
 
       // const d = decodeErrorResult({
-      //   data: "0xb927fe5e0000000000000000000000000000000000000000db72e07d8a92f3d9d30e3843",
+      //   data: "0x48c9cedab61d27f600000000000000000000000000000000000000000000000000000000",
       //   abi: await resolveContractAbi({
       //     address: smartWalletAddress,
       //     client,