@aa-sdk/core 4.39.0 → 4.41.0

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

@@ -2,7 +2,7 @@ import { type Address, type Chain, type CustomSource, type Hex, type LocalAccoun
 import type { EntryPointDef, EntryPointRegistryBase, EntryPointVersion } from "../entrypoint/types.js";
 import type { SmartAccountSigner } from "../signer/types.js";
 import type { NullAddress } from "../types.js";
-import type { IsUndefined } from "../utils/types.js";
+import type { IsUndefined, Never } from "../utils/types.js";
 export type AccountOp = {
     target: Address;
     value?: bigint;
@@ -13,6 +13,17 @@ export declare enum DeploymentState {
     NOT_DEPLOYED = "0x1",
     DEPLOYED = "0x2"
 }
+export type SignatureRequest = {
+    type: "personal_sign";
+    data: SignableMessage;
+} | {
+    type: "eth_signTypedData_v4";
+    data: TypedDataDefinition;
+};
+export type SigningMethods = {
+    prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;
+    formatSign: (signature: Hex) => Promise<Hex>;
+};
 export type GetEntryPointFromAccount<TAccount extends SmartContractAccount | undefined, TAccountOverride extends SmartContractAccount = SmartContractAccount> = GetAccountParameter<TAccount, TAccountOverride> extends SmartContractAccount<string, infer TEntryPointVersion> ? TEntryPointVersion : EntryPointVersion;
 export type GetAccountParameter<TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined, TAccountOverride extends SmartContractAccount = SmartContractAccount> = IsUndefined<TAccount> extends true ? {
     account: TAccountOverride;
@@ -60,7 +71,7 @@ export type SmartContractAccount<Name extends string = string, TEntryPointVersio
     getFactoryData: () => Promise<Hex>;
     getEntryPoint: () => EntryPointDef<TEntryPointVersion>;
     getImplementationAddress: () => Promise<NullAddress | Address>;
-};
+} & SigningMethods;
 export interface AccountEntryPointRegistry<Name extends string = string> extends EntryPointRegistryBase<SmartContractAccount<Name, EntryPointVersion>> {
     "0.6.0": SmartContractAccount<Name, "0.6.0">;
     "0.7.0": SmartContractAccount<Name, "0.7.0">;
@@ -79,7 +90,7 @@ export type ToSmartContractAccountParams<Name extends string = string, TTranspor
     signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;
     encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;
     getImplementationAddress?: () => Promise<NullAddress | Address>;
-} & Omit<CustomSource, "signTransaction" | "address">;
+} & Omit<CustomSource, "signTransaction" | "address"> & (SigningMethods | Never<SigningMethods>);
 /**
  * Parses the factory address and factory calldata from the provided account initialization code (initCode).
  *

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, encodeExecute, encodeBatchExecute, getNonce, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, getImplementationAddress, } = params;
+    const { transport, chain, entryPoint, source, accountAddress, getAccountInitCode, signMessage, signTypedData, encodeExecute, encodeBatchExecute, getNonce, getDummySignature, signUserOperationHash, encodeUpgradeToAndCall, getImplementationAddress, prepareSign: prepareSign_, formatSign: formatSign_, } = 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
@@ -259,6 +259,17 @@ export async function toSmartContractAccount(params) {
     if (entryPoint.version !== "0.6.0" && entryPoint.version !== "0.7.0") {
         throw new InvalidEntryPointError(chain, entryPoint.version);
     }
+    if ((prepareSign_ && !formatSign_) || (!prepareSign_ && formatSign_)) {
+        throw new Error("Must implement both prepareSign and formatSign or neither");
+    }
+    const prepareSign = prepareSign_ ??
+        (() => {
+            throw new Error("prepareSign not implemented");
+        });
+    const formatSign = formatSign_ ??
+        (() => {
+            throw new Error("formatSign not implemented");
+        });
     return {
         ...account,
         source,
@@ -281,6 +292,8 @@ export async function toSmartContractAccount(params) {
         signMessageWith6492,
         signTypedDataWith6492,
         getImplementationAddress: getImplementationAddress_,
+        prepareSign,
+        formatSign,
     };
 }
 //# 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> =\n  GetAccountParameter<TAccount, TAccountOverride> extends SmartContractAccount<\n    string,\n    infer TEntryPointVersion\n  >\n    ? TEntryPointVersion\n    : EntryPointVersion;\n\nexport type GetAccountParameter<\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount,\n> =\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"]}
+{"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, Never } 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 SignatureRequest =\n  | {\n      type: \"personal_sign\";\n      data: SignableMessage;\n    }\n  | {\n      type: \"eth_signTypedData_v4\";\n      data: TypedDataDefinition;\n    };\n\nexport type SigningMethods = {\n  prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;\n  formatSign: (signature: Hex) => Promise<Hex>;\n};\n\nexport type GetEntryPointFromAccount<\n  TAccount extends SmartContractAccount | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount,\n> =\n  GetAccountParameter<TAccount, TAccountOverride> extends SmartContractAccount<\n    string,\n    infer TEntryPointVersion\n  >\n    ? TEntryPointVersion\n    : EntryPointVersion;\n\nexport type GetAccountParameter<\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TAccountOverride extends SmartContractAccount = SmartContractAccount,\n> =\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} & SigningMethods;\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  (SigningMethods | Never<SigningMethods>);\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    prepareSign: prepareSign_,\n    formatSign: formatSign_,\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  if ((prepareSign_ && !formatSign_) || (!prepareSign_ && formatSign_)) {\n    throw new Error(\n      \"Must implement both prepareSign and formatSign or neither\",\n    );\n  }\n\n  const prepareSign =\n    prepareSign_ ??\n    (() => {\n      throw new Error(\"prepareSign not implemented\");\n    });\n\n  const formatSign =\n    formatSign_ ??\n    (() => {\n      throw new Error(\"formatSign not implemented\");\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    prepareSign,\n    formatSign,\n  };\n}\n"]}

package/dist/esm/utils/types.d.ts

@@ -14,6 +14,9 @@ export type NoUndefined<T> = T extends undefined ? never : T;
  * //   ^? type Result = true
  */
 export type IsUndefined<T> = [undefined] extends [T] ? true : false;
