@aa-sdk/core 4.12.0 → 4.13.0

package/dist/esm/account/smartContractAccount.d.ts

@@ -75,8 +75,10 @@ export type ToSmartContractAccountParams<Name extends string = string, TTranspor
     getDummySignature: () => Hex | Promise<Hex>;
     encodeExecute: (tx: AccountOp) => Promise<Hex>;
     encodeBatchExecute?: (txs: AccountOp[]) => Promise<Hex>;
+    getNonce?: (nonceKey?: bigint) => Promise<bigint>;
     signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;
     encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;
+    getImplementationAddress?: () => Promise<NullAddress | Address>;
 } & Omit<CustomSource, "signTransaction" | "address">;
 /**
  * Parses the factory address and factory calldata from the provided account initialization code (initCode).
@@ -120,4 +122,4 @@ export type GetAccountAddressParams = {
  * @returns {Promise<Address>} A promise that resolves to the account address
  */
 export declare const getAccountAddress: ({ client, entryPoint, accountAddress, getAccountInitCode, }: GetAccountAddressParams) => Promise<`0x${string}`>;
-export declare function toSmartContractAccount<Name extends string = string, TTransport extends Transport = Transport, TChain extends Chain = Chain, TEntryPointVersion extends EntryPointVersion = EntryPointVersion>({ transport, chain, entryPoint, source, accountAddress, getAccountInitCode, signMessage, signTypedData, encodeBatchExecute, encodeExecute, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, }: ToSmartContractAccountParams<Name, TTransport, TChain, TEntryPointVersion>): Promise<SmartContractAccount<Name, TEntryPointVersion>>;
+export declare function toSmartContractAccount<Name extends string = string, TTransport extends Transport = Transport, TChain extends Chain = Chain, TEntryPointVersion extends EntryPointVersion = EntryPointVersion>({ transport, chain, entryPoint, source, accountAddress, getAccountInitCode, getNonce, signMessage, signTypedData, encodeBatchExecute, encodeExecute, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, }: ToSmartContractAccountParams<Name, TTransport, TChain, TEntryPointVersion>): Promise<SmartContractAccount<Name, TEntryPointVersion>>;

package/dist/esm/account/smartContractAccount.js

