@account-kit/smart-contracts 4.39.0 → 4.41.0

package/dist/esm/src/light-account/accounts/base.js

@@ -34,8 +34,8 @@ export async function createLightAccountBase({ transport, chain, signer, abi, ve
             args: [upgradeToAddress, upgradeToInitData],
         });
     };
-    const signWith1271Wrapper = async (hashedMessage, version) => {
-        return signer.signTypedData({
+    const get1271Wrapper = (hashedMessage, version) => {
+        return {
             // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)
             // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236
             domain: {
@@ -51,7 +51,35 @@ export async function createLightAccountBase({ transport, chain, signer, abi, ve
                 message: hashedMessage,
             },
             primaryType: "LightAccountMessage",
-        });
+        };
+    };
+    const prepareSign = async (params) => {
+        const messageHash = params.type === "personal_sign"
+            ? hashMessage(params.data)
+            : hashTypedData(params.data);
+        switch (version) {
+            case "v1.0.1":
+                return params;
+            case "v1.0.2":
+                throw new Error(`Version ${String(version)} of LightAccount doesn't support 1271`);
+            case "v1.1.0":
+                return {
+                    type: "eth_signTypedData_v4",
+                    data: get1271Wrapper(messageHash, "1"),
+                };
+            case "v2.0.0":
+                return {
+                    type: "eth_signTypedData_v4",
+                    data: get1271Wrapper(messageHash, "2"),
+                };
+            default:
+                throw new Error(`Unknown version ${String(version)} of LightAccount`);
+        }
+    };
+    const formatSign = async (signature) => {
+        return version === "v2.0.0"
+            ? concat([SignatureType.EOA, signature])
+            : signature;
     };
     const account = await toSmartContractAccount({
         transport,
@@ -60,6 +88,8 @@ export async function createLightAccountBase({ transport, chain, signer, abi, ve
         accountAddress,
         source: type,
         getAccountInitCode,
+        prepareSign,
+        formatSign,
         encodeExecute: async ({ target, data, value }) => {
             return encodeFunctionData({
                 abi,
@@ -91,36 +121,24 @@ export async function createLightAccountBase({ transport, chain, signer, abi, ve
             }
         },
         async signMessage({ message }) {
-            switch (version) {
-                case "v1.0.1":
-                    return signer.signMessage(message);
-                case "v1.0.2":
-                    throw new Error(`${type} ${String(version)} doesn't support 1271`);
-                case "v1.1.0":
-                    return signWith1271Wrapper(hashMessage(message), "1");
-                case "v2.0.0":
-                    const signature = await signWith1271Wrapper(hashMessage(message), "2");
-                    // TODO: handle case where signer is an SCA.
-                    return concat([SignatureType.EOA, signature]);
-                default:
-                    throw new Error(`Unknown version ${type} of ${String(version)}`);
-            }
+            const { type, data } = await prepareSign({
+                type: "personal_sign",
+                data: message,
+            });
+            const sig = type === "personal_sign"
+                ? await signer.signMessage(data)
+                : await signer.signTypedData(data);
+            return formatSign(sig);
         },
         async signTypedData(params) {
-            switch (version) {
-                case "v1.0.1":
-                    return signer.signTypedData(params);
-                case "v1.0.2":
-                    throw new Error(`Version ${String(version)} of LightAccount doesn't support 1271`);
-                case "v1.1.0":
-                    return signWith1271Wrapper(hashTypedData(params), "1");
-                case "v2.0.0":
-                    const signature = await signWith1271Wrapper(hashTypedData(params), "2");
-                    // TODO: handle case where signer is an SCA.
-                    return concat([SignatureType.EOA, signature]);
-                default:
-                    throw new Error(`Unknown version ${String(version)} of LightAccount`);
-            }
+            const { type, data } = await prepareSign({
+                type: "eth_signTypedData_v4",
+                data: params,
+            });
+            const sig = type === "personal_sign"
+                ? await signer.signMessage(data)
+                : await signer.signTypedData(data);
+            return formatSign(sig);
         },
         getDummySignature: () => {
             const signature = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";

package/dist/esm/src/light-account/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  FailedToGetStorageSlotError,\n  createBundlerClient,\n  toSmartContractAccount,\n  type Abi,\n  type EntryPointDef,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n  type UpgradeToAndCallParams,\n} from \"@aa-sdk/core\";\nimport {\n  concat,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Address,\n  type Chain,\n  type Hex,\n  type SignTypedDataParameters,\n  type Transport,\n} from \"viem\";\nimport type {\n  LightAccountEntryPointVersion,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../types.js\";\nimport { AccountVersionRegistry } from \"../utils.js\";\n\nenum SignatureType {\n  EOA = \"0x00\",\n  CONTRACT = \"0x01\",\n  CONTRACT_WITH_ADDR = \"0x02\",\n}\n\nexport type LightAccountBase<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartContractAccountWithSigner<\n  TLightAccountType,\n  TSigner,\n  LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>\n> & {\n  getLightAccountVersion: () => TLightAccountVersion;\n};\n\n//#region CreateLightAccountBaseParams\nexport type CreateLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = Pick<\n  ToSmartContractAccountParams<TLightAccountType, TTransport, Chain>,\n  \"transport\" | \"chain\" | \"getAccountInitCode\"\n> & {\n  abi: Abi;\n  signer: TSigner;\n  accountAddress: Address;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  entryPoint: EntryPointDef<\n    LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>,\n    Chain\n  >;\n};\n//#endregion CreateLightAccountBaseParams\n\nexport async function createLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n>({\n  transport,\n  chain,\n  signer,\n  abi,\n  version,\n  type,\n  entryPoint,\n  accountAddress,\n  getAccountInitCode,\n}: CreateLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport,\n  TSigner\n>): Promise<\n  LightAccountBase<TSigner, TLightAccountType, TLightAccountVersion>\n> {\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: UpgradeToAndCallParams): Promise<Hex> => {\n    const storage = await client.getStorageAt({\n      address: accountAddress,\n      // the slot at which impl addresses are stored by UUPS\n      slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n    });\n\n    if (storage == null) {\n      throw new FailedToGetStorageSlotError(\n        \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n        \"Proxy Implementation Address\",\n      );\n    }\n\n    const implementationAddresses = Object.values(\n      AccountVersionRegistry[type],\n    ).map(\n      (x) =>\n        x.addresses.overrides?.[chain.id]?.impl ?? x.addresses.default.impl,\n    );\n\n    // only upgrade undeployed accounts (storage 0) or deployed light accounts, error otherwise\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !implementationAddresses.some((x) => x === trim(storage))\n    ) {\n      throw new Error(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const signWith1271Wrapper = async (\n    hashedMessage: Hex,\n    version: string,\n  ): Promise<Hex> => {\n    return signer.signTypedData({\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: Number(client.chain.id),\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    });\n  };\n\n  const account = await toSmartContractAccount({\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    source: type,\n    getAccountInitCode,\n    encodeExecute: async ({ target, data, value }) => {\n      return encodeFunctionData({\n        abi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      });\n    },\n    encodeBatchExecute: async (txs) => {\n      const [targets, values, datas] = txs.reduce(\n        (accum, curr) => {\n          accum[0].push(curr.target);\n          accum[1].push(curr.value ?? 0n);\n          accum[2].push(curr.data);\n\n          return accum;\n        },\n        [[], [], []] as [Address[], bigint[], Hex[]],\n      );\n      return encodeFunctionData({\n        abi,\n        functionName: \"executeBatch\",\n        args: [targets, values, datas],\n      });\n    },\n    signUserOperationHash: async (uoHash: Hex) => {\n      const signature = await signer.signMessage({ raw: uoHash });\n      switch (version) {\n        case \"v2.0.0\":\n          // TODO: handle case where signer is an SCA.\n          return concat([SignatureType.EOA, signature]);\n        default:\n          return signature;\n      }\n    },\n    async signMessage({ message }) {\n      switch (version as string) {\n        case \"v1.0.1\":\n          return signer.signMessage(message);\n        case \"v1.0.2\":\n          throw new Error(`${type} ${String(version)} doesn't support 1271`);\n        case \"v1.1.0\":\n          return signWith1271Wrapper(hashMessage(message), \"1\");\n        case \"v2.0.0\":\n          const signature = await signWith1271Wrapper(\n            hashMessage(message),\n            \"2\",\n          );\n          // TODO: handle case where signer is an SCA.\n          return concat([SignatureType.EOA, signature]);\n        default:\n          throw new Error(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n    async signTypedData(params) {\n      switch (version as string) {\n        case \"v1.0.1\":\n          return signer.signTypedData(\n            params as unknown as SignTypedDataParameters,\n          );\n        case \"v1.0.2\":\n          throw new Error(\n            `Version ${String(version)} of LightAccount doesn't support 1271`,\n          );\n        case \"v1.1.0\":\n          return signWith1271Wrapper(hashTypedData(params), \"1\");\n        case \"v2.0.0\":\n          const signature = await signWith1271Wrapper(\n            hashTypedData(params),\n            \"2\",\n          );\n          // TODO: handle case where signer is an SCA.\n          return concat([SignatureType.EOA, signature]);\n        default:\n          throw new Error(`Unknown version ${String(version)} of LightAccount`);\n      }\n    },\n    getDummySignature: (): Hex => {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n      switch (version as string) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n          return concat([SignatureType.EOA, signature]);\n        default:\n          throw new Error(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n    encodeUpgradeToAndCall,\n  });\n\n  return {\n    ...account,\n    source: type,\n    getLightAccountVersion: () => version,\n    getSigner: () => signer,\n  };\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  FailedToGetStorageSlotError,\n  createBundlerClient,\n  toSmartContractAccount,\n  type Abi,\n  type EntryPointDef,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n  type UpgradeToAndCallParams,\n} from \"@aa-sdk/core\";\nimport {\n  concat,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport type {\n  LightAccountEntryPointVersion,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../types.js\";\nimport { AccountVersionRegistry } from \"../utils.js\";\nimport type { SignatureRequest } from \"@aa-sdk/core\";\n\nenum SignatureType {\n  EOA = \"0x00\",\n  CONTRACT = \"0x01\",\n  CONTRACT_WITH_ADDR = \"0x02\",\n}\n\nexport type LightAccountBase<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartContractAccountWithSigner<\n  TLightAccountType,\n  TSigner,\n  LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>\n> & {\n  getLightAccountVersion: () => TLightAccountVersion;\n};\n\n//#region CreateLightAccountBaseParams\nexport type CreateLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = Pick<\n  ToSmartContractAccountParams<TLightAccountType, TTransport, Chain>,\n  \"transport\" | \"chain\" | \"getAccountInitCode\"\n> & {\n  abi: Abi;\n  signer: TSigner;\n  accountAddress: Address;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  entryPoint: EntryPointDef<\n    LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>,\n    Chain\n  >;\n};\n//#endregion CreateLightAccountBaseParams\n\nexport async function createLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n>({\n  transport,\n  chain,\n  signer,\n  abi,\n  version,\n  type,\n  entryPoint,\n  accountAddress,\n  getAccountInitCode,\n}: CreateLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport,\n  TSigner\n>): Promise<\n  LightAccountBase<TSigner, TLightAccountType, TLightAccountVersion>\n> {\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: UpgradeToAndCallParams): Promise<Hex> => {\n    const storage = await client.getStorageAt({\n      address: accountAddress,\n      // the slot at which impl addresses are stored by UUPS\n      slot: \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n    });\n\n    if (storage == null) {\n      throw new FailedToGetStorageSlotError(\n        \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\",\n        \"Proxy Implementation Address\",\n      );\n    }\n\n    const implementationAddresses = Object.values(\n      AccountVersionRegistry[type],\n    ).map(\n      (x) =>\n        x.addresses.overrides?.[chain.id]?.impl ?? x.addresses.default.impl,\n    );\n\n    // only upgrade undeployed accounts (storage 0) or deployed light accounts, error otherwise\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !implementationAddresses.some((x) => x === trim(storage))\n    ) {\n      throw new Error(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const get1271Wrapper = (\n    hashedMessage: Hex,\n    version: string,\n  ): TypedDataDefinition => {\n    return {\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: Number(client.chain.id),\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    };\n  };\n\n  const prepareSign = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const messageHash =\n      params.type === \"personal_sign\"\n        ? hashMessage(params.data)\n        : hashTypedData(params.data);\n\n    switch (version as string) {\n      case \"v1.0.1\":\n        return params;\n      case \"v1.0.2\":\n        throw new Error(\n          `Version ${String(version)} of LightAccount doesn't support 1271`,\n        );\n      case \"v1.1.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"1\"),\n        };\n      case \"v2.0.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"2\"),\n        };\n      default:\n        throw new Error(`Unknown version ${String(version)} of LightAccount`);\n    }\n  };\n\n  const formatSign = async (\n    signature: `0x${string}`,\n  ): Promise<`0x${string}`> => {\n    return version === \"v2.0.0\"\n      ? concat([SignatureType.EOA, signature])\n      : signature;\n  };\n\n  const account = await toSmartContractAccount({\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    source: type,\n    getAccountInitCode,\n    prepareSign,\n    formatSign,\n    encodeExecute: async ({ target, data, value }) => {\n      return encodeFunctionData({\n        abi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      });\n    },\n    encodeBatchExecute: async (txs) => {\n      const [targets, values, datas] = txs.reduce(\n        (accum, curr) => {\n          accum[0].push(curr.target);\n          accum[1].push(curr.value ?? 0n);\n          accum[2].push(curr.data);\n\n          return accum;\n        },\n        [[], [], []] as [Address[], bigint[], Hex[]],\n      );\n      return encodeFunctionData({\n        abi,\n        functionName: \"executeBatch\",\n        args: [targets, values, datas],\n      });\n    },\n    signUserOperationHash: async (uoHash: Hex) => {\n      const signature = await signer.signMessage({ raw: uoHash });\n      switch (version) {\n        case \"v2.0.0\":\n          // TODO: handle case where signer is an SCA.\n          return concat([SignatureType.EOA, signature]);\n        default:\n          return signature;\n      }\n    },\n    async signMessage({ message }) {\n      const { type, data } = await prepareSign({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const sig =\n        type === \"personal_sign\"\n          ? await signer.signMessage(data)\n          : await signer.signTypedData(data);\n\n      return formatSign(sig);\n    },\n    async signTypedData<\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData,\n    >(params: TypedDataDefinition<typedData, primaryType>) {\n      const { type, data } = await prepareSign({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n\n      const sig =\n        type === \"personal_sign\"\n          ? await signer.signMessage(data)\n          : await signer.signTypedData(data);\n\n      return formatSign(sig);\n    },\n    getDummySignature: (): Hex => {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n      switch (version as string) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n          return concat([SignatureType.EOA, signature]);\n        default:\n          throw new Error(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n    encodeUpgradeToAndCall,\n  });\n\n  return {\n    ...account,\n    source: type,\n    getLightAccountVersion: () => version,\n    getSigner: () => signer,\n  };\n}\n"]}

package/dist/esm/src/ma-v2/account/common/modularAccountV2Base.d.ts

@@ -30,7 +30,7 @@ export type ModularAccountV2<TSigner extends SmartAccountSigner = SmartAccountSi
     getValidationData: (args: ValidationDataParams) => Promise<ValidationDataView>;
     encodeCallData: (callData: Hex) => Promise<Hex>;
 };
-export type CreateMAV2BaseParams<TSigner extends SmartAccountSigner = SmartAccountSigner, TTransport extends Transport = Transport> = Omit<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "encodeExecute" | "encodeBatchExecute" | "getNonce" | "signMessage" | "signTypedData" | "getDummySignature"> & {
+export type CreateMAV2BaseParams<TSigner extends SmartAccountSigner = SmartAccountSigner, TTransport extends Transport = Transport> = Omit<ToSmartContractAccountParams<"ModularAccountV2", TTransport, Chain, "0.7.0">, "encodeExecute" | "encodeBatchExecute" | "getNonce" | "signMessage" | "signTypedData" | "getDummySignature" | "prepareSign" | "formatSign"> & {
     signer: TSigner;
     signerEntity?: SignerEntity;
     accountAddress: Address;

package/dist/esm/src/ma-v2/account/common/modularAccountV2Base.js.map

@@ -1 +1 @@
-{"version":3,"file":"modularAccountV2Base.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createBundlerClient,\n  getEntryPoint,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  InvalidDeferredActionNonce,\n  toSmartContractAccount,\n  type AccountOp,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from \"../../utils.js\";\nimport {\n  type Hex,\n  type Address,\n  type Chain,\n  type Transport,\n  encodeFunctionData,\n  maxUint32,\n  zeroAddress,\n  getContract,\n  concatHex,\n  maxUint152,\n} from \"viem\";\nimport { modularAccountAbi } from \"../../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../../actions/common/utils.js\";\nimport { nativeSMASigner } from \"../nativeSMASigner.js\";\nimport { singleSignerMessageSigner } from \"../../modules/single-signer-validation/signer.js\";\n\nexport const executeUserOpSelector: Hex = \"0x8DD7712F\";\n\nexport type SignerEntity = {\n  isGlobalValidation: boolean;\n  entityId: number;\n};\n\nexport type ExecutionDataView = {\n  module: Address;\n  skipRuntimeValidation: boolean;\n  allowGlobalValidation: boolean;\n  executionHooks: readonly Hex[];\n};\n\nexport type ValidationDataView = {\n  validationHooks: readonly Hex[];\n  executionHooks: readonly Hex[];\n  selectors: readonly Hex[];\n  validationFlags: number;\n};\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type ModularAccountV2<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = SmartContractAccountWithSigner<\"ModularAccountV2\", TSigner, \"0.7.0\"> & {\n  signerEntity: SignerEntity;\n  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n  getValidationData: (\n    args: ValidationDataParams,\n  ) => Promise<ValidationDataView>;\n  encodeCallData: (callData: Hex) => Promise<Hex>;\n};\n\nexport type CreateMAV2BaseParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TTransport extends Transport = Transport,\n> = Omit<\n  ToSmartContractAccountParams<\"ModularAccountV2\", TTransport, Chain, \"0.7.0\">,\n  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.\n  | \"encodeExecute\"\n  | \"encodeBatchExecute\"\n  | \"getNonce\"\n  | \"signMessage\"\n  | \"signTypedData\"\n  | \"getDummySignature\"\n> & {\n  signer: TSigner;\n  signerEntity?: SignerEntity;\n  accountAddress: Address;\n  deferredAction?: Hex;\n};\n\nexport type CreateMAV2BaseReturnType<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = Promise<ModularAccountV2<TSigner>>;\n\nexport async function createMAv2Base<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {\n  let {\n    transport,\n    chain,\n    signer,\n    entryPoint = getEntryPoint(chain, { version: \"0.7.0\" }),\n    signerEntity = {\n      isGlobalValidation: true,\n      entityId: DEFAULT_OWNER_ENTITY_ID,\n    },\n    signerEntity: {\n      isGlobalValidation = true,\n      entityId = DEFAULT_OWNER_ENTITY_ID,\n    } = {},\n    accountAddress,\n    deferredAction,\n    ...remainingToSmartContractAccountParams\n  } = config;\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce: bigint = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP\n    const nextNonceForDeferredAction: bigint =\n      (await entryPointContract.read.getNonce([\n        accountAddress,\n        deferredActionNonce >> 64n,\n      ])) as bigint;\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonce();\n    }\n  }\n\n  const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({\n    target,\n    data,\n    value,\n  }) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      }),\n    );\n\n  const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"executeBatch\",\n        args: [\n          txs.map((tx) => ({\n            target: tx.target,\n            data: tx.data,\n            value: tx.value ?? 0n,\n          })),\n        ],\n      }),\n    );\n\n  const isAccountDeployed: () => Promise<boolean> = async () =>\n    !!(await client.getCode({ address: accountAddress }));\n\n  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey: bigint =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    return entryPointContract.read.getNonce([\n      accountAddress,\n      fullNonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const accountContract = getContract({\n    address: accountAddress,\n    abi: modularAccountAbi,\n    client,\n  });\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return await accountContract.read.getExecutionData([selector]);\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    return await accountContract.read.getValidationData([\n      serializeModuleEntity({\n        moduleAddress: validationModuleAddress ?? zeroAddress,\n        entityId: entityId ?? Number(maxUint32),\n      }),\n    ]);\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      hasAssociatedExecHooks = false; // set to falsy value once used\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    return callData;\n  };\n\n  const baseAccount = await toSmartContractAccount({\n    ...remainingToSmartContractAccountParams,\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)\n      : singleSignerMessageSigner(\n          signer,\n          chain,\n          accountAddress,\n          entityId,\n          deferredActionData,\n        )),\n  });\n\n  return {\n    ...baseAccount,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}
+{"version":3,"file":"modularAccountV2Base.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createBundlerClient,\n  getEntryPoint,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  InvalidDeferredActionNonce,\n  toSmartContractAccount,\n  type AccountOp,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from \"../../utils.js\";\nimport {\n  type Hex,\n  type Address,\n  type Chain,\n  type Transport,\n  encodeFunctionData,\n  maxUint32,\n  zeroAddress,\n  getContract,\n  concatHex,\n  maxUint152,\n} from \"viem\";\nimport { modularAccountAbi } from \"../../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../../actions/common/utils.js\";\nimport { nativeSMASigner } from \"../nativeSMASigner.js\";\nimport { singleSignerMessageSigner } from \"../../modules/single-signer-validation/signer.js\";\n\nexport const executeUserOpSelector: Hex = \"0x8DD7712F\";\n\nexport type SignerEntity = {\n  isGlobalValidation: boolean;\n  entityId: number;\n};\n\nexport type ExecutionDataView = {\n  module: Address;\n  skipRuntimeValidation: boolean;\n  allowGlobalValidation: boolean;\n  executionHooks: readonly Hex[];\n};\n\nexport type ValidationDataView = {\n  validationHooks: readonly Hex[];\n  executionHooks: readonly Hex[];\n  selectors: readonly Hex[];\n  validationFlags: number;\n};\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type ModularAccountV2<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = SmartContractAccountWithSigner<\"ModularAccountV2\", TSigner, \"0.7.0\"> & {\n  signerEntity: SignerEntity;\n  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n  getValidationData: (\n    args: ValidationDataParams,\n  ) => Promise<ValidationDataView>;\n  encodeCallData: (callData: Hex) => Promise<Hex>;\n};\n\nexport type CreateMAV2BaseParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TTransport extends Transport = Transport,\n> = Omit<\n  ToSmartContractAccountParams<\"ModularAccountV2\", TTransport, Chain, \"0.7.0\">,\n  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.\n  | \"encodeExecute\"\n  | \"encodeBatchExecute\"\n  | \"getNonce\"\n  | \"signMessage\"\n  | \"signTypedData\"\n  | \"getDummySignature\"\n  | \"prepareSign\"\n  | \"formatSign\"\n> & {\n  signer: TSigner;\n  signerEntity?: SignerEntity;\n  accountAddress: Address;\n  deferredAction?: Hex;\n};\n\nexport type CreateMAV2BaseReturnType<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n> = Promise<ModularAccountV2<TSigner>>;\n\nexport async function createMAv2Base<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {\n  let {\n    transport,\n    chain,\n    signer,\n    entryPoint = getEntryPoint(chain, { version: \"0.7.0\" }),\n    signerEntity = {\n      isGlobalValidation: true,\n      entityId: DEFAULT_OWNER_ENTITY_ID,\n    },\n    signerEntity: {\n      isGlobalValidation = true,\n      entityId = DEFAULT_OWNER_ENTITY_ID,\n    } = {},\n    accountAddress,\n    deferredAction,\n    ...remainingToSmartContractAccountParams\n  } = config;\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce: bigint = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP\n    const nextNonceForDeferredAction: bigint =\n      (await entryPointContract.read.getNonce([\n        accountAddress,\n        deferredActionNonce >> 64n,\n      ])) as bigint;\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonce();\n    }\n  }\n\n  const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({\n    target,\n    data,\n    value,\n  }) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      }),\n    );\n\n  const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"executeBatch\",\n        args: [\n          txs.map((tx) => ({\n            target: tx.target,\n            data: tx.data,\n            value: tx.value ?? 0n,\n          })),\n        ],\n      }),\n    );\n\n  const isAccountDeployed: () => Promise<boolean> = async () =>\n    !!(await client.getCode({ address: accountAddress }));\n\n  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey: bigint =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    return entryPointContract.read.getNonce([\n      accountAddress,\n      fullNonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const accountContract = getContract({\n    address: accountAddress,\n    abi: modularAccountAbi,\n    client,\n  });\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return await accountContract.read.getExecutionData([selector]);\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    return await accountContract.read.getValidationData([\n      serializeModuleEntity({\n        moduleAddress: validationModuleAddress ?? zeroAddress,\n        entityId: entityId ?? Number(maxUint32),\n      }),\n    ]);\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      hasAssociatedExecHooks = false; // set to falsy value once used\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    return callData;\n  };\n\n  const baseAccount = await toSmartContractAccount({\n    ...remainingToSmartContractAccountParams,\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)\n      : singleSignerMessageSigner(\n          signer,\n          chain,\n          accountAddress,\n          entityId,\n          deferredActionData,\n        )),\n  });\n\n  return {\n    ...baseAccount,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}

package/dist/esm/src/ma-v2/account/nativeSMASigner.d.ts

@@ -1,4 +1,4 @@
-import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { SmartAccountSigner, SignatureRequest } from "@aa-sdk/core";
 import { type Address, type Chain, type Hex, type SignableMessage, type TypedData, type TypedDataDefinition } from "viem";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
@@ -30,4 +30,6 @@ export declare const nativeSMASigner: (signer: SmartAccountSigner, chain: Chain,
         message: SignableMessage;
     }): Promise<Hex>;
     signTypedData: <const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>;
+    prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;
+    formatSign: (signature: Hex) => Promise<Hex>;
 };

package/dist/esm/src/ma-v2/account/nativeSMASigner.js

@@ -1,6 +1,6 @@
 import { concat, concatHex, hashMessage, hashTypedData, } from "viem";
+import { packUOSignature, pack1271Signature, DEFAULT_OWNER_ENTITY_ID, assertNeverSignatureRequestType, } from "../utils.js";
 import { SignatureType } from "../modules/utils.js";
-import { DEFAULT_OWNER_ENTITY_ID, pack1271Signature, packUOSignature, } from "../utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
  *
@@ -25,7 +25,52 @@ import { DEFAULT_OWNER_ENTITY_ID, pack1271Signature, packUOSignature, } from "..
  * @returns {object} an object with methods for signing operations and managing signatures
  */
 export const nativeSMASigner = (signer, chain, accountAddress, deferredActionData) => {
+    const signingMethods = {
+        prepareSign: async (request) => {
+            let hash;
+            switch (request.type) {
+                case "personal_sign":
+                    hash = hashMessage(request.data);
+                    break;
+                case "eth_signTypedData_v4":
+                    const isDeferredAction = request.data?.primaryType === "DeferredAction" &&
+                        request.data?.domain?.verifyingContract === accountAddress;
+                    if (isDeferredAction) {
+                        return request;
+                    }
+                    else {
+                        hash = await hashTypedData(request.data);
+                        break;
+                    }
+                default:
+                    assertNeverSignatureRequestType();
+            }
+            return {
+                type: "eth_signTypedData_v4",
+                data: {
+                    domain: {
+                        chainId: Number(chain.id),
+                        verifyingContract: accountAddress,
+                    },
+                    types: {
+                        ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
+                    },
+                    message: {
+                        hash,
+                    },
+                    primaryType: "ReplaySafeHash",
+                },
+            };
+        },
+        formatSign: async (signature) => {
+            return pack1271Signature({
+                validationSignature: signature,
+                entityId: DEFAULT_OWNER_ENTITY_ID,
+            });
+        },
+    };
     return {
+        ...signingMethods,
         getDummySignature: () => {
             const sig = packUOSignature({
                 // orderedHookData: [],
@@ -48,54 +93,35 @@ export const nativeSMASigner = (signer, chain, accountAddress, deferredActionDat
         },
         // we apply the expected 1271 packing here since the account contract will expect it
         async signMessage({ message }) {
-            const hash = hashMessage(message);
-            return pack1271Signature({
-                validationSignature: await signer.signTypedData({
-                    domain: {
-                        chainId: Number(chain.id),
-                        verifyingContract: accountAddress,
-                    },
-                    types: {
-                        ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
-                    },
-                    message: {
-                        hash,
-                    },
-                    primaryType: "ReplaySafeHash",
-                }),
-                entityId: DEFAULT_OWNER_ENTITY_ID,
+            const { type, data } = await signingMethods.prepareSign({
+                type: "personal_sign",
+                data: message,
             });
+            if (type !== "eth_signTypedData_v4") {
+                throw new Error("Invalid signature request type");
+            }
+            const sig = await signer.signTypedData(data);
+            return signingMethods.formatSign(sig);
         },
         // TODO: maybe move "sign deferred actions" to a separate function?
         // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing
         signTypedData: async (typedDataDefinition) => {
-            // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping
+            const { type, data } = await signingMethods.prepareSign({
+                type: "eth_signTypedData_v4",
+                data: typedDataDefinition,
+            });
+            if (type !== "eth_signTypedData_v4") {
+                throw new Error("Invalid signature request type");
+            }
+            const sig = await signer.signTypedData(data);
             const isDeferredAction = typedDataDefinition.primaryType === "DeferredAction" &&
                 typedDataDefinition.domain != null &&
                 // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)
                 "verifyingContract" in typedDataDefinition.domain &&
                 typedDataDefinition.domain.verifyingContract === accountAddress;
             return isDeferredAction
-                ? concat([
-                    SignatureType.EOA,
-                    await signer.signTypedData(typedDataDefinition),
-                ])
-                : pack1271Signature({
-                    validationSignature: await signer.signTypedData({
-                        domain: {
-                            chainId: Number(chain.id),
-                            verifyingContract: accountAddress,
-                        },
-                        types: {
-                            ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
-                        },
-                        message: {
-                            hash: await hashTypedData(typedDataDefinition),
-                        },
-                        primaryType: "ReplaySafeHash",
-                    }),
-                    entityId: DEFAULT_OWNER_ENTITY_ID,
-                });
+                ? concat([SignatureType.EOA, sig])
+                : signingMethods.formatSign(sig);
         },
     };
 };

package/dist/esm/src/ma-v2/account/nativeSMASigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,MAAM,EACN,SAAS,EACT,WAAW,EACX,aAAa,GAKd,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACvB,kBAAwB,EACxB,EAAE;IACF,OAAO;QACL,iBAAiB,EAAE,GAAQ,EAAE;YAC3B,MAAM,GAAG,GAAG,eAAe,CAAC;gBAC1B,uBAAuB;gBACvB,mBAAmB,EACjB,sIAAsI;aACzI,CAAC,CAAC;YAEH,OAAO,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACzE,CAAC;QAED,qBAAqB,EAAE,KAAK,EAAE,MAAW,EAAgB,EAAE;YACzD,IAAI,GAAG,GAAG,MAAM,MAAM;iBACnB,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;iBAC5B,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CACvB,eAAe,CAAC;gBACd,uBAAuB;gBACvB,mBAAmB,EAAE,SAAS;aAC/B,CAAC,CACH,CAAC;YAEJ,IAAI,kBAAkB,EAAE,CAAC;gBACvB,GAAG,GAAG,SAAS,CAAC,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3C,kBAAkB,GAAG,SAAS,CAAC;YACjC,CAAC;YAED,OAAO,GAAG,CAAC;QACb,CAAC;QAED,oFAAoF;QACpF,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,iBAAiB,CAAC;gBACvB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;oBAC9C,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,iBAAiB,EAAE,cAAc;qBAClC;oBACD,KAAK,EAAE;wBACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE;wBACP,IAAI;qBACL;oBACD,WAAW,EAAE,gBAAgB;iBAC9B,CAAC;gBACF,QAAQ,EAAE,uBAAuB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,qHAAqH;QACrH,aAAa,EAAE,KAAK,EAIlB,mBAAgE,EAClD,EAAE;YAChB,uIAAuI;YACvI,MAAM,gBAAgB,GACpB,mBAAmB,CAAC,WAAW,KAAK,gBAAgB;gBACpD,mBAAmB,CAAC,MAAM,IAAI,IAAI;gBAClC,8GAA8G;gBAC9G,mBAAmB,IAAI,mBAAmB,CAAC,MAAM;gBACjD,mBAAmB,CAAC,MAAM,CAAC,iBAAiB,KAAK,cAAc,CAAC;YAElE,OAAO,gBAAgB;gBACrB,CAAC,CAAC,MAAM,CAAC;oBACL,aAAa,CAAC,GAAG;oBACjB,MAAM,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC;iBAChD,CAAC;gBACJ,CAAC,CAAC,iBAAiB,CAAC;oBAChB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;wBAC9C,MAAM,EAAE;4BACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,iBAAiB,EAAE,cAAc;yBAClC;wBACD,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;yBACpD;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,MAAM,aAAa,CAAC,mBAAmB,CAAC;yBAC/C;wBACD,WAAW,EAAE,gBAAgB;qBAC9B,CAAC;oBACF,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Chain,\n  concat,\n  concatHex,\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\n\nimport { SignatureType } from \"../modules/utils.js\";\nimport {\n  DEFAULT_OWNER_ENTITY_ID,\n  pack1271Signature,\n  packUOSignature,\n} from \"../utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  deferredActionData?: Hex,\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      let sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          }),\n        );\n\n      if (deferredActionData) {\n        sig = concatHex([deferredActionData, sig]);\n        deferredActionData = undefined;\n      }\n\n      return sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: 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      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition.primaryType === \"DeferredAction\" &&\n        typedDataDefinition.domain != null &&\n        // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)\n        \"verifyingContract\" in typedDataDefinition.domain &&\n        typedDataDefinition.domain.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? concat([\n            SignatureType.EOA,\n            await signer.signTypedData(typedDataDefinition),\n          ])\n        : pack1271Signature({\n            validationSignature: await signer.signTypedData({\n              domain: {\n                chainId: Number(chain.id),\n                verifyingContract: accountAddress,\n              },\n              types: {\n                ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n              },\n              message: {\n                hash: await hashTypedData(typedDataDefinition),\n              },\n              primaryType: \"ReplaySafeHash\",\n            }),\n            entityId: DEFAULT_OWNER_ENTITY_ID,\n          });\n    },\n  };\n};\n"]}
+{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  SmartAccountSigner,\n  SigningMethods,\n  SignatureRequest,\n} from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Chain,\n  concat,\n  concatHex,\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n  assertNeverSignatureRequestType,\n} from \"../utils.js\";\nimport { SignatureType } from \"../modules/utils.js\";\n\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  deferredActionData?: Hex,\n) => {\n  const signingMethods: SigningMethods = {\n    prepareSign: async (\n      request: SignatureRequest,\n    ): Promise<SignatureRequest> => {\n      let hash;\n\n      switch (request.type) {\n        case \"personal_sign\":\n          hash = hashMessage(request.data);\n          break;\n\n        case \"eth_signTypedData_v4\":\n          const isDeferredAction =\n            request.data?.primaryType === \"DeferredAction\" &&\n            request.data?.domain?.verifyingContract === accountAddress;\n\n          if (isDeferredAction) {\n            return request;\n          } else {\n            hash = await hashTypedData(request.data);\n            break;\n          }\n\n        default:\n          assertNeverSignatureRequestType();\n      }\n\n      return {\n        type: \"eth_signTypedData_v4\",\n        data: {\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        },\n      };\n    },\n    formatSign: async (signature: Hex) => {\n      return pack1271Signature({\n        validationSignature: signature,\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n  };\n\n  return {\n    ...signingMethods,\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      let sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          }),\n        );\n\n      if (deferredActionData) {\n        sig = concatHex([deferredActionData, sig]);\n        deferredActionData = undefined;\n      }\n\n      return sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const { type, data } = await signingMethods.prepareSign({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      if (type !== \"eth_signTypedData_v4\") {\n        throw new Error(\"Invalid signature request type\");\n      }\n\n      const sig = await signer.signTypedData(data);\n\n      return signingMethods.formatSign(sig);\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: 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 { type, data } = await signingMethods.prepareSign({\n        type: \"eth_signTypedData_v4\",\n        data: typedDataDefinition as TypedDataDefinition,\n      });\n\n      if (type !== \"eth_signTypedData_v4\") {\n        throw new Error(\"Invalid signature request type\");\n      }\n\n      const sig = await signer.signTypedData(data);\n\n      const isDeferredAction =\n        typedDataDefinition.primaryType === \"DeferredAction\" &&\n        typedDataDefinition.domain != null &&\n        // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)\n        \"verifyingContract\" in typedDataDefinition.domain &&\n        typedDataDefinition.domain.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? concat([SignatureType.EOA, sig])\n        : signingMethods.formatSign(sig);\n    },\n  };\n};\n"]}

package/dist/esm/src/ma-v2/modules/single-signer-validation/signer.d.ts

@@ -1,4 +1,4 @@
-import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { SmartAccountSigner, SignatureRequest } from "@aa-sdk/core";
 import { type Address, type Chain, type Hex, type SignableMessage, type TypedData, type TypedDataDefinition } from "viem";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
@@ -32,4 +32,6 @@ export declare const singleSignerMessageSigner: (signer: SmartAccountSigner, cha
         message: SignableMessage;
     }): Promise<Hex>;
     signTypedData: <const typedData extends TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(typedDataDefinition: TypedDataDefinition<typedData, primaryType>) => Promise<Hex>;
+    prepareSign: (request: SignatureRequest) => Promise<SignatureRequest>;
+    formatSign: (signature: Hex) => Promise<Hex>;
 };

package/dist/esm/src/ma-v2/modules/single-signer-validation/signer.js

@@ -1,6 +1,6 @@
 import { concat, concatHex, hashMessage, hashTypedData, } from "viem";
 import { getDefaultSingleSignerValidationModuleAddress, SignatureType, } from "../utils.js";
-import { pack1271Signature, packUOSignature } from "../../utils.js";
+import { packUOSignature, pack1271Signature, assertNeverSignatureRequestType, } from "../../utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
  *
@@ -27,7 +27,46 @@ import { pack1271Signature, packUOSignature } from "../../utils.js";
  * @returns {object} an object with methods for signing operations and managing signatures
  */
 export const singleSignerMessageSigner = (signer, chain, accountAddress, entityId, deferredActionData) => {
+    const signingMethods = {
+        prepareSign: async (request) => {
+            let hash;
+            switch (request.type) {
+                case "personal_sign":
+                    hash = hashMessage(request.data);
+                    break;
+                case "eth_signTypedData_v4":
+                    hash = await hashTypedData(request.data);
+                    break;
+                default:
+                    assertNeverSignatureRequestType();
+            }
+            return {
+                type: "eth_signTypedData_v4",
+                data: {
+                    domain: {
+                        chainId: Number(chain.id),
+                        verifyingContract: getDefaultSingleSignerValidationModuleAddress(chain),
+                        salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
+                    },
+                    types: {
+                        ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
+                    },
+                    message: {
+                        hash,
+                    },
+                    primaryType: "ReplaySafeHash",
+                },
+            };
+        },
+        formatSign: async (signature) => {
+            return pack1271Signature({
+                validationSignature: signature,
+                entityId,
+            });
+        },
+    };
     return {
+        ...signingMethods,
         getDummySignature: () => {
             const sig = packUOSignature({
                 // orderedHookData: [],
@@ -50,55 +89,35 @@ export const singleSignerMessageSigner = (signer, chain, accountAddress, entityI
         },
         // we apply the expected 1271 packing here since the account contract will expect it
         async signMessage({ message }) {
-            const hash = await hashMessage(message);
-            return pack1271Signature({
-                validationSignature: await signer.signTypedData({
-                    domain: {
-                        chainId: Number(chain.id),
-                        verifyingContract: getDefaultSingleSignerValidationModuleAddress(chain),
-                        salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
-                    },
-                    types: {
-                        ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
-                    },
-                    message: {
-                        hash,
-                    },
-                    primaryType: "ReplaySafeHash",
-                }),
-                entityId,
+            const { type, data } = await signingMethods.prepareSign({
+                type: "personal_sign",
+                data: message,
             });
+            if (type !== "eth_signTypedData_v4") {
+                throw new Error("Invalid signature request type");
+            }
+            const sig = await signer.signTypedData(data);
+            return signingMethods.formatSign(sig);
         },
         // TODO: maybe move "sign deferred actions" to a separate function?
         // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing
         signTypedData: async (typedDataDefinition) => {
-            // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping
+            const { type, data } = await signingMethods.prepareSign({
+                type: "eth_signTypedData_v4",
+                data: typedDataDefinition,
+            });
+            if (type !== "eth_signTypedData_v4") {
+                throw new Error("Invalid signature request type");
+            }
+            const sig = await signer.signTypedData(data);
             const isDeferredAction = typedDataDefinition.primaryType === "DeferredAction" &&
                 typedDataDefinition.domain != null &&
                 // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)
                 "verifyingContract" in typedDataDefinition.domain &&
                 typedDataDefinition.domain.verifyingContract === accountAddress;
-            const validationSignature = await signer.signTypedData({
-                domain: {
-                    chainId: Number(chain.id),
-                    verifyingContract: getDefaultSingleSignerValidationModuleAddress(chain),
-                    salt: concatHex([`0x${"00".repeat(12)}`, accountAddress]),
-                },
-                types: {
-                    ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
-                },
-                message: {
-                    hash: hashTypedData(typedDataDefinition),
-                },
-                primaryType: "ReplaySafeHash",
-            });
-            // TODO: Handle non-EOA signer case
             return isDeferredAction
-                ? concat([SignatureType.EOA, validationSignature])
-                : pack1271Signature({
-                    validationSignature,
-                    entityId,
-                });
+                ? concat([SignatureType.EOA, sig])
+                : signingMethods.formatSign(sig);
         },
     };
 };