+export type Never<T> = T extends object ? {
+    [K in keyof T]?: never;
+} : never;
 export type RequiredBy<TType, TKeys extends keyof TType> = Required<Pick<TType, TKeys>> & Omit<TType, TKeys>;
 /**
  * @description Combines members of an intersection into a readable type.

package/dist/esm/utils/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":"AAAA,qBAAqB","sourcesContent":["// borrowed from viem\n\n/**\n * @description Constructs a type by excluding `undefined` from `T`.\n *\n * @example\n * NoUndefined<string | undefined>\n * => string\n */\nexport type NoUndefined<T> = T extends undefined ? never : T;\n// borrowed from viem\n/**\n * @description Checks if T is `undefined`\n * @param T - Type to check\n * @example\n * type Result = IsUndefined<undefined>\n * //   ^? type Result = true\n */\n\nexport type IsUndefined<T> = [undefined] extends [T] ? true : false;\n\nexport type RequiredBy<TType, TKeys extends keyof TType> = Required<\n  Pick<TType, TKeys>\n> &\n  Omit<TType, TKeys>;\n\n/**\n * @description Combines members of an intersection into a readable type.\n *\n * @see https://twitter.com/mattpocockuk/status/1622730173446557697?s=20&t=NdpAcmEFXY01xkqU3KO0Mg\n * @example\n * Prettify<{ a: string } & { b: string } & { c: number, d: bigint }>\n * => { a: string, b: string, c: number, d: bigint }\n */\nexport type Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type WithRequired<T, K extends keyof T> = Required<Pick<T, K>>;\nexport type WithOptional<T, K extends keyof T> = Pick<Partial<T>, K>;\n\n// Checks for type equivalence, evaluates always to either `true` or `false`.\n// Semantics: (EQ<A, B> = true) <==> (A <==> B)\nexport type EQ<A, B> = [A] extends [B]\n  ? [B] extends [A]\n    ? true\n    : false\n  : false;\n\n// Auxiliary type for `IsMemberOrSubtypeOfAComponent`\n// Evaluates to `true` or `boolean` if one of the explicit components (according to the TypeScript distribution\n// mechanism for union types) of the union type equals the other given type.\n// Examples:\n//    EqualsOneOfTheComponents<string, string | boolean> ⟶ boolean\n//    EqualsOneOfTheComponents<string, string> ⟶ true\n//    EqualsOneOfTheComponents<number, string | boolean> ⟶ false\nexport type EqualsOneOfTheComponents<T, Union> = Union extends infer Component // enforce distribution\n  ? EQ<T, Component>\n  : never;\n\n// Auxiliary type for `IsOneOf`\nexport type IsMemberOrSubtypeOfAComponent<\n  T,\n  Union,\n  ConjunctionOfExplicitComponentChecks extends boolean,\n> = [T] extends [Union]\n  ? true extends ConjunctionOfExplicitComponentChecks\n    ? true\n    : false\n  : false;\n\n// Checks whether the given type equals one of the explicit components of the union type. Note that in this respect we\n// consider the members of the infinite types number and string as implicit since the inbuilt distribution mechanism of\n// TypeScript does not (cannot) distribute over the infinite number of strings or numbers. However, `boolean` is treated\n// by TypeScript (and accordingly here) as the explicit union `true | false`.\n//\n// In particular, the evaluation result is `false` if the type is a proper union of components of the union type. It also\n// evaluates to false if the given type is a proper subtype of one of its explicit components.\n// It always evaluates to either `true` or `false`.\n// Examples:\n//    IsOneOf<number, string | number | boolean> ⟶ true\n//    IsOneOf<2 | 4, 0 | 1 | 2 | 3 | 4 | 5 | 6> ⟶ false\n//    IsOneOf<'text', string> ⟶ false  // only implicit but not explicit component\nexport type IsOneOf<T, Union> = IsMemberOrSubtypeOfAComponent<\n  T,\n  Union,\n  EqualsOneOfTheComponents<T, Union>\n>;\n\nexport type OneOf<T1, T2> = IsOneOf<T1, T2> extends true ? T1 : never;\n\nexport type RecordableKeys<T> = {\n  [K in keyof T]: T[K] extends string | number | symbol ? K : never;\n}[keyof T];\n\n// Marks a subset of the fields of T as optional.\nexport type OptionalFields<T, K extends keyof T> = Pick<Partial<T>, K> &\n  Omit<T, K>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":"AAAA,qBAAqB","sourcesContent":["// borrowed from viem\n\n/**\n * @description Constructs a type by excluding `undefined` from `T`.\n *\n * @example\n * NoUndefined<string | undefined>\n * => string\n */\nexport type NoUndefined<T> = T extends undefined ? never : T;\n// borrowed from viem\n/**\n * @description Checks if T is `undefined`\n * @param T - Type to check\n * @example\n * type Result = IsUndefined<undefined>\n * //   ^? type Result = true\n */\n\nexport type IsUndefined<T> = [undefined] extends [T] ? true : false;\n\nexport type Never<T> = T extends object\n  ? {\n      [K in keyof T]?: never;\n    }\n  : never;\n\nexport type RequiredBy<TType, TKeys extends keyof TType> = Required<\n  Pick<TType, TKeys>\n> &\n  Omit<TType, TKeys>;\n\n/**\n * @description Combines members of an intersection into a readable type.\n *\n * @see https://twitter.com/mattpocockuk/status/1622730173446557697?s=20&t=NdpAcmEFXY01xkqU3KO0Mg\n * @example\n * Prettify<{ a: string } & { b: string } & { c: number, d: bigint }>\n * => { a: string, b: string, c: number, d: bigint }\n */\nexport type Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type WithRequired<T, K extends keyof T> = Required<Pick<T, K>>;\nexport type WithOptional<T, K extends keyof T> = Pick<Partial<T>, K>;\n\n// Checks for type equivalence, evaluates always to either `true` or `false`.\n// Semantics: (EQ<A, B> = true) <==> (A <==> B)\nexport type EQ<A, B> = [A] extends [B]\n  ? [B] extends [A]\n    ? true\n    : false\n  : false;\n\n// Auxiliary type for `IsMemberOrSubtypeOfAComponent`\n// Evaluates to `true` or `boolean` if one of the explicit components (according to the TypeScript distribution\n// mechanism for union types) of the union type equals the other given type.\n// Examples:\n//    EqualsOneOfTheComponents<string, string | boolean> ⟶ boolean\n//    EqualsOneOfTheComponents<string, string> ⟶ true\n//    EqualsOneOfTheComponents<number, string | boolean> ⟶ false\nexport type EqualsOneOfTheComponents<T, Union> = Union extends infer Component // enforce distribution\n  ? EQ<T, Component>\n  : never;\n\n// Auxiliary type for `IsOneOf`\nexport type IsMemberOrSubtypeOfAComponent<\n  T,\n  Union,\n  ConjunctionOfExplicitComponentChecks extends boolean,\n> = [T] extends [Union]\n  ? true extends ConjunctionOfExplicitComponentChecks\n    ? true\n    : false\n  : false;\n\n// Checks whether the given type equals one of the explicit components of the union type. Note that in this respect we\n// consider the members of the infinite types number and string as implicit since the inbuilt distribution mechanism of\n// TypeScript does not (cannot) distribute over the infinite number of strings or numbers. However, `boolean` is treated\n// by TypeScript (and accordingly here) as the explicit union `true | false`.\n//\n// In particular, the evaluation result is `false` if the type is a proper union of components of the union type. It also\n// evaluates to false if the given type is a proper subtype of one of its explicit components.\n// It always evaluates to either `true` or `false`.\n// Examples:\n//    IsOneOf<number, string | number | boolean> ⟶ true\n//    IsOneOf<2 | 4, 0 | 1 | 2 | 3 | 4 | 5 | 6> ⟶ false\n//    IsOneOf<'text', string> ⟶ false  // only implicit but not explicit component\nexport type IsOneOf<T, Union> = IsMemberOrSubtypeOfAComponent<\n  T,\n  Union,\n  EqualsOneOfTheComponents<T, Union>\n>;\n\nexport type OneOf<T1, T2> = IsOneOf<T1, T2> extends true ? T1 : never;\n\nexport type RecordableKeys<T> = {\n  [K in keyof T]: T[K] extends string | number | symbol ? K : never;\n}[keyof T];\n\n// Marks a subset of the fields of T as optional.\nexport type OptionalFields<T, K extends keyof T> = Pick<Partial<T>, K> &\n  Omit<T, K>;\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.39.0";
+export declare const VERSION = "4.41.0";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.39.0";
+export const VERSION = "4.41.0";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.39.0\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.41.0\";\n"]}

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