@@ -149,7 +149,7 @@ export const getAccountAddress = async ({ client, entryPoint, accountAddress, ge
  * @returns {Promise<SmartContractAccount>} a promise that resolves to a SmartContractAccount object with methods and properties for interacting with the smart contract account
  */
 export async function toSmartContractAccount(params) {
-    const { transport, chain, entryPoint, source, accountAddress, getAccountInitCode, signMessage, signTypedData, encodeBatchExecute, encodeExecute, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, } = params;
+    const { transport, chain, entryPoint, source, accountAddress, getAccountInitCode, signMessage, signTypedData, encodeExecute, encodeBatchExecute, getNonce, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, getImplementationAddress, } = params;
     const client = createBundlerClient({
         // we set the retry count to 0 so that viem doesn't retry during
         // getting the address. That call always reverts and without this
@@ -199,15 +199,16 @@ export async function toSmartContractAccount(params) {
         const initCode = await getInitCode();
         return initCode === "0x";
     };
-    const getNonce = async (nonceKey = 0n) => {
-        if (!(await isAccountDeployed())) {
-            return 0n;
-        }
-        return entryPointContract.read.getNonce([
-            accountAddress_,
-            nonceKey,
-        ]);
-    };
+    const getNonce_ = getNonce ??
+        (async (nonceKey = 0n) => {
+            if (!(await isAccountDeployed())) {
+                return 0n;
+            }
+            return entryPointContract.read.getNonce([
+                accountAddress_,
+                nonceKey,
+            ]);
+        });
     const account = toAccount({
         address: accountAddress_,
         signMessage,
@@ -241,19 +242,20 @@ export async function toSmartContractAccount(params) {
         ]);
         return create6492Signature(isDeployed, signature);
     };
-    const getImplementationAddress = async () => {
-        const storage = await client.getStorageAt({
-            address: account.address,
-            // This is the default slot for the implementation address for Proxies
-            slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+    const getImplementationAddress_ = getImplementationAddress ??
+        (async () => {
+            const storage = await client.getStorageAt({
+                address: account.address,
+                // This is the default slot for the implementation address for Proxies
+                slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+            });
+            if (storage == null) {
+                throw new FailedToGetStorageSlotError("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", "Proxy Implementation Address");
+            }
+            // The storage slot contains a full bytes32, but we want only the last 20 bytes.
+            // So, slice off the leading `0x` and the first 12 bytes (24 characters), leaving the last 20 bytes, then prefix with `0x`.
+            return `0x${storage.slice(26)}`;
         });
-        if (storage == null) {
-            throw new FailedToGetStorageSlotError("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", "Proxy Implementation Address");
-        }
-        // The storage slot contains a full bytes32, but we want only the last 20 bytes.
-        // So, slice off the leading `0x` and the first 12 bytes (24 characters), leaving the last 20 bytes, then prefix with `0x`.
-        return `0x${storage.slice(26)}`;
-    };
     if (entryPoint.version !== "0.6.0" && entryPoint.version !== "0.7.0") {
         throw new InvalidEntryPointError(chain, entryPoint.version);
     }
@@ -275,10 +277,10 @@ export async function toSmartContractAccount(params) {
         encodeUpgradeToAndCall: encodeUpgradeToAndCall_,
         getEntryPoint: () => entryPoint,
         isAccountDeployed,
-        getAccountNonce: getNonce,
+        getAccountNonce: getNonce_,
         signMessageWith6492,
         signTypedDataWith6492,
-        getImplementationAddress,
+        getImplementationAddress: getImplementationAddress_,
     };
 }
 //# sourceMappingURL=smartContractAccount.js.map

package/dist/esm/account/smartContractAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"smartContractAccount.js","sourceRoot":"","sources":["../../../src/account/smartContractAccount.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getContract,\n  hexToBytes,\n  type Address,\n  type Chain,\n  type CustomSource,\n  type Hex,\n  type LocalAccount,\n  type PublicClient,\n  type SignableMessage,\n  type Transport,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { toAccount } from \"viem/accounts\";\nimport { createBundlerClient } from \"../client/bundlerClient.js\";\nimport type {\n  EntryPointDef,\n  EntryPointRegistryBase,\n  EntryPointVersion,\n} from \"../entrypoint/types.js\";\nimport {\n  BatchExecutionNotSupportedError,\n  FailedToGetStorageSlotError,\n  GetCounterFactualAddressError,\n  SignTransactionNotSupportedError,\n  UpgradesNotSupportedError,\n} from \"../errors/account.js\";\nimport { InvalidRpcUrlError } from \"../errors/client.js\";\nimport { InvalidEntryPointError } from \"../errors/entrypoint.js\";\nimport { Logger } from \"../logger.js\";\nimport type { SmartAccountSigner } from \"../signer/types.js\";\nimport { wrapSignatureWith6492 } from \"../signer/utils.js\";\nimport type { NullAddress } from \"../types.js\";\nimport type { IsUndefined } from \"../utils/types.js\";\n\nexport type AccountOp = {\n  target: Address;\n  value?: bigint;\n  data: Hex | \"0x\";\n};\n\nexport enum DeploymentState {\n  UNDEFINED = \"0x0\",\n  NOT_DEPLOYED = \"0x1\",\n  DEPLOYED = \"0x2\",\n}\n\nexport type GetEntryPointFromAccount<\n  TAccount extends SmartContractAccount | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount\n> = GetAccountParameter<\n  TAccount,\n  TAccountOverride\n> extends SmartContractAccount<string, infer TEntryPointVersion>\n  ? TEntryPointVersion\n  : EntryPointVersion;\n\nexport type GetAccountParameter<\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount\n> = IsUndefined<TAccount> extends true\n  ? { account: TAccountOverride }\n  : { account?: TAccountOverride };\n\nexport type UpgradeToAndCallParams = {\n  upgradeToAddress: Address;\n  upgradeToInitData: Hex;\n};\n\nexport type SmartContractAccountWithSigner<\n  Name extends string = string,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = SmartContractAccount<Name, TEntryPointVersion> & {\n  getSigner: () => TSigner;\n};\n\n/**\n * Determines if the given SmartContractAccount has a signer associated with it.\n *\n * @example\n * ```ts\n * import { toSmartContractAccount } from \"@aa-sdk/core\";\n *\n * const account = await toSmartContractAccount(...);\n *\n * console.log(isSmartAccountWithSigner(account)); // false: the base account does not have a publicly accessible signer\n * ```\n *\n * @param {SmartContractAccount} account The account to check.\n * @returns {boolean} true if the account has a signer, otherwise false.\n */\nexport const isSmartAccountWithSigner = (\n  account: SmartContractAccount\n): account is SmartContractAccountWithSigner => {\n  return \"getSigner\" in account;\n};\n\n// [!region SmartContractAccount]\nexport type SmartContractAccount<\n  Name extends string = string,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = LocalAccount<Name> & {\n  source: Name;\n  getDummySignature: () => Hex | Promise<Hex>;\n  encodeExecute: (tx: AccountOp) => Promise<Hex>;\n  encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex>;\n  signUserOperationHash: (uoHash: Hex) => Promise<Hex>;\n  signMessageWith6492: (params: { message: SignableMessage }) => Promise<Hex>;\n  signTypedDataWith6492: <\n    const typedData extends TypedData | Record<string, unknown>,\n    primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n  >(\n    typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n  ) => Promise<Hex>;\n  encodeUpgradeToAndCall: (params: UpgradeToAndCallParams) => Promise<Hex>;\n  getAccountNonce(nonceKey?: bigint): Promise<bigint>;\n  getInitCode: () => Promise<Hex>;\n  isAccountDeployed: () => Promise<boolean>;\n  getFactoryAddress: () => Promise<Address>;\n  getFactoryData: () => Promise<Hex>;\n  getEntryPoint: () => EntryPointDef<TEntryPointVersion>;\n  getImplementationAddress: () => Promise<NullAddress | Address>;\n};\n// [!endregion SmartContractAccount]\n\nexport interface AccountEntryPointRegistry<Name extends string = string>\n  extends EntryPointRegistryBase<\n    SmartContractAccount<Name, EntryPointVersion>\n  > {\n  \"0.6.0\": SmartContractAccount<Name, \"0.6.0\">;\n  \"0.7.0\": SmartContractAccount<Name, \"0.7.0\">;\n}\n\n// [!region ToSmartContractAccountParams]\nexport type ToSmartContractAccountParams<\n  Name extends string = string,\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = {\n  source: Name;\n  transport: TTransport;\n  chain: TChain;\n  entryPoint: EntryPointDef<TEntryPointVersion, TChain>;\n  accountAddress?: Address;\n  getAccountInitCode: () => Promise<Hex>;\n  getDummySignature: () => Hex | Promise<Hex>;\n  encodeExecute: (tx: AccountOp) => Promise<Hex>;\n  encodeBatchExecute?: (txs: AccountOp[]) => Promise<Hex>;\n  // if not provided, will default to just using signMessage over the Hex\n  signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;\n  encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;\n} & Omit<CustomSource, \"signTransaction\" | \"address\">;\n// [!endregion ToSmartContractAccountParams]\n\n/**\n * Parses the factory address and factory calldata from the provided account initialization code (initCode).\n *\n * @example\n * ```ts\n * import { parseFactoryAddressFromAccountInitCode } from \"@aa-sdk/core\";\n *\n * const [address, calldata] = parseFactoryAddressFromAccountInitCode(\"0xAddressCalldata\");\n * ```\n *\n * @param {Hex} initCode The initialization code from which to parse the factory address and calldata\n * @returns {[Address, Hex]} A tuple containing the parsed factory address and factory calldata\n */\nexport const parseFactoryAddressFromAccountInitCode = (\n  initCode: Hex\n): [Address, Hex] => {\n  const factoryAddress: Address = `0x${initCode.substring(2, 42)}`;\n  const factoryCalldata: Hex = `0x${initCode.substring(42)}`;\n  return [factoryAddress, factoryCalldata];\n};\n\nexport type GetAccountAddressParams = {\n  client: PublicClient;\n  entryPoint: EntryPointDef;\n  accountAddress?: Address;\n  getAccountInitCode: () => Promise<Hex>;\n};\n\n/**\n * Retrieves the account address. Uses a provided `accountAddress` if available; otherwise, it computes the address using the entry point contract and the initial code.\n *\n * @example\n * ```ts\n * import { getEntryPoint, getAccountAddress } from \"@aa-sdk/core\";\n *\n * const accountAddress = await getAccountAddress({\n *  client,\n *  entryPoint: getEntryPoint(chain),\n *  getAccountInitCode: async () => \"0x{factoryAddress}{factoryCallData}\",\n * });\n * ```\n *\n * @param {GetAccountAddressParams} params The configuration object\n * @param {PublicClient} params.client A public client instance to interact with the blockchain\n * @param {EntryPointDef} params.entryPoint The entry point definition which includes the address and ABI\n * @param {Address} params.accountAddress Optional existing account address\n * @param {() => Promise<Hex>} params.getAccountInitCode A function that returns a Promise resolving to a Hex string representing the initial code of the account\n * @returns {Promise<Address>} A promise that resolves to the account address\n */\nexport const getAccountAddress = async ({\n  client,\n  entryPoint,\n  accountAddress,\n  getAccountInitCode,\n}: GetAccountAddressParams) => {\n  if (accountAddress) return accountAddress;\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  const initCode = await getAccountInitCode();\n  Logger.verbose(\"[BaseSmartContractAccount](getAddress) initCode: \", initCode);\n\n  try {\n    await entryPointContract.simulate.getSenderAddress([initCode]);\n  } catch (err: any) {\n    Logger.verbose(\n      \"[BaseSmartContractAccount](getAddress) getSenderAddress err: \",\n      err\n    );\n    if (err.cause?.data?.errorName === \"SenderAddressResult\") {\n      Logger.verbose(\n        \"[BaseSmartContractAccount](getAddress) entryPoint.getSenderAddress result:\",\n        err.cause.data.args[0]\n      );\n\n      return err.cause.data.args[0] as Address;\n    }\n\n    if (err.details === \"Invalid URL\") {\n      throw new InvalidRpcUrlError();\n    }\n  }\n\n  throw new GetCounterFactualAddressError();\n};\n\n// [!region toSmartContractAccount]\nexport async function toSmartContractAccount<\n  Name extends string = string,\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n>({\n  transport,\n  chain,\n  entryPoint,\n  source,\n  accountAddress,\n  getAccountInitCode,\n  signMessage,\n  signTypedData,\n  encodeBatchExecute,\n  encodeExecute,\n  getDummySignature,\n  signUserOperationHash,\n  encodeUpgradeToAndCall,\n}: ToSmartContractAccountParams<\n  Name,\n  TTransport,\n  TChain,\n  TEntryPointVersion\n>): Promise<SmartContractAccount<Name, TEntryPointVersion>>;\n// [!endregion toSmartContractAccount]\n\n/**\n * Converts an account to a smart contract account and sets up various account-related methods using the provided parameters like transport, chain, entry point, and other utilities.\n *\n * @example\n * ```ts\n * import { http, type SignableMessage } from \"viem\";\n * import { sepolia } from \"viem/chains\";\n *\n * const myAccount = await toSmartContractAccount({\n *  /// REQUIRED PARAMS ///\n *  source: \"MyAccount\",\n *  transport: http(\"RPC_URL\"),\n *  chain: sepolia,\n *  // The EntryPointDef that your account is com\"patible with\n *  entryPoint: getEntryPoint(sepolia, { version: \"0.6.0\" }),\n *  // This should return a concatenation of your `factoryAddress` and the `callData` for your factory's create account method\n *  getAccountInitCode: async () => \"0x{factoryAddress}{callData}\",\n *  // an invalid signature that doesn't cause your account to revert during validation\n *  getDummySignature: () => \"0x1234...\",\n *  // given a UO in the form of {target, data, value} should output the calldata for calling your contract's execution method\n *  encodeExecute: async (uo) => \"0xcalldata\",\n *  signMessage: async ({ message }: { message: SignableMessage }) => \"0x...\",\n *  signTypedData: async (typedData) => \"0x000\",\n *\n *  /// OPTIONAL PARAMS ///\n *  // if you already know your account's address, pass that in here to avoid generating a new counterfactual\n *  accountAddress: \"0xaddressoverride\",\n *  // if your account supports batching, this should take an array of UOs and return the calldata for calling your contract's batchExecute method\n *  encodeBatchExecute: async (uos) => \"0x...\",\n *  // if your contract expects a different signing scheme than the default signMessage scheme, you can override that here\n *  signUserOperationHash: async (hash) => \"0x...\",\n *  // allows you to define the calldata for upgrading your account\n *  encodeUpgradeToAndCall: async (params) => \"0x...\",\n * });\n * ```\n *\n * @param {ToSmartContractAccountParams} params the parameters required for converting to a smart contract account\n * @param {Transport} params.transport the transport mechanism used for communication\n * @param {Chain} params.chain the blockchain chain used in the account\n * @param {EntryPoint} params.entryPoint the entry point of the smart contract\n * @param {string} params.source the source identifier for the account\n * @param {Address} [params.accountAddress] the address of the account\n * @param {() => Promise<Hex>} params.getAccountInitCode a function to get the initial state code of the account\n * @param {(message: { message: SignableMessage }) => Promise<Hex>} params.signMessage a function to sign a message\n * @param {(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>} params.signTypedData a function to sign typed data\n * @param {(transactions: Transaction[]) => Hex} [params.encodeBatchExecute] a function to encode batch transactions\n * @param {(tx: Transaction) => Hex} params.encodeExecute a function to encode a single transaction\n * @param {() => Promise<Hex>} params.getDummySignature a function to get a dummy signature\n * @param {(uoHash: Hex) => Promise<Hex>} [params.signUserOperationHash] a function to sign user operations\n * @param {(implementationAddress: Address, implementationCallData: Hex) => Hex} [params.encodeUpgradeToAndCall] a function to encode upgrade call\n * @returns {Promise<SmartContractAccount>} a promise that resolves to a SmartContractAccount object with methods and properties for interacting with the smart contract account\n */\nexport async function toSmartContractAccount(\n  params: ToSmartContractAccountParams\n): Promise<SmartContractAccount> {\n  const {\n    transport,\n    chain,\n    entryPoint,\n    source,\n    accountAddress,\n    getAccountInitCode,\n    signMessage,\n    signTypedData,\n    encodeBatchExecute,\n    encodeExecute,\n    getDummySignature,\n    signUserOperationHash,\n    encodeUpgradeToAndCall,\n  } = params;\n\n  const client = createBundlerClient({\n    // we set the retry count to 0 so that viem doesn't retry during\n    // getting the address. That call always reverts and without this\n    // viem will retry 3 times, making this call very slow\n    transport: (opts) => transport({ ...opts, chain, retryCount: 0 }),\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  const accountAddress_ = await getAccountAddress({\n    client,\n    entryPoint: entryPoint,\n    accountAddress,\n    getAccountInitCode,\n  });\n\n  let deploymentState = DeploymentState.UNDEFINED;\n\n  const getInitCode = async () => {\n    if (deploymentState === DeploymentState.DEPLOYED) {\n      return \"0x\";\n    }\n    const contractCode = await client.getCode({\n      address: accountAddress_,\n    });\n\n    if ((contractCode?.length ?? 0) > 2) {\n      deploymentState = DeploymentState.DEPLOYED;\n      return \"0x\";\n    } else {\n      deploymentState = DeploymentState.NOT_DEPLOYED;\n    }\n\n    return getAccountInitCode();\n  };\n\n  const signUserOperationHash_ =\n    signUserOperationHash ??\n    (async (uoHash: Hex) => {\n      return signMessage({ message: { raw: hexToBytes(uoHash) } });\n    });\n\n  const getFactoryAddress = async (): Promise<Address> =>\n    parseFactoryAddressFromAccountInitCode(await getAccountInitCode())[0];\n\n  const getFactoryData = async (): Promise<Hex> =>\n    parseFactoryAddressFromAccountInitCode(await getAccountInitCode())[1];\n\n  const encodeUpgradeToAndCall_ =\n    encodeUpgradeToAndCall ??\n    (() => {\n      throw new UpgradesNotSupportedError(source);\n    });\n\n  const isAccountDeployed = async () => {\n    const initCode = await getInitCode();\n    return initCode === \"0x\";\n  };\n\n  const getNonce = async (nonceKey = 0n): Promise<bigint> => {\n    if (!(await isAccountDeployed())) {\n      return 0n;\n    }\n\n    return entryPointContract.read.getNonce([\n      accountAddress_,\n      nonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const account = toAccount({\n    address: accountAddress_,\n    signMessage,\n    signTypedData,\n    signTransaction: () => {\n      throw new SignTransactionNotSupportedError();\n    },\n  });\n\n  const create6492Signature = async (isDeployed: boolean, signature: Hex) => {\n    if (isDeployed) {\n      return signature;\n    }\n\n    const [factoryAddress, factoryCalldata] =\n      parseFactoryAddressFromAccountInitCode(await getAccountInitCode());\n\n    return wrapSignatureWith6492({\n      factoryAddress,\n      factoryCalldata,\n      signature,\n    });\n  };\n\n  const signMessageWith6492 = async (message: { message: SignableMessage }) => {\n    const [isDeployed, signature] = await Promise.all([\n      isAccountDeployed(),\n      account.signMessage(message),\n    ]);\n\n    return create6492Signature(isDeployed, signature);\n  };\n\n  const signTypedDataWith6492 = async <\n    const typedData extends TypedData | Record<string, unknown>,\n    primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n  >(\n    typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n  ): Promise<Hex> => {\n    const [isDeployed, signature] = await Promise.all([\n      isAccountDeployed(),\n      account.signTypedData(typedDataDefinition),\n    ]);\n\n    return create6492Signature(isDeployed, signature);\n  };\n\n  const getImplementationAddress = async (): Promise<NullAddress | Address> => {\n    const storage = await client.getStorageAt({\n      address: account.address,\n      // This is the default slot for the implementation address for Proxies\n      slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n    });\n\n    if (storage == null) {\n      throw new FailedToGetStorageSlotError(\n        \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n        \"Proxy Implementation Address\"\n      );\n    }\n\n    // The storage slot contains a full bytes32, but we want only the last 20 bytes.\n    // So, slice off the leading `0x` and the first 12 bytes (24 characters), leaving the last 20 bytes, then prefix with `0x`.\n    return `0x${storage.slice(26)}`;\n  };\n\n  if (entryPoint.version !== \"0.6.0\" && entryPoint.version !== \"0.7.0\") {\n    throw new InvalidEntryPointError(chain, entryPoint.version);\n  }\n\n  return {\n    ...account,\n    source,\n    // TODO: I think this should probably be signUserOperation instead\n    // and allow for generating the UO hash based on the EP version\n    signUserOperationHash: signUserOperationHash_,\n    getFactoryAddress,\n    getFactoryData,\n    encodeBatchExecute:\n      encodeBatchExecute ??\n      (() => {\n        throw new BatchExecutionNotSupportedError(source);\n      }),\n    encodeExecute,\n    getDummySignature,\n    getInitCode,\n    encodeUpgradeToAndCall: encodeUpgradeToAndCall_,\n    getEntryPoint: () => entryPoint,\n    isAccountDeployed,\n    getAccountNonce: getNonce,\n    signMessageWith6492,\n    signTypedDataWith6492,\n    getImplementationAddress,\n  };\n}\n"]}
+{"version":3,"file":"smartContractAccount.js","sourceRoot":"","sources":["../../../src/account/smartContractAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,UAAU,GAWX,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,2BAA2B,EAC3B,6BAA6B,EAC7B,gCAAgC,EAChC,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAU3D,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,oCAAiB,CAAA;IACjB,uCAAoB,CAAA;IACpB,mCAAgB,CAAA;AAClB,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAkCD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,OAA6B,EACc,EAAE;IAC7C,OAAO,WAAW,IAAI,OAAO,CAAC;AAChC,CAAC,CAAC;AA4DF,4CAA4C;AAE5C;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,QAAa,EACG,EAAE;IAClB,MAAM,cAAc,GAAY,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IACjE,MAAM,eAAe,GAAQ,KAAK,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;IAC3D,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;AAC3C,CAAC,CAAC;AASF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,MAAM,EACN,UAAU,EACV,cAAc,EACd,kBAAkB,GACM,EAAE,EAAE;IAC5B,IAAI,cAAc;QAAE,OAAO,cAAc,CAAC;IAE1C,MAAM,kBAAkB,GAAG,WAAW,CAAC;QACrC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;QACnB,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,kBAAkB,EAAE,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,mDAAmD,EAAE,QAAQ,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,MAAM,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,CAAC,OAAO,CACZ,+DAA+D,EAC/D,GAAG,CACJ,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,KAAK,qBAAqB,EAAE,CAAC;YACzD,MAAM,CAAC,OAAO,CACZ,4EAA4E,EAC5E,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CACvB,CAAC;YAEF,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAY,CAAC;QAC3C,CAAC;QAED,IAAI,GAAG,CAAC,OAAO,KAAK,aAAa,EAAE,CAAC;YAClC,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,MAAM,IAAI,6BAA6B,EAAE,CAAC;AAC5C,CAAC,CAAC;AA6BF,sCAAsC;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAoC;IAEpC,MAAM,EACJ,SAAS,EACT,KAAK,EACL,UAAU,EACV,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,GACzB,GAAG,MAAM,CAAC;IAEX,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACjC,gEAAgE;QAChE,iEAAiE;QACjE,sDAAsD;QACtD,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QACjE,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,WAAW,CAAC;QACrC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;QACnB,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC;QAC9C,MAAM;QACN,UAAU,EAAE,UAAU;QACtB,cAAc;QACd,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,eAAe,GAAG,eAAe,CAAC,SAAS,CAAC;IAEhD,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;QAC7B,IAAI,eAAe,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YACxC,OAAO,EAAE,eAAe;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC;QACjD,CAAC;QAED,OAAO,kBAAkB,EAAE,CAAC;IAC9B,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAC1B,qBAAqB;QACrB,CAAC,KAAK,EAAE,MAAW,EAAE,EAAE;YACrB,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GAAG,KAAK,IAAsB,EAAE,CACrD,sCAAsC,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAExE,MAAM,cAAc,GAAG,KAAK,IAAkB,EAAE,CAC9C,sCAAsC,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAExE,MAAM,uBAAuB,GAC3B,sBAAsB;QACtB,CAAC,GAAG,EAAE;YACJ,MAAM,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;QACnC,MAAM,QAAQ,GAAG,MAAM,WAAW,EAAE,CAAC;QACrC,OAAO,QAAQ,KAAK,IAAI,CAAC;IAC3B,CAAC,CAAC;IAEF,MAAM,SAAS,GACb,QAAQ;QACR,CAAC,KAAK,EAAE,QAAQ,GAAG,EAAE,EAAmB,EAAE;YACxC,IAAI,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,EAAE,CAAC;gBACjC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACtC,eAAe;gBACf,QAAQ;aACT,CAAoB,CAAC;QACxB,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,GAAG,SAAS,CAAC;QACxB,OAAO,EAAE,eAAe;QACxB,WAAW;QACX,aAAa;QACb,eAAe,EAAE,GAAG,EAAE;YACpB,MAAM,IAAI,gCAAgC,EAAE,CAAC;QAC/C,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,KAAK,EAAE,UAAmB,EAAE,SAAc,EAAE,EAAE;QACxE,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,GACrC,sCAAsC,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC;QAErE,OAAO,qBAAqB,CAAC;YAC3B,cAAc;YACd,eAAe;YACf,SAAS;SACV,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAqC,EAAE,EAAE;QAC1E,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChD,iBAAiB,EAAE;YACnB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;SAC7B,CAAC,CAAC;QAEH,OAAO,mBAAmB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,KAAK,EAIjC,mBAAgE,EAClD,EAAE;QAChB,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChD,iBAAiB,EAAE;YACnB,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC;SAC3C,CAAC,CAAC;QAEH,OAAO,mBAAmB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC,CAAC;IAEF,MAAM,yBAAyB,GAC7B,wBAAwB;QACxB,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC;gBACxC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,sEAAsE;gBACtE,IAAI,EAAE,oEAAoE;aAC3E,CAAC,CAAC;YAEH,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,IAAI,2BAA2B,CACnC,oEAAoE,EACpE,8BAA8B,CAC/B,CAAC;YACJ,CAAC;YAED,gFAAgF;YAChF,2HAA2H;YAC3H,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;IAEL,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QACrE,MAAM,IAAI,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,GAAG,OAAO;QACV,MAAM;QACN,kEAAkE;QAClE,+DAA+D;QAC/D,qBAAqB,EAAE,sBAAsB;QAC7C,iBAAiB;QACjB,cAAc;QACd,kBAAkB,EAChB,kBAAkB;YAClB,CAAC,GAAG,EAAE;gBACJ,MAAM,IAAI,+BAA+B,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC,CAAC;QACJ,aAAa;QACb,iBAAiB;QACjB,WAAW;QACX,sBAAsB,EAAE,uBAAuB;QAC/C,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU;QAC/B,iBAAiB;QACjB,eAAe,EAAE,SAAS;QAC1B,mBAAmB;QACnB,qBAAqB;QACrB,wBAAwB,EAAE,yBAAyB;KACpD,CAAC;AACJ,CAAC","sourcesContent":["import {\n  getContract,\n  hexToBytes,\n  type Address,\n  type Chain,\n  type CustomSource,\n  type Hex,\n  type LocalAccount,\n  type PublicClient,\n  type SignableMessage,\n  type Transport,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { toAccount } from \"viem/accounts\";\nimport { createBundlerClient } from \"../client/bundlerClient.js\";\nimport type {\n  EntryPointDef,\n  EntryPointRegistryBase,\n  EntryPointVersion,\n} from \"../entrypoint/types.js\";\nimport {\n  BatchExecutionNotSupportedError,\n  FailedToGetStorageSlotError,\n  GetCounterFactualAddressError,\n  SignTransactionNotSupportedError,\n  UpgradesNotSupportedError,\n} from \"../errors/account.js\";\nimport { InvalidRpcUrlError } from \"../errors/client.js\";\nimport { InvalidEntryPointError } from \"../errors/entrypoint.js\";\nimport { Logger } from \"../logger.js\";\nimport type { SmartAccountSigner } from \"../signer/types.js\";\nimport { wrapSignatureWith6492 } from \"../signer/utils.js\";\nimport type { NullAddress } from \"../types.js\";\nimport type { IsUndefined } from \"../utils/types.js\";\n\nexport type AccountOp = {\n  target: Address;\n  value?: bigint;\n  data: Hex | \"0x\";\n};\n\nexport enum DeploymentState {\n  UNDEFINED = \"0x0\",\n  NOT_DEPLOYED = \"0x1\",\n  DEPLOYED = \"0x2\",\n}\n\nexport type GetEntryPointFromAccount<\n  TAccount extends SmartContractAccount | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount\n> = GetAccountParameter<\n  TAccount,\n  TAccountOverride\n> extends SmartContractAccount<string, infer TEntryPointVersion>\n  ? TEntryPointVersion\n  : EntryPointVersion;\n\nexport type GetAccountParameter<\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount\n> = IsUndefined<TAccount> extends true\n  ? { account: TAccountOverride }\n  : { account?: TAccountOverride };\n\nexport type UpgradeToAndCallParams = {\n  upgradeToAddress: Address;\n  upgradeToInitData: Hex;\n};\n\nexport type SmartContractAccountWithSigner<\n  Name extends string = string,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = SmartContractAccount<Name, TEntryPointVersion> & {\n  getSigner: () => TSigner;\n};\n\n/**\n * Determines if the given SmartContractAccount has a signer associated with it.\n *\n * @example\n * ```ts\n * import { toSmartContractAccount } from \"@aa-sdk/core\";\n *\n * const account = await toSmartContractAccount(...);\n *\n * console.log(isSmartAccountWithSigner(account)); // false: the base account does not have a publicly accessible signer\n * ```\n *\n * @param {SmartContractAccount} account The account to check.\n * @returns {boolean} true if the account has a signer, otherwise false.\n */\nexport const isSmartAccountWithSigner = (\n  account: SmartContractAccount\n): account is SmartContractAccountWithSigner => {\n  return \"getSigner\" in account;\n};\n\n// [!region SmartContractAccount]\nexport type SmartContractAccount<\n  Name extends string = string,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = LocalAccount<Name> & {\n  source: Name;\n  getDummySignature: () => Hex | Promise<Hex>;\n  encodeExecute: (tx: AccountOp) => Promise<Hex>;\n  encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex>;\n  signUserOperationHash: (uoHash: Hex) => Promise<Hex>;\n  signMessageWith6492: (params: { message: SignableMessage }) => Promise<Hex>;\n  signTypedDataWith6492: <\n    const typedData extends TypedData | Record<string, unknown>,\n    primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n  >(\n    typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n  ) => Promise<Hex>;\n  encodeUpgradeToAndCall: (params: UpgradeToAndCallParams) => Promise<Hex>;\n  getAccountNonce(nonceKey?: bigint): Promise<bigint>;\n  getInitCode: () => Promise<Hex>;\n  isAccountDeployed: () => Promise<boolean>;\n  getFactoryAddress: () => Promise<Address>;\n  getFactoryData: () => Promise<Hex>;\n  getEntryPoint: () => EntryPointDef<TEntryPointVersion>;\n  getImplementationAddress: () => Promise<NullAddress | Address>;\n};\n// [!endregion SmartContractAccount]\n\nexport interface AccountEntryPointRegistry<Name extends string = string>\n  extends EntryPointRegistryBase<\n    SmartContractAccount<Name, EntryPointVersion>\n  > {\n  \"0.6.0\": SmartContractAccount<Name, \"0.6.0\">;\n  \"0.7.0\": SmartContractAccount<Name, \"0.7.0\">;\n}\n\n// [!region ToSmartContractAccountParams]\nexport type ToSmartContractAccountParams<\n  Name extends string = string,\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = {\n  source: Name;\n  transport: TTransport;\n  chain: TChain;\n  entryPoint: EntryPointDef<TEntryPointVersion, TChain>;\n  accountAddress?: Address;\n  getAccountInitCode: () => Promise<Hex>;\n  getDummySignature: () => Hex | Promise<Hex>;\n  encodeExecute: (tx: AccountOp) => Promise<Hex>;\n  encodeBatchExecute?: (txs: AccountOp[]) => Promise<Hex>;\n  getNonce?: (nonceKey?: bigint) => Promise<bigint>;\n  // if not provided, will default to just using signMessage over the Hex\n  signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;\n  encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;\n  getImplementationAddress?: () => Promise<NullAddress | Address>;\n} & Omit<CustomSource, \"signTransaction\" | \"address\">;\n// [!endregion ToSmartContractAccountParams]\n\n/**\n * Parses the factory address and factory calldata from the provided account initialization code (initCode).\n *\n * @example\n * ```ts\n * import { parseFactoryAddressFromAccountInitCode } from \"@aa-sdk/core\";\n *\n * const [address, calldata] = parseFactoryAddressFromAccountInitCode(\"0xAddressCalldata\");\n * ```\n *\n * @param {Hex} initCode The initialization code from which to parse the factory address and calldata\n * @returns {[Address, Hex]} A tuple containing the parsed factory address and factory calldata\n */\nexport const parseFactoryAddressFromAccountInitCode = (\n  initCode: Hex\n): [Address, Hex] => {\n  const factoryAddress: Address = `0x${initCode.substring(2, 42)}`;\n  const factoryCalldata: Hex = `0x${initCode.substring(42)}`;\n  return [factoryAddress, factoryCalldata];\n};\n\nexport type GetAccountAddressParams = {\n  client: PublicClient;\n  entryPoint: EntryPointDef;\n  accountAddress?: Address;\n  getAccountInitCode: () => Promise<Hex>;\n};\n\n/**\n * Retrieves the account address. Uses a provided `accountAddress` if available; otherwise, it computes the address using the entry point contract and the initial code.\n *\n * @example\n * ```ts\n * import { getEntryPoint, getAccountAddress } from \"@aa-sdk/core\";\n *\n * const accountAddress = await getAccountAddress({\n *  client,\n *  entryPoint: getEntryPoint(chain),\n *  getAccountInitCode: async () => \"0x{factoryAddress}{factoryCallData}\",\n * });\n * ```\n *\n * @param {GetAccountAddressParams} params The configuration object\n * @param {PublicClient} params.client A public client instance to interact with the blockchain\n * @param {EntryPointDef} params.entryPoint The entry point definition which includes the address and ABI\n * @param {Address} params.accountAddress Optional existing account address\n * @param {() => Promise<Hex>} params.getAccountInitCode A function that returns a Promise resolving to a Hex string representing the initial code of the account\n * @returns {Promise<Address>} A promise that resolves to the account address\n */\nexport const getAccountAddress = async ({\n  client,\n  entryPoint,\n  accountAddress,\n  getAccountInitCode,\n}: GetAccountAddressParams) => {\n  if (accountAddress) return accountAddress;\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  const initCode = await getAccountInitCode();\n  Logger.verbose(\"[BaseSmartContractAccount](getAddress) initCode: \", initCode);\n\n  try {\n    await entryPointContract.simulate.getSenderAddress([initCode]);\n  } catch (err: any) {\n    Logger.verbose(\n      \"[BaseSmartContractAccount](getAddress) getSenderAddress err: \",\n      err\n    );\n    if (err.cause?.data?.errorName === \"SenderAddressResult\") {\n      Logger.verbose(\n        \"[BaseSmartContractAccount](getAddress) entryPoint.getSenderAddress result:\",\n        err.cause.data.args[0]\n      );\n\n      return err.cause.data.args[0] as Address;\n    }\n\n    if (err.details === \"Invalid URL\") {\n      throw new InvalidRpcUrlError();\n    }\n  }\n\n  throw new GetCounterFactualAddressError();\n};\n\n// [!region toSmartContractAccount]\nexport async function toSmartContractAccount<\n  Name extends string = string,\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n>({\n  transport,\n  chain,\n  entryPoint,\n  source,\n  accountAddress,\n  getAccountInitCode,\n  getNonce,\n  signMessage,\n  signTypedData,\n  encodeBatchExecute,\n  encodeExecute,\n  getDummySignature,\n  signUserOperationHash,\n  encodeUpgradeToAndCall,\n}: ToSmartContractAccountParams<\n  Name,\n  TTransport,\n  TChain,\n  TEntryPointVersion\n>): Promise<SmartContractAccount<Name, TEntryPointVersion>>;\n// [!endregion toSmartContractAccount]\n\n/**\n * Converts an account to a smart contract account and sets up various account-related methods using the provided parameters like transport, chain, entry point, and other utilities.\n *\n * @example\n * ```ts\n * import { http, type SignableMessage } from \"viem\";\n * import { sepolia } from \"viem/chains\";\n *\n * const myAccount = await toSmartContractAccount({\n *  /// REQUIRED PARAMS ///\n *  source: \"MyAccount\",\n *  transport: http(\"RPC_URL\"),\n *  chain: sepolia,\n *  // The EntryPointDef that your account is com\"patible with\n *  entryPoint: getEntryPoint(sepolia, { version: \"0.6.0\" }),\n *  // This should return a concatenation of your `factoryAddress` and the `callData` for your factory's create account method\n *  getAccountInitCode: async () => \"0x{factoryAddress}{callData}\",\n *  // an invalid signature that doesn't cause your account to revert during validation\n *  getDummySignature: () => \"0x1234...\",\n *  // given a UO in the form of {target, data, value} should output the calldata for calling your contract's execution method\n *  encodeExecute: async (uo) => \"0xcalldata\",\n *  signMessage: async ({ message }: { message: SignableMessage }) => \"0x...\",\n *  signTypedData: async (typedData) => \"0x000\",\n *\n *  /// OPTIONAL PARAMS ///\n *  // if you already know your account's address, pass that in here to avoid generating a new counterfactual\n *  accountAddress: \"0xaddressoverride\",\n *  // if your account supports batching, this should take an array of UOs and return the calldata for calling your contract's batchExecute method\n *  encodeBatchExecute: async (uos) => \"0x...\",\n *  // if your contract expects a different signing scheme than the default signMessage scheme, you can override that here\n *  signUserOperationHash: async (hash) => \"0x...\",\n *  // allows you to define the calldata for upgrading your account\n *  encodeUpgradeToAndCall: async (params) => \"0x...\",\n * });\n * ```\n *\n * @param {ToSmartContractAccountParams} params the parameters required for converting to a smart contract account\n * @param {Transport} params.transport the transport mechanism used for communication\n * @param {Chain} params.chain the blockchain chain used in the account\n * @param {EntryPoint} params.entryPoint the entry point of the smart contract\n * @param {string} params.source the source identifier for the account\n * @param {Address} [params.accountAddress] the address of the account\n * @param {() => Promise<Hex>} params.getAccountInitCode a function to get the initial state code of the account\n * @param {(message: { message: SignableMessage }) => Promise<Hex>} params.signMessage a function to sign a message\n * @param {(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>} params.signTypedData a function to sign typed data\n * @param {(transactions: Transaction[]) => Hex} [params.encodeBatchExecute] a function to encode batch transactions\n * @param {(tx: Transaction) => Hex} params.encodeExecute a function to encode a single transaction\n * @param {() => Promise<Hex>} params.getDummySignature a function to get a dummy signature\n * @param {(uoHash: Hex) => Promise<Hex>} [params.signUserOperationHash] a function to sign user operations\n * @param {(implementationAddress: Address, implementationCallData: Hex) => Hex} [params.encodeUpgradeToAndCall] a function to encode upgrade call\n * @returns {Promise<SmartContractAccount>} a promise that resolves to a SmartContractAccount object with methods and properties for interacting with the smart contract account\n */\nexport async function toSmartContractAccount(\n  params: ToSmartContractAccountParams\n): Promise<SmartContractAccount> {\n  const {\n    transport,\n    chain,\n    entryPoint,\n    source,\n    accountAddress,\n    getAccountInitCode,\n    signMessage,\n    signTypedData,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    getDummySignature,\n    signUserOperationHash,\n    encodeUpgradeToAndCall,\n    getImplementationAddress,\n  } = params;\n\n  const client = createBundlerClient({\n    // we set the retry count to 0 so that viem doesn't retry during\n    // getting the address. That call always reverts and without this\n    // viem will retry 3 times, making this call very slow\n    transport: (opts) => transport({ ...opts, chain, retryCount: 0 }),\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  const accountAddress_ = await getAccountAddress({\n    client,\n    entryPoint: entryPoint,\n    accountAddress,\n    getAccountInitCode,\n  });\n\n  let deploymentState = DeploymentState.UNDEFINED;\n\n  const getInitCode = async () => {\n    if (deploymentState === DeploymentState.DEPLOYED) {\n      return \"0x\";\n    }\n    const contractCode = await client.getCode({\n      address: accountAddress_,\n    });\n\n    if ((contractCode?.length ?? 0) > 2) {\n      deploymentState = DeploymentState.DEPLOYED;\n      return \"0x\";\n    } else {\n      deploymentState = DeploymentState.NOT_DEPLOYED;\n    }\n\n    return getAccountInitCode();\n  };\n\n  const signUserOperationHash_ =\n    signUserOperationHash ??\n    (async (uoHash: Hex) => {\n      return signMessage({ message: { raw: hexToBytes(uoHash) } });\n    });\n\n  const getFactoryAddress = async (): Promise<Address> =>\n    parseFactoryAddressFromAccountInitCode(await getAccountInitCode())[0];\n\n  const getFactoryData = async (): Promise<Hex> =>\n    parseFactoryAddressFromAccountInitCode(await getAccountInitCode())[1];\n\n  const encodeUpgradeToAndCall_ =\n    encodeUpgradeToAndCall ??\n    (() => {\n      throw new UpgradesNotSupportedError(source);\n    });\n\n  const isAccountDeployed = async () => {\n    const initCode = await getInitCode();\n    return initCode === \"0x\";\n  };\n\n  const getNonce_ =\n    getNonce ??\n    (async (nonceKey = 0n): Promise<bigint> => {\n      if (!(await isAccountDeployed())) {\n        return 0n;\n      }\n\n      return entryPointContract.read.getNonce([\n        accountAddress_,\n        nonceKey,\n      ]) as Promise<bigint>;\n    });\n\n  const account = toAccount({\n    address: accountAddress_,\n    signMessage,\n    signTypedData,\n    signTransaction: () => {\n      throw new SignTransactionNotSupportedError();\n    },\n  });\n\n  const create6492Signature = async (isDeployed: boolean, signature: Hex) => {\n    if (isDeployed) {\n      return signature;\n    }\n\n    const [factoryAddress, factoryCalldata] =\n      parseFactoryAddressFromAccountInitCode(await getAccountInitCode());\n\n    return wrapSignatureWith6492({\n      factoryAddress,\n      factoryCalldata,\n      signature,\n    });\n  };\n\n  const signMessageWith6492 = async (message: { message: SignableMessage }) => {\n    const [isDeployed, signature] = await Promise.all([\n      isAccountDeployed(),\n      account.signMessage(message),\n    ]);\n\n    return create6492Signature(isDeployed, signature);\n  };\n\n  const signTypedDataWith6492 = async <\n    const typedData extends TypedData | Record<string, unknown>,\n    primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n  >(\n    typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n  ): Promise<Hex> => {\n    const [isDeployed, signature] = await Promise.all([\n      isAccountDeployed(),\n      account.signTypedData(typedDataDefinition),\n    ]);\n\n    return create6492Signature(isDeployed, signature);\n  };\n\n  const getImplementationAddress_ =\n    getImplementationAddress ??\n    (async () => {\n      const storage = await client.getStorageAt({\n        address: account.address,\n        // This is the default slot for the implementation address for Proxies\n        slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n      });\n\n      if (storage == null) {\n        throw new FailedToGetStorageSlotError(\n          \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n          \"Proxy Implementation Address\"\n        );\n      }\n\n      // The storage slot contains a full bytes32, but we want only the last 20 bytes.\n      // So, slice off the leading `0x` and the first 12 bytes (24 characters), leaving the last 20 bytes, then prefix with `0x`.\n      return `0x${storage.slice(26)}`;\n    });\n\n  if (entryPoint.version !== \"0.6.0\" && entryPoint.version !== \"0.7.0\") {\n    throw new InvalidEntryPointError(chain, entryPoint.version);\n  }\n\n  return {\n    ...account,\n    source,\n    // TODO: I think this should probably be signUserOperation instead\n    // and allow for generating the UO hash based on the EP version\n    signUserOperationHash: signUserOperationHash_,\n    getFactoryAddress,\n    getFactoryData,\n    encodeBatchExecute:\n      encodeBatchExecute ??\n      (() => {\n        throw new BatchExecutionNotSupportedError(source);\n      }),\n    encodeExecute,\n    getDummySignature,\n    getInitCode,\n    encodeUpgradeToAndCall: encodeUpgradeToAndCall_,\n    getEntryPoint: () => entryPoint,\n    isAccountDeployed,\n    getAccountNonce: getNonce_,\n    signMessageWith6492,\n    signTypedDataWith6492,\n    getImplementationAddress: getImplementationAddress_,\n  };\n}\n"]}

package/dist/esm/entrypoint/0.6.d.ts

@@ -1024,6 +1024,6 @@ declare const _default: {
         readonly type: "receive";
     }];
     getUserOperationHash: (request: UserOperationRequest<"0.6.0">, entryPointAddress: Address, chainId: number) => Hash;
-    packUserOperation: (request: import("../types.js").UserOperationRequest_v6) => `0x${string}`;
+    packUserOperation: (request: UserOperationRequest<"0.6.0">) => `0x${string}`;
 };
 export default _default;

package/dist/esm/entrypoint/0.7.d.ts

@@ -781,7 +781,7 @@ declare const _default: {
         readonly type: "receive";
     }];
     getUserOperationHash: (request: UserOperationRequest<"0.7.0">, entryPointAddress: Address, chainId: number) => Hash;
-    packUserOperation: (request: UserOperationRequest_v7) => `0x${string}`;
+    packUserOperation: (request: UserOperationRequest<"0.7.0">) => `0x${string}`;
 };
 export default _default;
 export declare function packAccountGasLimits(data: Pick<UserOperationRequest_v7, "verificationGasLimit" | "callGasLimit"> | Pick<UserOperationRequest_v7, "maxPriorityFeePerGas" | "maxFeePerGas">): Hex;

package/dist/esm/errors/client.d.ts

@@ -70,3 +70,13 @@ export declare class EntityIdOverrideError extends BaseError {
      */
     constructor();
 }
+/**
+ * Error class denoting that the provided ma v2 account mode is invalid.
+ */
+export declare class InvalidModularAccountV2Mode extends BaseError {
+    name: string;
+    /**
+     * Initializes a new instance of the error message with a default message indicating that the provided ma v2 account mode is invalid.
+     */
+    constructor();
+}

package/dist/esm/errors/client.js

@@ -114,4 +114,21 @@ export class EntityIdOverrideError extends BaseError {
         });
     }
 }
+/**
+ * Error class denoting that the provided ma v2 account mode is invalid.
+ */
+export class InvalidModularAccountV2Mode extends BaseError {
+    /**
+     * Initializes a new instance of the error message with a default message indicating that the provided ma v2 account mode is invalid.
+     */
+    constructor() {
+        super(`The provided account mode is invalid for ModularAccount V2`);
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "InvalidModularAccountV2Mode"
+        });
+    }
+}
 //# sourceMappingURL=client.js.map

package/dist/esm/errors/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/errors/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IAGpD;;;;;;OAMG;IACH,YAAY,cAAsB,EAAE,MAAc,EAAE,MAAc;QAChE,KAAK,CACH;YACE,mBAAmB,MAAM,CAAC,IAAI,cAAc,cAAc,GAAG;YAC7D,qEAAqE,MAAM,IAAI;SAChF,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QAfK;;;;mBAAO,yBAAyB;WAAC;IAgB1C,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAG/C;;;;OAIG;IACH,YAAY,MAAe;QACzB,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;QAR5B;;;;mBAAO,oBAAoB;WAAC;IASrC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAG/C;;OAEG;IACH;QACE,KAAK,CAAC,iCAAiC,CAAC,CAAC;QANlC;;;;mBAAO,oBAAoB;WAAC;IAOrC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,qBAAqB,QAAQ,gDAAgD,CAC9E,CAAC;QAVK;;;;mBAAO,sBAAsB;WAAC;IAWvC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,gBAAgB,QAAQ,6CAA6C,CACtE,CAAC;QAVK;;;;mBAAO,sBAAsB;WAAC;IAWvC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD;;OAEG;IACH;QACE,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAN7D;;;;mBAAO,uBAAuB;WAAC;IAOxC,CAAC;CACF","sourcesContent":["import type { Client } from \"viem\";\nimport { BaseError } from \"./base.js\";\n\n/**\n * Represents an error thrown when a client is not compatible with the expected client type for a specific method. The error message provides guidance on how to create a compatible client.\n */\nexport class IncompatibleClientError extends BaseError {\n  override name = \"IncompatibleClientError\";\n\n  /**\n   * Throws an error when the client type does not match the expected client type.\n   *\n   * @param {string} expectedClient The expected type of the client.\n   * @param {string} method The method that was called.\n   * @param {Client} client The client instance.\n   */\n  constructor(expectedClient: string, method: string, client: Client) {\n    super(\n      [\n        `Client of type (${client.type}) is not a ${expectedClient}.`,\n        `Create one with \\`createSmartAccountClient\\` first before using \\`${method}\\``,\n      ].join(\"\\n\")\n    );\n  }\n}\n\n/**\n * Represents an error that occurs when an invalid RPC URL is provided. This class extends the `BaseError` class and includes the invalid URL in the error message.\n */\nexport class InvalidRpcUrlError extends BaseError {\n  override name = \"InvalidRpcUrlError\";\n\n  /**\n   * Creates an instance of an error with a message indicating an invalid RPC URL.\n   *\n   * @param {string} [rpcUrl] The invalid RPC URL that caused the error\n   */\n  constructor(rpcUrl?: string) {\n    super(`Invalid RPC URL ${rpcUrl}`);\n  }\n}\n\n/**\n * Error class representing a \"Chain Not Found\" error, typically thrown when no chain is supplied to the client.\n */\nexport class ChainNotFoundError extends BaseError {\n  override name = \"ChainNotFoundError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that no chain was supplied to the client.\n   */\n  constructor() {\n    super(\"No chain supplied to the client\");\n  }\n}\n\n/**\n * Error class denoting that the provided entity id is invalid because it's too large.\n */\nexport class InvalidEntityIdError extends BaseError {\n  override name = \"InvalidEntityIdError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the entity id is invalid because it's too large.\n   *\n   * @param {number} entityId the invalid entityId used\n   */\n  constructor(entityId: number) {\n    super(\n      `Entity ID used is ${entityId}, but must be less than or equal to uint32.max`\n    );\n  }\n}\n\n/**\n * Error class denoting that the nonce key is invalid because its too large.\n */\nexport class InvalidNonceKeyError extends BaseError {\n  override name = \"InvalidNonceKeyError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the nonce key is invalid.\n   *\n   * @param {bigint} nonceKey the invalid nonceKey used\n   */\n  constructor(nonceKey: bigint) {\n    super(\n      `Nonce key is ${nonceKey} but has to be less than or equal to 2**152`\n    );\n  }\n}\n\n/**\n * Error class denoting that the provided entity id is invalid because it's overriding the native entity id.\n */\nexport class EntityIdOverrideError extends BaseError {\n  override name = \"EntityIdOverrideError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the nonce key is invalid.\n   */\n  constructor() {\n    super(`EntityId of 0 is reserved for the owner and cannot be used`);\n  }\n}\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/errors/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IAGpD;;;;;;OAMG;IACH,YAAY,cAAsB,EAAE,MAAc,EAAE,MAAc;QAChE,KAAK,CACH;YACE,mBAAmB,MAAM,CAAC,IAAI,cAAc,cAAc,GAAG;YAC7D,qEAAqE,MAAM,IAAI;SAChF,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QAfK;;;;mBAAO,yBAAyB;WAAC;IAgB1C,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAG/C;;;;OAIG;IACH,YAAY,MAAe;QACzB,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;QAR5B;;;;mBAAO,oBAAoB;WAAC;IASrC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAG/C;;OAEG;IACH;QACE,KAAK,CAAC,iCAAiC,CAAC,CAAC;QANlC;;;;mBAAO,oBAAoB;WAAC;IAOrC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,qBAAqB,QAAQ,gDAAgD,CAC9E,CAAC;QAVK;;;;mBAAO,sBAAsB;WAAC;IAWvC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,gBAAgB,QAAQ,6CAA6C,CACtE,CAAC;QAVK;;;;mBAAO,sBAAsB;WAAC;IAWvC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD;;OAEG;IACH;QACE,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAN7D;;;;mBAAO,uBAAuB;WAAC;IAOxC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD;;OAEG;IACH;QACE,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAN7D;;;;mBAAO,6BAA6B;WAAC;IAO9C,CAAC;CACF","sourcesContent":["import type { Client } from \"viem\";\nimport { BaseError } from \"./base.js\";\n\n/**\n * Represents an error thrown when a client is not compatible with the expected client type for a specific method. The error message provides guidance on how to create a compatible client.\n */\nexport class IncompatibleClientError extends BaseError {\n  override name = \"IncompatibleClientError\";\n\n  /**\n   * Throws an error when the client type does not match the expected client type.\n   *\n   * @param {string} expectedClient The expected type of the client.\n   * @param {string} method The method that was called.\n   * @param {Client} client The client instance.\n   */\n  constructor(expectedClient: string, method: string, client: Client) {\n    super(\n      [\n        `Client of type (${client.type}) is not a ${expectedClient}.`,\n        `Create one with \\`createSmartAccountClient\\` first before using \\`${method}\\``,\n      ].join(\"\\n\")\n    );\n  }\n}\n\n/**\n * Represents an error that occurs when an invalid RPC URL is provided. This class extends the `BaseError` class and includes the invalid URL in the error message.\n */\nexport class InvalidRpcUrlError extends BaseError {\n  override name = \"InvalidRpcUrlError\";\n\n  /**\n   * Creates an instance of an error with a message indicating an invalid RPC URL.\n   *\n   * @param {string} [rpcUrl] The invalid RPC URL that caused the error\n   */\n  constructor(rpcUrl?: string) {\n    super(`Invalid RPC URL ${rpcUrl}`);\n  }\n}\n\n/**\n * Error class representing a \"Chain Not Found\" error, typically thrown when no chain is supplied to the client.\n */\nexport class ChainNotFoundError extends BaseError {\n  override name = \"ChainNotFoundError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that no chain was supplied to the client.\n   */\n  constructor() {\n    super(\"No chain supplied to the client\");\n  }\n}\n\n/**\n * Error class denoting that the provided entity id is invalid because it's too large.\n */\nexport class InvalidEntityIdError extends BaseError {\n  override name = \"InvalidEntityIdError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the entity id is invalid because it's too large.\n   *\n   * @param {number} entityId the invalid entityId used\n   */\n  constructor(entityId: number) {\n    super(\n      `Entity ID used is ${entityId}, but must be less than or equal to uint32.max`\n    );\n  }\n}\n\n/**\n * Error class denoting that the nonce key is invalid because its too large.\n */\nexport class InvalidNonceKeyError extends BaseError {\n  override name = \"InvalidNonceKeyError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the nonce key is invalid.\n   *\n   * @param {bigint} nonceKey the invalid nonceKey used\n   */\n  constructor(nonceKey: bigint) {\n    super(\n      `Nonce key is ${nonceKey} but has to be less than or equal to 2**152`\n    );\n  }\n}\n\n/**\n * Error class denoting that the provided entity id is invalid because it's overriding the native entity id.\n */\nexport class EntityIdOverrideError extends BaseError {\n  override name = \"EntityIdOverrideError\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the nonce key is invalid.\n   */\n  constructor() {\n    super(`EntityId of 0 is reserved for the owner and cannot be used`);\n  }\n}\n\n/**\n * Error class denoting that the provided ma v2 account mode is invalid.\n */\nexport class InvalidModularAccountV2Mode extends BaseError {\n  override name = \"InvalidModularAccountV2Mode\";\n\n  /**\n   * Initializes a new instance of the error message with a default message indicating that the provided ma v2 account mode is invalid.\n   */\n  constructor() {\n    super(`The provided account mode is invalid for ModularAccount V2`);\n  }\n}\n"]}