@@ -2,7 +2,7 @@ import { type Address, type Chain, type CustomSource, type Hex, type LocalAccoun
 import type { EntryPointDef, EntryPointRegistryBase, EntryPointVersion } from "../entrypoint/types.js";
 import type { SmartAccountSigner } from "../signer/types.js";
 import type { NullAddress } from "../types.js";
-import type { IsUndefined } from "../utils/types.js";
+import type { IsUndefined, Never } from "../utils/types.js";
 export type AccountOp = {
     target: Address;
     value?: bigint;
@@ -13,6 +13,17 @@ export declare enum DeploymentState {
     NOT_DEPLOYED = "0x1",
     DEPLOYED = "0x2"
 }
+export type SignatureRequest = {
+    type: "personal_sign";
+    data: SignableMessage;
+} | {
+    type: "eth_signTypedData_v4";
+    data: TypedDataDefinition;
+};
+export type SigningMethods = {
+    prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;
+    formatSign: (signature: Hex) => Promise<Hex>;
+};
 export type GetEntryPointFromAccount<TAccount extends SmartContractAccount | undefined, TAccountOverride extends SmartContractAccount = SmartContractAccount> = GetAccountParameter<TAccount, TAccountOverride> extends SmartContractAccount<string, infer TEntryPointVersion> ? TEntryPointVersion : EntryPointVersion;
 export type GetAccountParameter<TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined, TAccountOverride extends SmartContractAccount = SmartContractAccount> = IsUndefined<TAccount> extends true ? {
     account: TAccountOverride;
@@ -60,7 +71,7 @@ export type SmartContractAccount<Name extends string = string, TEntryPointVersio
     getFactoryData: () => Promise<Hex>;
     getEntryPoint: () => EntryPointDef<TEntryPointVersion>;
     getImplementationAddress: () => Promise<NullAddress | Address>;
-};
+} & SigningMethods;
 export interface AccountEntryPointRegistry<Name extends string = string> extends EntryPointRegistryBase<SmartContractAccount<Name, EntryPointVersion>> {
     "0.6.0": SmartContractAccount<Name, "0.6.0">;
     "0.7.0": SmartContractAccount<Name, "0.7.0">;
@@ -79,7 +90,7 @@ export type ToSmartContractAccountParams<Name extends string = string, TTranspor
     signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;
     encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;
     getImplementationAddress?: () => Promise<NullAddress | Address>;
-} & Omit<CustomSource, "signTransaction" | "address">;
+} & Omit<CustomSource, "signTransaction" | "address"> & (SigningMethods | Never<SigningMethods>);
 /**
  * Parses the factory address and factory calldata from the provided account initialization code (initCode).
  *

package/dist/types/account/smartContractAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartContractAccount.d.ts","sourceRoot":"","sources":["../../../src/account/smartContractAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"smartContractAccount.d.ts","sourceRoot":"","sources":["../../../src/account/smartContractAccount.ts"],"names":[],"mappings":"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"}

package/dist/types/utils/types.d.ts

@@ -14,6 +14,9 @@ export type NoUndefined<T> = T extends undefined ? never : T;
  * //   ^? type Result = true
  */
 export type IsUndefined<T> = [undefined] extends [T] ? true : false;