package/dist/esm/index.d.ts

@@ -33,13 +33,15 @@ export { defaultEntryPointVersion, entryPointRegistry, getEntryPoint, isEntryPoi
 export type * from "./entrypoint/types.js";
 export { AccountNotFoundError, AccountRequiresOwnerError, BatchExecutionNotSupportedError, DefaultFactoryNotDefinedError, FailedToGetStorageSlotError, GetCounterFactualAddressError, IncorrectAccountType, SignTransactionNotSupportedError, SmartAccountWithSignerRequiredError, UpgradeToAndCallNotSupportedError, UpgradesNotSupportedError, } from "./errors/account.js";
 export { BaseError } from "./errors/base.js";
-export { ChainNotFoundError, IncompatibleClientError, InvalidRpcUrlError, InvalidEntityIdError, InvalidNonceKeyError, EntityIdOverrideError, } from "./errors/client.js";
+export { ChainNotFoundError, IncompatibleClientError, InvalidRpcUrlError, InvalidEntityIdError, InvalidNonceKeyError, EntityIdOverrideError, InvalidModularAccountV2Mode, } from "./errors/client.js";
 export { EntryPointNotFoundError, InvalidEntryPointError, } from "./errors/entrypoint.js";
 export { InvalidSignerTypeError } from "./errors/signer.js";
 export { FailedToFindTransactionError, TransactionMissingToParamError, } from "./errors/transaction.js";
 export { InvalidUserOperationError, WaitForUserOperationError, } from "./errors/useroperation.js";
 export { LogLevel, Logger } from "./logger.js";
 export { middlewareActions } from "./middleware/actions.js";
+export { default7702UserOpSigner } from "./middleware/defaults/7702signer.js";
+export { default7702GasEstimator } from "./middleware/defaults/7702gasEstimator.js";
 export { defaultFeeEstimator } from "./middleware/defaults/feeEstimator.js";
 export { defaultGasEstimator } from "./middleware/defaults/gasEstimator.js";
 export { defaultPaymasterAndData } from "./middleware/defaults/paymasterAndData.js";

package/dist/esm/index.js

@@ -23,13 +23,15 @@ export { convertChainIdToCoinType, convertCoinTypeToChain, convertCoinTypeToChai
 export { defaultEntryPointVersion, entryPointRegistry, getEntryPoint, isEntryPointVersion, } from "./entrypoint/index.js";
 export { AccountNotFoundError, AccountRequiresOwnerError, BatchExecutionNotSupportedError, DefaultFactoryNotDefinedError, FailedToGetStorageSlotError, GetCounterFactualAddressError, IncorrectAccountType, SignTransactionNotSupportedError, SmartAccountWithSignerRequiredError, UpgradeToAndCallNotSupportedError, UpgradesNotSupportedError, } from "./errors/account.js";
 export { BaseError } from "./errors/base.js";
-export { ChainNotFoundError, IncompatibleClientError, InvalidRpcUrlError, InvalidEntityIdError, InvalidNonceKeyError, EntityIdOverrideError, } from "./errors/client.js";
+export { ChainNotFoundError, IncompatibleClientError, InvalidRpcUrlError, InvalidEntityIdError, InvalidNonceKeyError, EntityIdOverrideError, InvalidModularAccountV2Mode, } from "./errors/client.js";
 export { EntryPointNotFoundError, InvalidEntryPointError, } from "./errors/entrypoint.js";
 export { InvalidSignerTypeError } from "./errors/signer.js";
 export { FailedToFindTransactionError, TransactionMissingToParamError, } from "./errors/transaction.js";
 export { InvalidUserOperationError, WaitForUserOperationError, } from "./errors/useroperation.js";
 export { LogLevel, Logger } from "./logger.js";
 export { middlewareActions } from "./middleware/actions.js";
+export { default7702UserOpSigner } from "./middleware/defaults/7702signer.js";
+export { default7702GasEstimator } from "./middleware/defaults/7702gasEstimator.js";
 export { defaultFeeEstimator } from "./middleware/defaults/feeEstimator.js";
 export { defaultGasEstimator } from "./middleware/defaults/gasEstimator.js";
 export { defaultPaymasterAndData } from "./middleware/defaults/paymasterAndData.js";

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["export type { Abi } from \"abitype\";\nexport type { Address, HttpTransport } from \"viem\";\n\nexport { EntryPointAbi_v6 } from \"./abis/EntryPointAbi_v6.js\";\nexport { EntryPointAbi_v7 } from \"./abis/EntryPointAbi_v7.js\";\nexport { SimpleAccountAbi_v6 } from \"./abis/SimpleAccountAbi_v6.js\";\nexport { SimpleAccountAbi_v7 } from \"./abis/SimpleAccountAbi_v7.js\";\nexport { SimpleAccountFactoryAbi } from \"./abis/SimpleAccountFactoryAbi.js\";\nexport type * from \"./account/smartContractAccount.js\";\nexport {\n  getAccountAddress,\n  isSmartAccountWithSigner,\n  parseFactoryAddressFromAccountInitCode,\n  toSmartContractAccount,\n} from \"./account/smartContractAccount.js\";\nexport { buildUserOperation } from \"./actions/smartAccount/buildUserOperation.js\";\nexport { buildUserOperationFromTx } from \"./actions/smartAccount/buildUserOperationFromTx.js\";\nexport { buildUserOperationFromTxs } from \"./actions/smartAccount/buildUserOperationFromTxs.js\";\nexport { checkGasSponsorshipEligibility } from \"./actions/smartAccount/checkGasSponsorshipEligibility.js\";\nexport { dropAndReplaceUserOperation } from \"./actions/smartAccount/dropAndReplaceUserOperation.js\";\nexport { sendTransaction } from \"./actions/smartAccount/sendTransaction.js\";\nexport { sendTransactions } from \"./actions/smartAccount/sendTransactions.js\";\nexport { sendUserOperation } from \"./actions/smartAccount/sendUserOperation.js\";\nexport type * from \"./actions/smartAccount/types.js\";\nexport { waitForUserOperationTransaction } from \"./actions/smartAccount/waitForUserOperationTransacation.js\";\nexport type * from \"./client/bundlerClient.js\";\nexport {\n  createBundlerClient,\n  createBundlerClientFromExisting,\n} from \"./client/bundlerClient.js\";\nexport type * from \"./client/decorators/bundlerClient.js\";\nexport { bundlerActions } from \"./client/decorators/bundlerClient.js\";\nexport type * from \"./client/decorators/smartAccountClient.js\";\nexport { smartAccountClientActions } from \"./client/decorators/smartAccountClient.js\";\nexport { isSmartAccountClient } from \"./client/isSmartAccountClient.js\";\nexport {\n  ConnectionConfigSchema,\n  SmartAccountClientOptsSchema,\n} from \"./client/schema.js\";\nexport type * from \"./client/smartAccountClient.js\";\nexport {\n  createSmartAccountClient,\n  createSmartAccountClientFromExisting,\n} from \"./client/smartAccountClient.js\";\nexport type * from \"./client/types.js\";\nexport {\n  convertChainIdToCoinType,\n  convertCoinTypeToChain,\n  convertCoinTypeToChainId,\n} from \"./ens/utils.js\";\nexport {\n  defaultEntryPointVersion,\n  entryPointRegistry,\n  getEntryPoint,\n  isEntryPointVersion,\n} from \"./entrypoint/index.js\";\nexport type * from \"./entrypoint/types.js\";\nexport {\n  AccountNotFoundError,\n  AccountRequiresOwnerError,\n  BatchExecutionNotSupportedError,\n  DefaultFactoryNotDefinedError,\n  FailedToGetStorageSlotError,\n  GetCounterFactualAddressError,\n  IncorrectAccountType,\n  SignTransactionNotSupportedError,\n  SmartAccountWithSignerRequiredError,\n  UpgradeToAndCallNotSupportedError,\n  UpgradesNotSupportedError,\n} from \"./errors/account.js\";\nexport { BaseError } from \"./errors/base.js\";\nexport {\n  ChainNotFoundError,\n  IncompatibleClientError,\n  InvalidRpcUrlError,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  EntityIdOverrideError,\n} from \"./errors/client.js\";\nexport {\n  EntryPointNotFoundError,\n  InvalidEntryPointError,\n} from \"./errors/entrypoint.js\";\nexport { InvalidSignerTypeError } from \"./errors/signer.js\";\nexport {\n  FailedToFindTransactionError,\n  TransactionMissingToParamError,\n} from \"./errors/transaction.js\";\nexport {\n  InvalidUserOperationError,\n  WaitForUserOperationError,\n} from \"./errors/useroperation.js\";\nexport { LogLevel, Logger } from \"./logger.js\";\nexport { middlewareActions } from \"./middleware/actions.js\";\nexport { defaultFeeEstimator } from \"./middleware/defaults/feeEstimator.js\";\nexport { defaultGasEstimator } from \"./middleware/defaults/gasEstimator.js\";\nexport { defaultPaymasterAndData } from \"./middleware/defaults/paymasterAndData.js\";\nexport { defaultUserOpSigner } from \"./middleware/defaults/userOpSigner.js\";\nexport type * from \"./middleware/erc7677middleware.js\";\nexport { erc7677Middleware } from \"./middleware/erc7677middleware.js\";\nexport { noopMiddleware } from \"./middleware/noopMiddleware.js\";\nexport type * from \"./middleware/types.js\";\nexport { LocalAccountSigner } from \"./signer/local-account.js\";\nexport { SignerSchema, isSigner } from \"./signer/schema.js\";\nexport type {\n  SmartAccountAuthenticator,\n  SmartAccountSigner,\n} from \"./signer/types.js\";\nexport { wrapSignatureWith6492 } from \"./signer/utils.js\";\nexport { WalletClientSigner } from \"./signer/wallet-client.js\";\nexport { split, type SplitTransportParams } from \"./transport/split.js\";\nexport type * from \"./types.js\";\nexport type * from \"./utils/index.js\";\nexport {\n  BigNumberishRangeSchema,\n  BigNumberishSchema,\n  ChainSchema,\n  HexSchema,\n  MultiplierSchema,\n  allEqual,\n  applyUserOpFeeOption,\n  applyUserOpOverride,\n  applyUserOpOverrideOrFeeOption,\n  asyncPipe,\n  bigIntMax,\n  bigIntMultiply,\n  bypassPaymasterAndData,\n  bypassPaymasterAndDataEmptyHex,\n  concatPaymasterAndData,\n  deepHexlify,\n  filterUndefined,\n  getDefaultUserOperationFeeOptions,\n  isBigNumberish,\n  isMultiplier,\n  isValidRequest,\n  parsePaymasterAndData,\n  pick,\n  resolveProperties,\n  takeBytes,\n  toRecord,\n} from \"./utils/index.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,sCAAsC,EACtC,sBAAsB,GACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAChG,OAAO,EAAE,8BAA8B,EAAE,MAAM,0DAA0D,CAAC;AAC1G,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4DAA4D,CAAC;AAE7G,OAAO,EACL,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EACL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,wBAAwB,EACxB,oCAAoC,GACrC,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,+BAA+B,EAC/B,6BAA6B,EAC7B,2BAA2B,EAC3B,6BAA6B,EAC7B,oBAAoB,EACpB,gCAAgC,EAChC,mCAAmC,EACnC,iCAAiC,EACjC,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACL,4BAA4B,EAC5B,8BAA8B,GAC/B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAK5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAA6B,MAAM,sBAAsB,CAAC;AAGxE,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,8BAA8B,EAC9B,SAAS,EACT,SAAS,EACT,cAAc,EACd,sBAAsB,EACtB,8BAA8B,EAC9B,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,iCAAiC,EACjC,cAAc,EACd,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,IAAI,EACJ,iBAAiB,EACjB,SAAS,EACT,QAAQ,GACT,MAAM,kBAAkB,CAAC","sourcesContent":["export type { Abi } from \"abitype\";\nexport type { Address, HttpTransport } from \"viem\";\n\nexport { EntryPointAbi_v6 } from \"./abis/EntryPointAbi_v6.js\";\nexport { EntryPointAbi_v7 } from \"./abis/EntryPointAbi_v7.js\";\nexport { SimpleAccountAbi_v6 } from \"./abis/SimpleAccountAbi_v6.js\";\nexport { SimpleAccountAbi_v7 } from \"./abis/SimpleAccountAbi_v7.js\";\nexport { SimpleAccountFactoryAbi } from \"./abis/SimpleAccountFactoryAbi.js\";\nexport type * from \"./account/smartContractAccount.js\";\nexport {\n  getAccountAddress,\n  isSmartAccountWithSigner,\n  parseFactoryAddressFromAccountInitCode,\n  toSmartContractAccount,\n} from \"./account/smartContractAccount.js\";\nexport { buildUserOperation } from \"./actions/smartAccount/buildUserOperation.js\";\nexport { buildUserOperationFromTx } from \"./actions/smartAccount/buildUserOperationFromTx.js\";\nexport { buildUserOperationFromTxs } from \"./actions/smartAccount/buildUserOperationFromTxs.js\";\nexport { checkGasSponsorshipEligibility } from \"./actions/smartAccount/checkGasSponsorshipEligibility.js\";\nexport { dropAndReplaceUserOperation } from \"./actions/smartAccount/dropAndReplaceUserOperation.js\";\nexport { sendTransaction } from \"./actions/smartAccount/sendTransaction.js\";\nexport { sendTransactions } from \"./actions/smartAccount/sendTransactions.js\";\nexport { sendUserOperation } from \"./actions/smartAccount/sendUserOperation.js\";\nexport type * from \"./actions/smartAccount/types.js\";\nexport { waitForUserOperationTransaction } from \"./actions/smartAccount/waitForUserOperationTransacation.js\";\nexport type * from \"./client/bundlerClient.js\";\nexport {\n  createBundlerClient,\n  createBundlerClientFromExisting,\n} from \"./client/bundlerClient.js\";\nexport type * from \"./client/decorators/bundlerClient.js\";\nexport { bundlerActions } from \"./client/decorators/bundlerClient.js\";\nexport type * from \"./client/decorators/smartAccountClient.js\";\nexport { smartAccountClientActions } from \"./client/decorators/smartAccountClient.js\";\nexport { isSmartAccountClient } from \"./client/isSmartAccountClient.js\";\nexport {\n  ConnectionConfigSchema,\n  SmartAccountClientOptsSchema,\n} from \"./client/schema.js\";\nexport type * from \"./client/smartAccountClient.js\";\nexport {\n  createSmartAccountClient,\n  createSmartAccountClientFromExisting,\n} from \"./client/smartAccountClient.js\";\nexport type * from \"./client/types.js\";\nexport {\n  convertChainIdToCoinType,\n  convertCoinTypeToChain,\n  convertCoinTypeToChainId,\n} from \"./ens/utils.js\";\nexport {\n  defaultEntryPointVersion,\n  entryPointRegistry,\n  getEntryPoint,\n  isEntryPointVersion,\n} from \"./entrypoint/index.js\";\nexport type * from \"./entrypoint/types.js\";\nexport {\n  AccountNotFoundError,\n  AccountRequiresOwnerError,\n  BatchExecutionNotSupportedError,\n  DefaultFactoryNotDefinedError,\n  FailedToGetStorageSlotError,\n  GetCounterFactualAddressError,\n  IncorrectAccountType,\n  SignTransactionNotSupportedError,\n  SmartAccountWithSignerRequiredError,\n  UpgradeToAndCallNotSupportedError,\n  UpgradesNotSupportedError,\n} from \"./errors/account.js\";\nexport { BaseError } from \"./errors/base.js\";\nexport {\n  ChainNotFoundError,\n  IncompatibleClientError,\n  InvalidRpcUrlError,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  EntityIdOverrideError,\n  InvalidModularAccountV2Mode,\n} from \"./errors/client.js\";\nexport {\n  EntryPointNotFoundError,\n  InvalidEntryPointError,\n} from \"./errors/entrypoint.js\";\nexport { InvalidSignerTypeError } from \"./errors/signer.js\";\nexport {\n  FailedToFindTransactionError,\n  TransactionMissingToParamError,\n} from \"./errors/transaction.js\";\nexport {\n  InvalidUserOperationError,\n  WaitForUserOperationError,\n} from \"./errors/useroperation.js\";\nexport { LogLevel, Logger } from \"./logger.js\";\nexport { middlewareActions } from \"./middleware/actions.js\";\nexport { default7702UserOpSigner } from \"./middleware/defaults/7702signer.js\";\nexport { default7702GasEstimator } from \"./middleware/defaults/7702gasEstimator.js\";\nexport { defaultFeeEstimator } from \"./middleware/defaults/feeEstimator.js\";\nexport { defaultGasEstimator } from \"./middleware/defaults/gasEstimator.js\";\nexport { defaultPaymasterAndData } from \"./middleware/defaults/paymasterAndData.js\";\nexport { defaultUserOpSigner } from \"./middleware/defaults/userOpSigner.js\";\nexport type * from \"./middleware/erc7677middleware.js\";\nexport { erc7677Middleware } from \"./middleware/erc7677middleware.js\";\nexport { noopMiddleware } from \"./middleware/noopMiddleware.js\";\nexport type * from \"./middleware/types.js\";\nexport { LocalAccountSigner } from \"./signer/local-account.js\";\nexport { SignerSchema, isSigner } from \"./signer/schema.js\";\nexport type {\n  SmartAccountAuthenticator,\n  SmartAccountSigner,\n} from \"./signer/types.js\";\nexport { wrapSignatureWith6492 } from \"./signer/utils.js\";\nexport { WalletClientSigner } from \"./signer/wallet-client.js\";\nexport { split, type SplitTransportParams } from \"./transport/split.js\";\nexport type * from \"./types.js\";\nexport type * from \"./utils/index.js\";\nexport {\n  BigNumberishRangeSchema,\n  BigNumberishSchema,\n  ChainSchema,\n  HexSchema,\n  MultiplierSchema,\n  allEqual,\n  applyUserOpFeeOption,\n  applyUserOpOverride,\n  applyUserOpOverrideOrFeeOption,\n  asyncPipe,\n  bigIntMax,\n  bigIntMultiply,\n  bypassPaymasterAndData,\n  bypassPaymasterAndDataEmptyHex,\n  concatPaymasterAndData,\n  deepHexlify,\n  filterUndefined,\n  getDefaultUserOperationFeeOptions,\n  isBigNumberish,\n  isMultiplier,\n  isValidRequest,\n  parsePaymasterAndData,\n  pick,\n  resolveProperties,\n  takeBytes,\n  toRecord,\n} from \"./utils/index.js\";\n"]}

package/dist/esm/middleware/defaults/7702gasEstimator.d.ts

@@ -0,0 +1,36 @@
+import type { ClientMiddlewareFn } from "../types";
+/**
+ * A middleware function to estimate the gas usage of a user operation when using an EIP-7702 delegated account. Has an optional custom gas estimator.
+ * This function is only compatible with accounts using EntryPoint v0.7.0, and the account must have an implementation address defined in `getImplementationAddress()`.
+ *
+ * @example
+ * ```ts twoslash
+ * import {
+ *   default7702GasEstimator,
+ *   default7702UserOpSigner,
+ *   createSmartAccountClient,
+ *   type SmartAccountClient,
+ * } from "@aa-sdk/core";
+ * import {
+ *   createModularAccountV2,
+ *   type CreateModularAccountV2ClientParams,
+ * } from "@account-kit/smart-contracts";
+ *
+ * async function createSMA7702AccountClient(
+ *   config: CreateModularAccountV2ClientParams
+ * ): Promise<SmartAccountClient> {
+ *   const sma7702Account = await createModularAccountV2({ ...config, mode: "7702" });
+ *
+ *   return createSmartAccountClient({
+ *     account: sma7702Account,
+ *     gasEstimator: default7702GasEstimator(config.gasEstimator),
+ *     signUserOperation: default7702UserOpSigner(config.signUserOperation),
+ *     ...config,
+ *   });
+ * }
+ * ```
+ *
+ * @param {ClientMiddlewareFn} [gasEstimator] Optional custom gas estimator function
+ * @returns {Function} A function that takes user operation struct and parameters, estimates gas usage, and returns the user operation with gas limits.
+ */
+export declare const default7702GasEstimator: (gasEstimator?: ClientMiddlewareFn) => ClientMiddlewareFn;

package/dist/esm/middleware/defaults/7702gasEstimator.js

@@ -0,0 +1,62 @@
+import { zeroHash } from "viem";
+import { AccountNotFoundError } from "../../errors/account.js";
+import { defaultGasEstimator } from "./gasEstimator.js";
+/**
+ * A middleware function to estimate the gas usage of a user operation when using an EIP-7702 delegated account. Has an optional custom gas estimator.
+ * This function is only compatible with accounts using EntryPoint v0.7.0, and the account must have an implementation address defined in `getImplementationAddress()`.
+ *
+ * @example
+ * ```ts twoslash
+ * import {
+ *   default7702GasEstimator,
+ *   default7702UserOpSigner,
+ *   createSmartAccountClient,
+ *   type SmartAccountClient,
+ * } from "@aa-sdk/core";
+ * import {
+ *   createModularAccountV2,
+ *   type CreateModularAccountV2ClientParams,
+ * } from "@account-kit/smart-contracts";
+ *
+ * async function createSMA7702AccountClient(
+ *   config: CreateModularAccountV2ClientParams
+ * ): Promise<SmartAccountClient> {
+ *   const sma7702Account = await createModularAccountV2({ ...config, mode: "7702" });
+ *
+ *   return createSmartAccountClient({
+ *     account: sma7702Account,
+ *     gasEstimator: default7702GasEstimator(config.gasEstimator),
+ *     signUserOperation: default7702UserOpSigner(config.signUserOperation),
+ *     ...config,
+ *   });
+ * }
+ * ```
+ *
+ * @param {ClientMiddlewareFn} [gasEstimator] Optional custom gas estimator function
+ * @returns {Function} A function that takes user operation struct and parameters, estimates gas usage, and returns the user operation with gas limits.
+ */
+export const default7702GasEstimator = (gasEstimator) => async (struct, params) => {
+    const gasEstimator_ = gasEstimator ?? defaultGasEstimator(params.client);
+    const account = params.account ?? params.client.account;
+    if (!account) {
+        throw new AccountNotFoundError();
+    }
+    const entryPoint = account.getEntryPoint();
+    if (entryPoint.version !== "0.7.0") {
+        throw new Error("This middleware is only compatible with EntryPoint v0.7.0");
+    }
+    const implementationAddress = await account.getImplementationAddress();
+    // Note: does not omit the delegation from estimation if the account is already 7702 delegated.
+    struct.eip7702Auth = {
+        chainId: "0x0",
+        nonce: "0x0",
+        address: implementationAddress,
+        r: zeroHash, // aka `bytes32(0)`
+        s: zeroHash,
+        yParity: "0x0",
+    };
+    const estimatedUO = await gasEstimator_(struct, params);
+    estimatedUO.eip7702Auth = undefined; // Strip out the auth after estimation.
+    return estimatedUO;
+};
+//# sourceMappingURL=7702gasEstimator.js.map

package/dist/esm/middleware/defaults/7702gasEstimator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"7702gasEstimator.js","sourceRoot":"","sources":["../../../../src/middleware/defaults/7702gasEstimator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAGlC,CAAC,YAAiC,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;IAC9D,MAAM,aAAa,GAAG,YAAY,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;IACxD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,CAAC;IAED,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAEvE,+FAA+F;IAE9F,MAAuC,CAAC,WAAW,GAAG;QACrD,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,qBAAqB;QAC9B,CAAC,EAAE,QAAQ,EAAE,mBAAmB;QAChC,CAAC,EAAE,QAAQ;QACX,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExD,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC,uCAAuC;IAE5E,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC","sourcesContent":["import { zeroHash } from \"viem\";\nimport { AccountNotFoundError } from \"../../errors/account.js\";\nimport type { UserOperationStruct } from \"../../types.js\";\nimport type { ClientMiddlewareFn } from \"../types\";\nimport { defaultGasEstimator } from \"./gasEstimator.js\";\n\n/**\n * A middleware function to estimate the gas usage of a user operation when using an EIP-7702 delegated account. Has an optional custom gas estimator.\n * This function is only compatible with accounts using EntryPoint v0.7.0, and the account must have an implementation address defined in `getImplementationAddress()`.\n *\n * @example\n * ```ts twoslash\n * import {\n *   default7702GasEstimator,\n *   default7702UserOpSigner,\n *   createSmartAccountClient,\n *   type SmartAccountClient,\n * } from \"@aa-sdk/core\";\n * import {\n *   createModularAccountV2,\n *   type CreateModularAccountV2ClientParams,\n * } from \"@account-kit/smart-contracts\";\n *\n * async function createSMA7702AccountClient(\n *   config: CreateModularAccountV2ClientParams\n * ): Promise<SmartAccountClient> {\n *   const sma7702Account = await createModularAccountV2({ ...config, mode: \"7702\" });\n *\n *   return createSmartAccountClient({\n *     account: sma7702Account,\n *     gasEstimator: default7702GasEstimator(config.gasEstimator),\n *     signUserOperation: default7702UserOpSigner(config.signUserOperation),\n *     ...config,\n *   });\n * }\n * ```\n *\n * @param {ClientMiddlewareFn} [gasEstimator] Optional custom gas estimator function\n * @returns {Function} A function that takes user operation struct and parameters, estimates gas usage, and returns the user operation with gas limits.\n */\nexport const default7702GasEstimator: (\n  gasEstimator?: ClientMiddlewareFn\n) => ClientMiddlewareFn =\n  (gasEstimator?: ClientMiddlewareFn) => async (struct, params) => {\n    const gasEstimator_ = gasEstimator ?? defaultGasEstimator(params.client);\n\n    const account = params.account ?? params.client.account;\n    if (!account) {\n      throw new AccountNotFoundError();\n    }\n\n    const entryPoint = account.getEntryPoint();\n    if (entryPoint.version !== \"0.7.0\") {\n      throw new Error(\n        \"This middleware is only compatible with EntryPoint v0.7.0\"\n      );\n    }\n\n    const implementationAddress = await account.getImplementationAddress();\n\n    // Note: does not omit the delegation from estimation if the account is already 7702 delegated.\n\n    (struct as UserOperationStruct<\"0.7.0\">).eip7702Auth = {\n      chainId: \"0x0\",\n      nonce: \"0x0\",\n      address: implementationAddress,\n      r: zeroHash, // aka `bytes32(0)`\n      s: zeroHash,\n      yParity: \"0x0\",\n    };\n\n    const estimatedUO = await gasEstimator_(struct, params);\n\n    estimatedUO.eip7702Auth = undefined; // Strip out the auth after estimation.\n\n    return estimatedUO;\n  };\n"]}

package/dist/esm/middleware/defaults/7702signer.d.ts

@@ -0,0 +1,37 @@
+import type { ClientMiddlewareFn } from "../types";
+/**
+ * Provides a default middleware function for signing user operations with a client account when using EIP-7702 delegated accounts.
+ * If the signer doesn't support `signAuthorization`, then this just runs the provided `signUserOperation` middleware.
+ * This function is only compatible with accounts using EntryPoint v0.7.0, and the account must have an implementation address defined in `getImplementationAddress()`.
+ *
+ * @example
+ * ```ts twoslash
+ * import {
+ *   default7702GasEstimator,
+ *   default7702UserOpSigner,
+ *   createSmartAccountClient,
+ *   type SmartAccountClient,
+ * } from "@aa-sdk/core";
+ * import {
+ *   createModularAccountV2,
+ *   type CreateModularAccountV2ClientParams,
+ * } from "@account-kit/smart-contracts";
+ *
+ * async function createSMA7702AccountClient(
+ *   config: CreateModularAccountV2ClientParams
+ * ): Promise<SmartAccountClient> {
+ *   const sma7702Account = await createModularAccountV2({ ...config, mode: "7702" });
+ *
+ *   return createSmartAccountClient({
+ *     account: sma7702Account,
+ *     gasEstimator: default7702GasEstimator(config.gasEstimator),
+ *     signUserOperation: default7702UserOpSigner(config.signUserOperation),
+ *     ...config,
+ *   });
+ * }
+ * ```
+ *
+ * @param {ClientMiddlewareFn} [userOpSigner] Optional user operation signer function
+ * @returns {Function} A middleware function that signs EIP-7702 authorization tuples if necessary, and also uses the provided or default user operation signer to generate the user op signature.
+ */
+export declare const default7702UserOpSigner: (userOpSigner?: ClientMiddlewareFn) => ClientMiddlewareFn;