+export type Never<T> = T extends object ? {
+    [K in keyof T]?: never;
+} : never;
 export type RequiredBy<TType, TKeys extends keyof TType> = Required<Pick<TType, TKeys>> & Omit<TType, TKeys>;
 /**
  * @description Combines members of an intersection into a readable type.

package/dist/types/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AAE7D;;;;;;GAMG;AAEH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEpE,MAAM,MAAM,UAAU,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,QAAQ,CACjE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB;;;;;;;GAOG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrB,GAAG,EAAE,CAAC;AAEP,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtE,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAIrE,MAAM,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAClC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GACb,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;AASV,MAAM,MAAM,wBAAwB,CAAC,CAAC,EAAE,KAAK,IAAI,KAAK,SAAS,MAAM,SAAS,GAC1E,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,GAChB,KAAK,CAAC;AAGV,MAAM,MAAM,6BAA6B,CACvC,CAAC,EACD,KAAK,EACL,oCAAoC,SAAS,OAAO,IAClD,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACnB,IAAI,SAAS,oCAAoC,GAC/C,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;AAcV,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,KAAK,IAAI,6BAA6B,CAC3D,CAAC,EACD,KAAK,EACL,wBAAwB,CAAC,CAAC,EAAE,KAAK,CAAC,CACnC,CAAC;AAEF,MAAM,MAAM,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,KAAK;CAClE,CAAC,MAAM,CAAC,CAAC,CAAC;AAGX,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACpE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AAE7D;;;;;;GAMG;AAEH,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEpE,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACnC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK;CACvB,GACD,KAAK,CAAC;AAEV,MAAM,MAAM,UAAU,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,QAAQ,CACjE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB;;;;;;;GAOG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrB,GAAG,EAAE,CAAC;AAEP,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtE,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAIrE,MAAM,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAClC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GACb,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;AASV,MAAM,MAAM,wBAAwB,CAAC,CAAC,EAAE,KAAK,IAAI,KAAK,SAAS,MAAM,SAAS,GAC1E,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,GAChB,KAAK,CAAC;AAGV,MAAM,MAAM,6BAA6B,CACvC,CAAC,EACD,KAAK,EACL,oCAAoC,SAAS,OAAO,IAClD,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACnB,IAAI,SAAS,oCAAoC,GAC/C,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;AAcV,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,KAAK,IAAI,6BAA6B,CAC3D,CAAC,EACD,KAAK,EACL,wBAAwB,CAAC,CAAC,EAAE,KAAK,CAAC,CACnC,CAAC;AAEF,MAAM,MAAM,KAAK,CAAC,EAAE,EAAE,EAAE,IAAI,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,KAAK;CAClE,CAAC,MAAM,CAAC,CAAC,CAAC;AAGX,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACpE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "4.39.0";
+export declare const VERSION = "4.41.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aa-sdk/core",
   "license": "MIT",
-  "version": "4.39.0",
+  "version": "4.41.0",
   "description": "viem based SDK that enables interactions with ERC-4337 Smart Accounts. ABIs are based off the definitions generated in @account-abstraction/contracts",
   "author": "Alchemy",
   "type": "module",
@@ -37,7 +37,7 @@
     "build": "yarn clean && yarn build:esm && yarn build:types",
     "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
     "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
-    "fern:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../docs/pages/reference/aa-sdk/core --fern",
+    "fern:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../docs/pages/reference/aa-sdk/core",
     "clean": "rm -rf ./dist",
     "test": "vitest",
     "test:run": "vitest run"
@@ -62,5 +62,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "9c4aa03dc1d2cbdd44d7d1b0d1dc9dcdd59fb610"
+  "gitHead": "db374bb77b5961b3d2c5c883e9e77f861df92f59"
 }

package/src/account/smartContractAccount.ts

@@ -32,7 +32,7 @@ import { Logger } from "../logger.js";
 import type { SmartAccountSigner } from "../signer/types.js";
 import { wrapSignatureWith6492 } from "../signer/utils.js";
 import type { NullAddress } from "../types.js";
-import type { IsUndefined } from "../utils/types.js";
+import type { IsUndefined, Never } from "../utils/types.js";
 
 export type AccountOp = {
   target: Address;
@@ -46,6 +46,21 @@ export enum DeploymentState {
   DEPLOYED = "0x2",
 }
 
+export type SignatureRequest =
+  | {
+      type: "personal_sign";
+      data: SignableMessage;
+    }
+  | {
+      type: "eth_signTypedData_v4";
+      data: TypedDataDefinition;
+    };
+
+export type SigningMethods = {
+  prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;
+  formatSign: (signature: Hex) => Promise<Hex>;
+};
+
 export type GetEntryPointFromAccount<
   TAccount extends SmartContractAccount | undefined,
   TAccountOverride extends SmartContractAccount = SmartContractAccount,
@@ -126,7 +141,7 @@ export type SmartContractAccount<
   getFactoryData: () => Promise<Hex>;
   getEntryPoint: () => EntryPointDef<TEntryPointVersion>;
   getImplementationAddress: () => Promise<NullAddress | Address>;
-};
+} & SigningMethods;
 // [!endregion SmartContractAccount]
 
 export interface AccountEntryPointRegistry<Name extends string = string>
@@ -158,7 +173,8 @@ export type ToSmartContractAccountParams<
   signUserOperationHash?: (uoHash: Hex) => Promise<Hex>;
   encodeUpgradeToAndCall?: (params: UpgradeToAndCallParams) => Promise<Hex>;
   getImplementationAddress?: () => Promise<NullAddress | Address>;
-} & Omit<CustomSource, "signTransaction" | "address">;
+} & Omit<CustomSource, "signTransaction" | "address"> &
+  (SigningMethods | Never<SigningMethods>);
 // [!endregion ToSmartContractAccountParams]
 
 /**
@@ -351,6 +367,8 @@ export async function toSmartContractAccount(
     signUserOperationHash,
     encodeUpgradeToAndCall,
     getImplementationAddress,
+    prepareSign: prepareSign_,
+    formatSign: formatSign_,
   } = params;
 
   const client = createBundlerClient({
@@ -502,6 +520,24 @@ export async function toSmartContractAccount(
     throw new InvalidEntryPointError(chain, entryPoint.version);
   }
 
+  if ((prepareSign_ && !formatSign_) || (!prepareSign_ && formatSign_)) {
+    throw new Error(
+      "Must implement both prepareSign and formatSign or neither",
+    );
+  }
+
+  const prepareSign =
+    prepareSign_ ??
+    (() => {
+      throw new Error("prepareSign not implemented");
+    });
+
+  const formatSign =
+    formatSign_ ??
+    (() => {
+      throw new Error("formatSign not implemented");
+    });
+
   return {
     ...account,
     source,
@@ -525,5 +561,7 @@ export async function toSmartContractAccount(
     signMessageWith6492,
     signTypedDataWith6492,
     getImplementationAddress: getImplementationAddress_,
+    prepareSign,
+    formatSign,
   };
 }

package/src/utils/types.ts

@@ -19,6 +19,12 @@ export type NoUndefined<T> = T extends undefined ? never : T;
 
 export type IsUndefined<T> = [undefined] extends [T] ? true : false;
 
+export type Never<T> = T extends object
+  ? {
+      [K in keyof T]?: never;
+    }
+  : never;
+
 export type RequiredBy<TType, TKeys extends keyof TType> = Required<
   Pick<TType, TKeys>
 > &

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.39.0";
+export const VERSION = "4.41.0";