@alchemy/smart-accounts 0.0.0-alpha.2 → 0.0.0-alpha.21

package/dist/esm/ma-v2/predictAddress.js

@@ -1,8 +1,11 @@
 import { assertNever } from "@alchemy/common";
-import { concatHex, encodePacked, getContractAddress, keccak256, } from "viem";
-import { parsePublicKey } from "webauthn-p256";
+import { concatHex, decodeFunctionData, encodePacked, getContractAddress, isAddressEqual, keccak256, } from "viem";
+import { entryPoint07Address, } from "viem/account-abstraction";
+import { accountFactoryAbi } from "./abis/accountFactoryAbi.js";
+import { DefaultAddress } from "./utils/account.js";
+import { getSenderFromFactoryData } from "../utils.js";
 /**
- * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA", "MA", and "WebAuthn".
+ * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including "SMA" and "MA".
  *
  * @example
  * ```ts
@@ -37,12 +40,6 @@ export function predictModularAccountV2Address(params) {
                     combinedSalt: getCombinedSaltK1(params.ownerAddress, salt, params.entityId),
                     initcode: getProxyBytecode(implementationAddress),
                 };
-            case "WebAuthn":
-                const { x, y } = parsePublicKey(params.ownerPublicKey);
-                return {
-                    combinedSalt: getCombinedSaltWebAuthn({ x, y }, salt, params.entityId),
-                    initcode: getProxyBytecode(implementationAddress),
-                };
             default:
                 return assertNever(params, "Unexpected MAv2 type");
         }
@@ -57,9 +54,6 @@ export function predictModularAccountV2Address(params) {
 function getCombinedSaltK1(ownerAddress, salt, entityId) {
     return keccak256(encodePacked(["address", "uint256", "uint32"], [ownerAddress, salt, entityId]));
 }
-function getCombinedSaltWebAuthn(ownerPublicKey, salt, entityId) {
-    return keccak256(encodePacked(["uint256", "uint256", "uint256", "uint32"], [ownerPublicKey.x, ownerPublicKey.y, salt, entityId]));
-}
 function getProxyBytecode(implementationAddress) {
     return concatHex([
         "0x603d3d8160223d3973",
@@ -70,4 +64,44 @@ function getProxyBytecode(implementationAddress) {
 function getProxyBytecodeWithImmutableArgs(implementationAddress, immutableArgs) {
     return `0x6100513d8160233d3973${implementationAddress.slice(2)}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(2)}`;
 }
+/**
+ * Gets the modular account v2 address from factory data.
+ * If the factory is a known default (SMA), decodes the args and predicts without RPC.
+ * Otherwise falls back to calling the entry point's getSenderAddress.
+ *
+ * @param {GetModularAccountV2AddressFromFactoryDataParams} params - The parameters
+ * @returns {Promise<Address>} The account address
+ */
+export async function getModularAccountV2AddressFromFactoryData({ client, factoryAddress, factoryData, implementationAddress, entryPoint = {
+    version: "0.7",
+    address: entryPoint07Address,
+}, }) {
+    // Try SMA factory
+    if (isAddressEqual(factoryAddress, DefaultAddress.MAV2_FACTORY)) {
+        try {
+            const decoded = decodeFunctionData({
+                abi: accountFactoryAbi,
+                data: factoryData,
+            });
+            if (decoded.functionName === "createSemiModularAccount") {
+                const [decodedOwner, decodedSalt] = decoded.args;
+                return predictModularAccountV2Address({
+                    factoryAddress,
+                    implementationAddress,
+                    salt: decodedSalt,
+                    type: "SMA",
+                    ownerAddress: decodedOwner,
+                });
+            }
+        }
+        catch {
+            // Decode failed, fall through to RPC
+        }
+    }
+    return getSenderFromFactoryData(client, {
+        factory: factoryAddress,
+        factoryData,
+        entryPoint,
+    });
+}
 //# sourceMappingURL=predictAddress.js.map

package/dist/esm/ma-v2/predictAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v2/predictAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,SAAS,GAGV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAuB/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,8BAA8B,CAC5C,MAA4C;IAE5C,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAE/D,yGAAyG;IACzG,6JAA6J;IAC7J,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,GAAG,EAAE;QACvC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,KAAK;gBACR,gDAAgD;gBAChD,OAAO;oBACL,YAAY,EAAE,iBAAiB,CAC7B,MAAM,CAAC,YAAY,EACnB,IAAI,EACJ,UAAU,CACX;oBACD,QAAQ,EAAE,iCAAiC,CACzC,qBAAqB,EACrB,MAAM,CAAC,YAAY,CACpB;iBACF,CAAC;YACJ,KAAK,IAAI;gBACP,OAAO;oBACL,YAAY,EAAE,iBAAiB,CAC7B,MAAM,CAAC,YAAY,EACnB,IAAI,EACJ,MAAM,CAAC,QAAQ,CAChB;oBACD,QAAQ,EAAE,gBAAgB,CAAC,qBAAqB,CAAC;iBAClD,CAAC;YACJ,KAAK,UAAU;gBACb,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACvD,OAAO;oBACL,YAAY,EAAE,uBAAuB,CACnC,EAAE,CAAC,EAAE,CAAC,EAAE,EACR,IAAI,EACJ,MAAM,CAAC,QAAQ,CAChB;oBACD,QAAQ,EAAE,gBAAgB,CAAC,qBAAqB,CAAC;iBAClD,CAAC;YACJ;gBACE,OAAO,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,kBAAkB,CAAC;QACxB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CACxB,YAAqB,EACrB,IAAY,EACZ,QAAgB;IAEhB,OAAO,SAAS,CACd,YAAY,CACV,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAChC,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAC/B,CACF,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,cAAwC,EACxC,IAAY,EACZ,QAAgB;IAEhB,OAAO,SAAS,CACd,YAAY,CACV,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAC3C,CAAC,cAAc,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CACrD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,qBAA8B;IACtD,OAAO,SAAS,CAAC;QACf,sBAAsB;QACtB,qBAAqB;QACrB,wIAAwI;KACzI,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iCAAiC,CACxC,qBAA8B,EAC9B,aAAkB;IAElB,OAAO,yBAAyB,qBAAqB,CAAC,KAAK,CACzD,CAAC,CACF,uIAAuI,aAAa,CAAC,KAAK,CACzJ,CAAC,CACF,EAAE,CAAC;AACN,CAAC","sourcesContent":["import { assertNever } from \"@alchemy/common\";\nimport {\n  concatHex,\n  encodePacked,\n  getContractAddress,\n  keccak256,\n  type Address,\n  type Hex,\n} from \"viem\";\nimport { parsePublicKey } from \"webauthn-p256\";\n\nexport type PredictModularAccountV2AddressParams = {\n  factoryAddress: Address;\n  implementationAddress: Address; // Should be the implementation address of the account type you are predicting the address for.\n  salt: bigint;\n} & (\n  | {\n      type: \"MA\";\n      ownerAddress: Address;\n      entityId: number;\n    }\n  | {\n      type: \"SMA\";\n      ownerAddress: Address;\n    }\n  | {\n      type: \"WebAuthn\";\n      ownerPublicKey: Hex;\n      entityId: number;\n    }\n);\n\n/**\n * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including \"SMA\", \"MA\", and \"WebAuthn\".\n *\n * @example\n * ```ts\n * import { predictModularAccountV2Address } from \"@alchemy/smart-accounts\";\n *\n * const accountAddress = predictModularAccountV2Address({\n *   factoryAddress: \"0xFactoryAddress\" as Address,\n *   implementationAddress: \"0xImplementation\" as Address,\n *   salt: 0n,\n *   type: \"SMA\",\n *   ownerAddress: \"0xOwner\" as Address,\n * });\n * ```\n *\n * @param {PredictModularAccountV2AddressParams} params The parameters for predicting the modular account address, including `factoryAddress`, `salt`, `implementationAddress`, and additional properties based on the account type.\n * @returns {Address} The predicted address for the modular account V2.\n */\nexport function predictModularAccountV2Address(\n  params: PredictModularAccountV2AddressParams,\n): Address {\n  const { factoryAddress, salt, implementationAddress } = params;\n\n  // Note(v4): prediction for MA is currently untested, because it is not supported as an account type yet.\n  // Prior to using this prediction logic, ensure that the counterfactual computation is correct by updating `predictAddress.test.ts` to include a test for MA.\n  const { combinedSalt, initcode } = (() => {\n    switch (params.type) {\n      case \"SMA\":\n        // MAv2 factory uses max uint32 for SMA entityId\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            0xffffffff,\n          ),\n          initcode: getProxyBytecodeWithImmutableArgs(\n            implementationAddress,\n            params.ownerAddress,\n          ),\n        };\n      case \"MA\":\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      case \"WebAuthn\":\n        const { x, y } = parsePublicKey(params.ownerPublicKey);\n        return {\n          combinedSalt: getCombinedSaltWebAuthn(\n            { x, y },\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      default:\n        return assertNever(params, \"Unexpected MAv2 type\");\n    }\n  })();\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecode: initcode,\n  });\n}\n\nfunction getCombinedSaltK1(\n  ownerAddress: Address,\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"address\", \"uint256\", \"uint32\"],\n      [ownerAddress, salt, entityId],\n    ),\n  );\n}\n\nfunction getCombinedSaltWebAuthn(\n  ownerPublicKey: { x: bigint; y: bigint },\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"uint256\", \"uint256\", \"uint256\", \"uint32\"],\n      [ownerPublicKey.x, ownerPublicKey.y, salt, entityId],\n    ),\n  );\n}\n\nfunction getProxyBytecode(implementationAddress: Address): Hex {\n  return concatHex([\n    \"0x603d3d8160223d3973\",\n    implementationAddress,\n    \"0x60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3\",\n  ]);\n}\n\nfunction getProxyBytecodeWithImmutableArgs(\n  implementationAddress: Address,\n  immutableArgs: Hex,\n): Hex {\n  return `0x6100513d8160233d3973${implementationAddress.slice(\n    2,\n  )}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(\n    2,\n  )}`;\n}\n"]}
+{"version":3,"file":"predictAddress.js","sourceRoot":"","sources":["../../../src/ma-v2/predictAddress.ts"],"names":[],"mappings":"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","sourcesContent":["import { assertNever } from \"@alchemy/common\";\nimport {\n  concatHex,\n  decodeFunctionData,\n  encodePacked,\n  getContractAddress,\n  isAddressEqual,\n  keccak256,\n  type Address,\n  type Client,\n  type Hex,\n} from \"viem\";\nimport {\n  entryPoint07Address,\n  type EntryPointVersion,\n} from \"viem/account-abstraction\";\nimport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nimport { DefaultAddress } from \"./utils/account.js\";\nimport { getSenderFromFactoryData } from \"../utils.js\";\n\nexport type PredictModularAccountV2AddressParams = {\n  factoryAddress: Address;\n  implementationAddress: Address; // Should be the implementation address of the account type you are predicting the address for.\n  salt: bigint;\n} & (\n  | {\n      type: \"MA\";\n      ownerAddress: Address;\n      entityId: number;\n    }\n  | {\n      type: \"SMA\";\n      ownerAddress: Address;\n    }\n);\n\n/**\n * Predicts the address of a modular account V2 based on the provided parameters, which include factory address, salt, and implementation address. This function supports different types of accounts including \"SMA\" and \"MA\".\n *\n * @example\n * ```ts\n * import { predictModularAccountV2Address } from \"@alchemy/smart-accounts\";\n *\n * const accountAddress = predictModularAccountV2Address({\n *   factoryAddress: \"0xFactoryAddress\" as Address,\n *   implementationAddress: \"0xImplementation\" as Address,\n *   salt: 0n,\n *   type: \"SMA\",\n *   ownerAddress: \"0xOwner\" as Address,\n * });\n * ```\n *\n * @param {PredictModularAccountV2AddressParams} params The parameters for predicting the modular account address, including `factoryAddress`, `salt`, `implementationAddress`, and additional properties based on the account type.\n * @returns {Address} The predicted address for the modular account V2.\n */\nexport function predictModularAccountV2Address(\n  params: PredictModularAccountV2AddressParams,\n): Address {\n  const { factoryAddress, salt, implementationAddress } = params;\n\n  // Note(v4): prediction for MA is currently untested, because it is not supported as an account type yet.\n  // Prior to using this prediction logic, ensure that the counterfactual computation is correct by updating `predictAddress.test.ts` to include a test for MA.\n  const { combinedSalt, initcode } = (() => {\n    switch (params.type) {\n      case \"SMA\":\n        // MAv2 factory uses max uint32 for SMA entityId\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            0xffffffff,\n          ),\n          initcode: getProxyBytecodeWithImmutableArgs(\n            implementationAddress,\n            params.ownerAddress,\n          ),\n        };\n      case \"MA\":\n        return {\n          combinedSalt: getCombinedSaltK1(\n            params.ownerAddress,\n            salt,\n            params.entityId,\n          ),\n          initcode: getProxyBytecode(implementationAddress),\n        };\n      default:\n        return assertNever(params, \"Unexpected MAv2 type\");\n    }\n  })();\n\n  return getContractAddress({\n    from: factoryAddress,\n    opcode: \"CREATE2\",\n    salt: combinedSalt,\n    bytecode: initcode,\n  });\n}\n\nfunction getCombinedSaltK1(\n  ownerAddress: Address,\n  salt: bigint,\n  entityId: number,\n): Hex {\n  return keccak256(\n    encodePacked(\n      [\"address\", \"uint256\", \"uint32\"],\n      [ownerAddress, salt, entityId],\n    ),\n  );\n}\n\nfunction getProxyBytecode(implementationAddress: Address): Hex {\n  return concatHex([\n    \"0x603d3d8160223d3973\",\n    implementationAddress,\n    \"0x60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3\",\n  ]);\n}\n\nfunction getProxyBytecodeWithImmutableArgs(\n  implementationAddress: Address,\n  immutableArgs: Hex,\n): Hex {\n  return `0x6100513d8160233d3973${implementationAddress.slice(\n    2,\n  )}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3${immutableArgs.slice(\n    2,\n  )}`;\n}\n\nexport type GetModularAccountV2AddressFromFactoryDataParams = {\n  client: Client;\n  factoryAddress: Address;\n  factoryData: Hex;\n  implementationAddress: Address;\n  entryPoint?: {\n    version: EntryPointVersion;\n    address: Address;\n  };\n};\n\n/**\n * Gets the modular account v2 address from factory data.\n * If the factory is a known default (SMA), decodes the args and predicts without RPC.\n * Otherwise falls back to calling the entry point's getSenderAddress.\n *\n * @param {GetModularAccountV2AddressFromFactoryDataParams} params - The parameters\n * @returns {Promise<Address>} The account address\n */\nexport async function getModularAccountV2AddressFromFactoryData({\n  client,\n  factoryAddress,\n  factoryData,\n  implementationAddress,\n  entryPoint = {\n    version: \"0.7\",\n    address: entryPoint07Address,\n  },\n}: GetModularAccountV2AddressFromFactoryDataParams): Promise<Address> {\n  // Try SMA factory\n  if (isAddressEqual(factoryAddress, DefaultAddress.MAV2_FACTORY)) {\n    try {\n      const decoded = decodeFunctionData({\n        abi: accountFactoryAbi,\n        data: factoryData,\n      });\n      if (decoded.functionName === \"createSemiModularAccount\") {\n        const [decodedOwner, decodedSalt] = decoded.args;\n        return predictModularAccountV2Address({\n          factoryAddress,\n          implementationAddress,\n          salt: decodedSalt,\n          type: \"SMA\",\n          ownerAddress: decodedOwner,\n        });\n      }\n    } catch {\n      // Decode failed, fall through to RPC\n    }\n  }\n  return getSenderFromFactoryData(client, {\n    factory: factoryAddress,\n    factoryData,\n    entryPoint,\n  });\n}\n"]}

package/dist/esm/ma-v2/utils/account.d.ts

@@ -8,18 +8,15 @@ import type { ModularAccountV2Base } from "../accounts/base.js";
  */
 export declare const DefaultAddress: {
     MAV2_FACTORY: "0x00000000000017c61b5bEe81050EC8eFc9c6fecd";
-    MAV2_FACTORY_WEBAUTHN: "0x55010E571dCf07e254994bfc88b9C1C8FAe31960";
     SMAV2_BYTECODE: "0x000000000000c5A9089039570Dd36455b5C07383";
     SMAV2_STORAGE: "0x0000000000006E2f9d80CaEc0Da6500f005EB25A";
     SMAV2_7702: "0x69007702764179f14F51cdce752f4f775d74E139";
-    MAV2: "0x00000000000002377B26b1EdA7b0BC371C60DD4f";
 };
 /**
  * A mapping of default addresses for the ModularAccountV2 modules.
  */
 export declare const DefaultModuleAddress: {
     SINGLE_SIGNER_VALIDATION: "0x00000000000099DE0BF6fA90dEB851E2A2df7d83";
-    WEBAUTHN_VALIDATION: "0x0000000000001D9d34E07D9834274dF9ae575217";
     TIME_RANGE: "0x00000000000082B8e2012be914dFA4f62A0573eA";
     PAYMASTER_GUARD: "0x0000000000001aA7A7F7E29abe0be06c72FD42A1";
     NATIVE_TOKEN_LIMIT: "0x00000000000001e541f0D090868FBe24b59Fbe06";

package/dist/esm/ma-v2/utils/account.js

@@ -5,18 +5,15 @@ import { semiModularAccountStorageAbi } from "../abis/semiModularAccountStorageA
  */
 export const DefaultAddress = {
     MAV2_FACTORY: "0x00000000000017c61b5bEe81050EC8eFc9c6fecd",
-    MAV2_FACTORY_WEBAUTHN: "0x55010E571dCf07e254994bfc88b9C1C8FAe31960",
     SMAV2_BYTECODE: "0x000000000000c5A9089039570Dd36455b5C07383",
     SMAV2_STORAGE: "0x0000000000006E2f9d80CaEc0Da6500f005EB25A",
     SMAV2_7702: "0x69007702764179f14F51cdce752f4f775d74E139",
-    MAV2: "0x00000000000002377B26b1EdA7b0BC371C60DD4f",
 };
 /**
  * A mapping of default addresses for the ModularAccountV2 modules.
  */
 export const DefaultModuleAddress = {
     SINGLE_SIGNER_VALIDATION: "0x00000000000099DE0BF6fA90dEB851E2A2df7d83",
-    WEBAUTHN_VALIDATION: "0x0000000000001D9d34E07D9834274dF9ae575217",
     TIME_RANGE: "0x00000000000082B8e2012be914dFA4f62A0573eA",
     PAYMASTER_GUARD: "0x0000000000001aA7A7F7E29abe0be06c72FD42A1",
     NATIVE_TOKEN_LIMIT: "0x00000000000001e541f0D090868FBe24b59Fbe06",
@@ -91,6 +88,7 @@ export function serializeModuleEntity(config) {
  * @returns {boolean} True if the account is a ModularAccountV2, false otherwise.
  */
 export function isModularAccountV2(account) {
-    return "source" in account && account.source === "ModularAccountV2";
+    return ("smartAccountType" in account &&
+        account.smartAccountType === "ModularAccountV2");
 }
 //# sourceMappingURL=account.js.map

package/dist/esm/ma-v2/utils/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,KAAK,GAGN,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AAGvF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,YAAY,EAAE,4CAA4C;IAC1D,qBAAqB,EAAE,4CAA4C;IACnE,cAAc,EAAE,4CAA4C;IAC5D,aAAa,EAAE,4CAA4C;IAC3D,UAAU,EAAE,4CAA4C;IACxD,IAAI,EAAE,4CAA4C;CACjB,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,wBAAwB,EAAE,4CAA4C;IACtE,mBAAmB,EAAE,4CAA4C;IACjE,UAAU,EAAE,4CAA4C;IACxD,eAAe,EAAE,4CAA4C;IAC7D,kBAAkB,EAAE,4CAA4C;IAChE,SAAS,EAAE,4CAA4C;CACtB,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAQ,YAAY,CAAC;AAM1D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,YAAqB;IAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC;QAClC,GAAG,EAAE,4BAA4B;QACjC,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,CAAC,YAAY,CAAC;KACrB,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,cAAc,CAAC,aAAa;QACzC,kBAAkB,EAAE,QAAQ;QAC5B,+GAA+G;QAC/G,6FAA6F;KAC9F,CAAC;AACJ,CAAC;AAUD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,CAAC,EACZ,kBAAkB,GAAG,IAAI,EACzB,gBAAgB,GAAG,KAAK,GACP,EAAU,EAAE;IAC7B,OAAO,CACL,CAAC,QAAQ,IAAI,GAAG,CAAC;QACjB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAoB;IACxD,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAqB;IAErB,OAAO,QAAQ,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,kBAAkB,CAAC;AACtE,CAAC","sourcesContent":["import {\n  concatHex,\n  encodeFunctionData,\n  toHex,\n  type Address,\n  type Hex,\n} from \"viem\";\nimport type { SmartAccount } from \"viem/account-abstraction\";\nimport type { GetAccountParameter } from \"../../types.js\";\nimport type { ModuleEntity, UpgradeToData } from \"../types.js\";\nimport { semiModularAccountStorageAbi } from \"../abis/semiModularAccountStorageAbi.js\";\nimport type { ModularAccountV2Base } from \"../accounts/base.js\";\n\n/**\n * A mapping of default addresses for the ModularAccountV2.\n */\nexport const DefaultAddress = {\n  MAV2_FACTORY: \"0x00000000000017c61b5bEe81050EC8eFc9c6fecd\",\n  MAV2_FACTORY_WEBAUTHN: \"0x55010E571dCf07e254994bfc88b9C1C8FAe31960\",\n  SMAV2_BYTECODE: \"0x000000000000c5A9089039570Dd36455b5C07383\",\n  SMAV2_STORAGE: \"0x0000000000006E2f9d80CaEc0Da6500f005EB25A\",\n  SMAV2_7702: \"0x69007702764179f14F51cdce752f4f775d74E139\",\n  MAV2: \"0x00000000000002377B26b1EdA7b0BC371C60DD4f\",\n} satisfies Record<string, Address>;\n\n/**\n * A mapping of default addresses for the ModularAccountV2 modules.\n */\nexport const DefaultModuleAddress = {\n  SINGLE_SIGNER_VALIDATION: \"0x00000000000099DE0BF6fA90dEB851E2A2df7d83\",\n  WEBAUTHN_VALIDATION: \"0x0000000000001D9d34E07D9834274dF9ae575217\",\n  TIME_RANGE: \"0x00000000000082B8e2012be914dFA4f62A0573eA\",\n  PAYMASTER_GUARD: \"0x0000000000001aA7A7F7E29abe0be06c72FD42A1\",\n  NATIVE_TOKEN_LIMIT: \"0x00000000000001e541f0D090868FBe24b59Fbe06\",\n  ALLOWLIST: \"0x00000000003e826473a313e600b5b9b791f5a59a\",\n} satisfies Record<string, Address>;\n\n/**\n * The default owner entity ID.\n */\nexport const DEFAULT_OWNER_ENTITY_ID = 0;\n\n/**\n * The selector for the execute user operation function.\n */\nexport const EXECUTE_USER_OP_SELECTOR: Hex = \"0x8DD7712F\";\n\nexport type GetMAV2UpgradeToData<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n> = GetAccountParameter<TAccount>;\n\n/**\n * Gets the upgrade to data for the ModularAccountV2.\n *\n * @param {Address} ownerAddress - The address of the owner.\n * @returns {Promise<UpgradeToData>} The upgrade to data.\n */\nexport async function getMAV2UpgradeToData(\n  ownerAddress: Address,\n): Promise<UpgradeToData> {\n  const initData = encodeFunctionData({\n    abi: semiModularAccountStorageAbi,\n    functionName: \"initialize\",\n    args: [ownerAddress],\n  });\n\n  return {\n    implAddress: DefaultAddress.SMAV2_STORAGE,\n    initializationData: initData,\n    // TODO(v5): do we need `createModularAccountV2FromExisting()` in the return type here like we had in v4 or no?\n    // Almost certainly not, but we need to clean up other parts in SDK for client-side upgrades.\n  };\n}\n\nexport type BuildNonceParams = {\n  nonceKey?: bigint;\n  entityId?: number;\n  isGlobalValidation?: boolean;\n  isDeferredAction?: boolean;\n  isDirectCallValidation?: boolean;\n};\n\n/**\n * Builds a full nonce key.\n *\n * @param {BuildNonceParams} params - The parameters for building a full nonce key.\n * @returns {bigint} The full nonce key.\n */\nexport const buildFullNonceKey = ({\n  nonceKey = 0n,\n  entityId = 0,\n  isGlobalValidation = true,\n  isDeferredAction = false,\n}: BuildNonceParams): bigint => {\n  return (\n    (nonceKey << 40n) +\n    (BigInt(entityId) << 8n) +\n    (isDeferredAction ? 2n : 0n) +\n    (isGlobalValidation ? 1n : 0n)\n  );\n};\n\n/**\n * Serializes a module entity into a hexadecimal format by concatenating the module address and entity ID.\n *\n * @example\n * ```ts\n * import { serializeModuleEntity } from \"@alchemy/smart-accounts\";\n * import { Address } from \"viem\";\n *\n * const moduleAddress: Address = \"0x1234\";\n * const entityId: number = 1234;\n *\n * const moduleEntityHex = serializeModuleEntity({\n *  moduleAddress,\n *  entityId\n * });\n * ```\n *\n * @param {ModuleEntity} config The module entity configuration containing the module address and entity ID\n * @returns {Hex} A hexadecimal string representation of the serialized module entity\n */\nexport function serializeModuleEntity(config: ModuleEntity): Hex {\n  return concatHex([config.moduleAddress, toHex(config.entityId, { size: 4 })]);\n}\n\n/**\n * Checks if an account is a ModularAccountV2.\n *\n * @param {SmartAccount} account - The account to check.\n * @returns {boolean} True if the account is a ModularAccountV2, false otherwise.\n */\nexport function isModularAccountV2(\n  account: SmartAccount,\n): account is ModularAccountV2Base {\n  return \"source\" in account && account.source === \"ModularAccountV2\";\n}\n"]}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,KAAK,GAGN,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AAGvF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,YAAY,EAAE,4CAA4C;IAC1D,cAAc,EAAE,4CAA4C;IAC5D,aAAa,EAAE,4CAA4C;IAC3D,UAAU,EAAE,4CAA4C;CACvB,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,wBAAwB,EAAE,4CAA4C;IACtE,UAAU,EAAE,4CAA4C;IACxD,eAAe,EAAE,4CAA4C;IAC7D,kBAAkB,EAAE,4CAA4C;IAChE,SAAS,EAAE,4CAA4C;CACtB,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAQ,YAAY,CAAC;AAM1D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,YAAqB;IAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC;QAClC,GAAG,EAAE,4BAA4B;QACjC,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,CAAC,YAAY,CAAC;KACrB,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,cAAc,CAAC,aAAa;QACzC,kBAAkB,EAAE,QAAQ;QAC5B,+GAA+G;QAC/G,6FAA6F;KAC9F,CAAC;AACJ,CAAC;AAUD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,CAAC,EACZ,kBAAkB,GAAG,IAAI,EACzB,gBAAgB,GAAG,KAAK,GACP,EAAU,EAAE;IAC7B,OAAO,CACL,CAAC,QAAQ,IAAI,GAAG,CAAC;QACjB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAoB;IACxD,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAqB;IAErB,OAAO,CACL,kBAAkB,IAAI,OAAO;QAC7B,OAAO,CAAC,gBAAgB,KAAK,kBAAkB,CAChD,CAAC;AACJ,CAAC","sourcesContent":["import {\n  concatHex,\n  encodeFunctionData,\n  toHex,\n  type Address,\n  type Hex,\n} from \"viem\";\nimport type { SmartAccount } from \"viem/account-abstraction\";\nimport type { GetAccountParameter } from \"../../types.js\";\nimport type { ModuleEntity, UpgradeToData } from \"../types.js\";\nimport { semiModularAccountStorageAbi } from \"../abis/semiModularAccountStorageAbi.js\";\nimport type { ModularAccountV2Base } from \"../accounts/base.js\";\n\n/**\n * A mapping of default addresses for the ModularAccountV2.\n */\nexport const DefaultAddress = {\n  MAV2_FACTORY: \"0x00000000000017c61b5bEe81050EC8eFc9c6fecd\",\n  SMAV2_BYTECODE: \"0x000000000000c5A9089039570Dd36455b5C07383\",\n  SMAV2_STORAGE: \"0x0000000000006E2f9d80CaEc0Da6500f005EB25A\",\n  SMAV2_7702: \"0x69007702764179f14F51cdce752f4f775d74E139\",\n} satisfies Record<string, Address>;\n\n/**\n * A mapping of default addresses for the ModularAccountV2 modules.\n */\nexport const DefaultModuleAddress = {\n  SINGLE_SIGNER_VALIDATION: \"0x00000000000099DE0BF6fA90dEB851E2A2df7d83\",\n  TIME_RANGE: \"0x00000000000082B8e2012be914dFA4f62A0573eA\",\n  PAYMASTER_GUARD: \"0x0000000000001aA7A7F7E29abe0be06c72FD42A1\",\n  NATIVE_TOKEN_LIMIT: \"0x00000000000001e541f0D090868FBe24b59Fbe06\",\n  ALLOWLIST: \"0x00000000003e826473a313e600b5b9b791f5a59a\",\n} satisfies Record<string, Address>;\n\n/**\n * The default owner entity ID.\n */\nexport const DEFAULT_OWNER_ENTITY_ID = 0;\n\n/**\n * The selector for the execute user operation function.\n */\nexport const EXECUTE_USER_OP_SELECTOR: Hex = \"0x8DD7712F\";\n\nexport type GetMAV2UpgradeToData<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n> = GetAccountParameter<TAccount>;\n\n/**\n * Gets the upgrade to data for the ModularAccountV2.\n *\n * @param {Address} ownerAddress - The address of the owner.\n * @returns {Promise<UpgradeToData>} The upgrade to data.\n */\nexport async function getMAV2UpgradeToData(\n  ownerAddress: Address,\n): Promise<UpgradeToData> {\n  const initData = encodeFunctionData({\n    abi: semiModularAccountStorageAbi,\n    functionName: \"initialize\",\n    args: [ownerAddress],\n  });\n\n  return {\n    implAddress: DefaultAddress.SMAV2_STORAGE,\n    initializationData: initData,\n    // TODO(v5): do we need `createModularAccountV2FromExisting()` in the return type here like we had in v4 or no?\n    // Almost certainly not, but we need to clean up other parts in SDK for client-side upgrades.\n  };\n}\n\nexport type BuildNonceParams = {\n  nonceKey?: bigint;\n  entityId?: number;\n  isGlobalValidation?: boolean;\n  isDeferredAction?: boolean;\n  isDirectCallValidation?: boolean;\n};\n\n/**\n * Builds a full nonce key.\n *\n * @param {BuildNonceParams} params - The parameters for building a full nonce key.\n * @returns {bigint} The full nonce key.\n */\nexport const buildFullNonceKey = ({\n  nonceKey = 0n,\n  entityId = 0,\n  isGlobalValidation = true,\n  isDeferredAction = false,\n}: BuildNonceParams): bigint => {\n  return (\n    (nonceKey << 40n) +\n    (BigInt(entityId) << 8n) +\n    (isDeferredAction ? 2n : 0n) +\n    (isGlobalValidation ? 1n : 0n)\n  );\n};\n\n/**\n * Serializes a module entity into a hexadecimal format by concatenating the module address and entity ID.\n *\n * @example\n * ```ts\n * import { serializeModuleEntity } from \"@alchemy/smart-accounts\";\n * import { Address } from \"viem\";\n *\n * const moduleAddress: Address = \"0x1234\";\n * const entityId: number = 1234;\n *\n * const moduleEntityHex = serializeModuleEntity({\n *  moduleAddress,\n *  entityId\n * });\n * ```\n *\n * @param {ModuleEntity} config The module entity configuration containing the module address and entity ID\n * @returns {Hex} A hexadecimal string representation of the serialized module entity\n */\nexport function serializeModuleEntity(config: ModuleEntity): Hex {\n  return concatHex([config.moduleAddress, toHex(config.entityId, { size: 4 })]);\n}\n\n/**\n * Checks if an account is a ModularAccountV2.\n *\n * @param {SmartAccount} account - The account to check.\n * @returns {boolean} True if the account is a ModularAccountV2, false otherwise.\n */\nexport function isModularAccountV2(\n  account: SmartAccount,\n): account is ModularAccountV2Base {\n  return (\n    \"smartAccountType\" in account &&\n    account.smartAccountType === \"ModularAccountV2\"\n  );\n}\n"]}

package/dist/esm/ma-v2/utils/signature.d.ts

@@ -1,6 +1,5 @@
 import { type Address, type Hash, type Hex } from "viem";
 import { SignaturePrefix } from "../types.js";
-import { type WebAuthnP256 } from "ox";
 export type PackUOSignatureParams = {
     validationSignature: Hex;
 };
@@ -13,7 +12,7 @@ export type PackUOSignatureParams = {
 export declare const packUOSignature: ({ validationSignature, }: PackUOSignatureParams) => Hex;
 export type Pack1271SignatureParams = {
     entityId: number;
-    validationSignaturePrefix: SignaturePrefix | null;
+    validationSignaturePrefix: SignaturePrefix;
     validationSignature: Hex;
 };
 /**
@@ -51,13 +50,3 @@ export declare function toReplaySafeTypedData({ address, chainId, hash, salt, }:
     };
     primaryType: "ReplaySafeHash";
 };
-/**
- * Wraps a P256 signature with the webauthn metadata.
- *
- * @param {ToWebAuthnSignatureParams} params - The parameters for wrapping a P256 signature with the webauthn metadata.
- * @returns {object} The wrapped P256 signature.
- */
-export declare function toWebAuthnSignature({ webauthn, signature, }: {
-    webauthn: WebAuthnP256.SignMetadata;
-    signature: Hex;
-}): `0x${string}`;

package/dist/esm/ma-v2/utils/signature.js

@@ -1,6 +1,5 @@
-import { concatHex, encodeAbiParameters, toHex, } from "viem";
+import { concatHex, toHex } from "viem";
 import { SignaturePrefix } from "../types.js";
-import { Signature } from "ox";
 /**
  * Signature packing utility for user operations.
  *
@@ -49,36 +48,4 @@ export function toReplaySafeTypedData({ address, chainId, hash, salt, }) {
         primaryType: "ReplaySafeHash",
     };
 }
-/**
- * Wraps a P256 signature with the webauthn metadata.
- *
- * @param {ToWebAuthnSignatureParams} params - The parameters for wrapping a P256 signature with the webauthn metadata.
- * @returns {object} The wrapped P256 signature.
- */
-export function toWebAuthnSignature({ webauthn, signature, }) {
-    const { r, s } = Signature.fromHex(signature);
-    return encodeAbiParameters([
-        {
-            name: "params",
-            type: "tuple",
-            components: [
-                { name: "authenticatorData", type: "bytes" },
-                { name: "clientDataJSON", type: "string" },
-                { name: "challengeIndex", type: "uint256" },
-                { name: "typeIndex", type: "uint256" },
-                { name: "r", type: "uint256" },
-                { name: "s", type: "uint256" },
-            ],
-        },
-    ], [
-        {
-            authenticatorData: webauthn.authenticatorData,
-            clientDataJSON: webauthn.clientDataJSON,
-            challengeIndex: BigInt(webauthn.challengeIndex),
-            typeIndex: BigInt(webauthn.typeIndex),
-            r,
-            s,
-        },
-    ]);
-}
 //# sourceMappingURL=signature.js.map

package/dist/esm/ma-v2/utils/signature.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,KAAK,GAIN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,MAAM,IAAI,CAAC;AAOlD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;AAC9B,iEAAiE;AACjE,mBAAmB,GACG,EAAO,EAAE;IAC/B,OAAO,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AASF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,EACR,yBAAyB,EACzB,mBAAmB,GACK,EAAO,EAAE;IACjC,OAAO,SAAS,CAAC;QACf,MAAM;QACN,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5B,MAAM;QACN,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,EACpC,OAAO,EACP,OAAO,EACP,IAAI,EACJ,IAAI,GAML;IACC,OAAO;QACL,MAAM,EAAE;YACN,OAAO;YACP,iBAAiB,EAAE,OAAO;YAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1B;QACD,KAAK,EAAE;YACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SACpD;QACD,OAAO,EAAE;YACP,IAAI;SACL;QACD,WAAW,EAAE,gBAAyB;KACvC,CAAC;AACJ,CAAC;AACD;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,QAAQ,EACR,SAAS,GAIV;IACC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9C,OAAO,mBAAmB,CACxB;QACE;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC5C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC3C,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE;aAC/B;SACF;KACF,EACD;QACE;YACE,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;YAC7C,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;YAC/C,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;YACrC,CAAC;YACD,CAAC;SACF;KACF,CACF,CAAC;AACJ,CAAC","sourcesContent":["import {\n  concatHex,\n  encodeAbiParameters,\n  toHex,\n  type Address,\n  type Hash,\n  type Hex,\n} from \"viem\";\nimport { SignaturePrefix } from \"../types.js\";\nimport { Signature, type WebAuthnP256 } from \"ox\";\n\nexport type PackUOSignatureParams = {\n  // orderedHookData: HookData[];\n  validationSignature: Hex;\n};\n\n/**\n * Signature packing utility for user operations.\n *\n * @param {PackUOSignatureParams} params - The parameters for packing a user operation signature.\n * @returns {Hex} The packed user operation signature.\n */\nexport const packUOSignature = ({\n  // orderedHookData, TODO: integrate in next iteration of MAv2 sdk\n  validationSignature,\n}: PackUOSignatureParams): Hex => {\n  return concatHex([\"0xFF\", \"0x00\", validationSignature]);\n};\n\n// TODO(v4): direct call validation 1271\nexport type Pack1271SignatureParams = {\n  entityId: number;\n  validationSignaturePrefix: SignaturePrefix | null;\n  validationSignature: Hex;\n};\n\n/**\n * Signature packing utility for 1271 signatures.\n *\n * @param {Pack1271SignatureParams} params - The parameters for packing a 1271 signature.\n * @returns {Hex} The packed 1271 signature.\n */\nexport const pack1271Signature = ({\n  entityId,\n  validationSignaturePrefix,\n  validationSignature,\n}: Pack1271SignatureParams): Hex => {\n  return concatHex([\n    \"0x00\",\n    toHex(entityId, { size: 4 }),\n    \"0xFF\",\n    ...(validationSignaturePrefix ? [validationSignaturePrefix] : []),\n    validationSignature,\n  ]);\n};\n\n/**\n * Converts a hash to a replay safe typed data.\n *\n * @param {ToReplaySafeTypedDataParams} params - The parameters for converting a hash to a replay safe typed data.\n * @returns {object} The replay safe typed data.\n */\nexport function toReplaySafeTypedData({\n  address,\n  chainId,\n  hash,\n  salt,\n}: {\n  address: Address;\n  chainId: number;\n  hash: Hash;\n  salt?: Hex;\n}) {\n  return {\n    domain: {\n      chainId,\n      verifyingContract: address,\n      ...(salt ? { salt } : {}),\n    },\n    types: {\n      ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n    },\n    message: {\n      hash,\n    },\n    primaryType: \"ReplaySafeHash\" as const,\n  };\n}\n/**\n * Wraps a P256 signature with the webauthn metadata.\n *\n * @param {ToWebAuthnSignatureParams} params - The parameters for wrapping a P256 signature with the webauthn metadata.\n * @returns {object} The wrapped P256 signature.\n */\nexport function toWebAuthnSignature({\n  webauthn,\n  signature,\n}: {\n  webauthn: WebAuthnP256.SignMetadata;\n  signature: Hex;\n}) {\n  const { r, s } = Signature.fromHex(signature);\n  return encodeAbiParameters(\n    [\n      {\n        name: \"params\",\n        type: \"tuple\",\n        components: [\n          { name: \"authenticatorData\", type: \"bytes\" },\n          { name: \"clientDataJSON\", type: \"string\" },\n          { name: \"challengeIndex\", type: \"uint256\" },\n          { name: \"typeIndex\", type: \"uint256\" },\n          { name: \"r\", type: \"uint256\" },\n          { name: \"s\", type: \"uint256\" },\n        ],\n      },\n    ],\n    [\n      {\n        authenticatorData: webauthn.authenticatorData,\n        clientDataJSON: webauthn.clientDataJSON,\n        challengeIndex: BigInt(webauthn.challengeIndex),\n        typeIndex: BigInt(webauthn.typeIndex),\n        r,\n        s,\n      },\n    ],\n  );\n}\n"]}
+{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAqC,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAO9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;AAC9B,iEAAiE;AACjE,mBAAmB,GACG,EAAO,EAAE;IAC/B,OAAO,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AASF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,EACR,yBAAyB,EACzB,mBAAmB,GACK,EAAO,EAAE;IACjC,OAAO,SAAS,CAAC;QACf,MAAM;QACN,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5B,MAAM;QACN,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,EACpC,OAAO,EACP,OAAO,EACP,IAAI,EACJ,IAAI,GAML;IACC,OAAO;QACL,MAAM,EAAE;YACN,OAAO;YACP,iBAAiB,EAAE,OAAO;YAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1B;QACD,KAAK,EAAE;YACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SACpD;QACD,OAAO,EAAE;YACP,IAAI;SACL;QACD,WAAW,EAAE,gBAAyB;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { concatHex, toHex, type Address, type Hash, type Hex } from \"viem\";\nimport { SignaturePrefix } from \"../types.js\";\n\nexport type PackUOSignatureParams = {\n  // orderedHookData: HookData[];\n  validationSignature: Hex;\n};\n\n/**\n * Signature packing utility for user operations.\n *\n * @param {PackUOSignatureParams} params - The parameters for packing a user operation signature.\n * @returns {Hex} The packed user operation signature.\n */\nexport const packUOSignature = ({\n  // orderedHookData, TODO: integrate in next iteration of MAv2 sdk\n  validationSignature,\n}: PackUOSignatureParams): Hex => {\n  return concatHex([\"0xFF\", \"0x00\", validationSignature]);\n};\n\n// TODO(v4): direct call validation 1271\nexport type Pack1271SignatureParams = {\n  entityId: number;\n  validationSignaturePrefix: SignaturePrefix;\n  validationSignature: Hex;\n};\n\n/**\n * Signature packing utility for 1271 signatures.\n *\n * @param {Pack1271SignatureParams} params - The parameters for packing a 1271 signature.\n * @returns {Hex} The packed 1271 signature.\n */\nexport const pack1271Signature = ({\n  entityId,\n  validationSignaturePrefix,\n  validationSignature,\n}: Pack1271SignatureParams): Hex => {\n  return concatHex([\n    \"0x00\",\n    toHex(entityId, { size: 4 }),\n    \"0xFF\",\n    ...(validationSignaturePrefix ? [validationSignaturePrefix] : []),\n    validationSignature,\n  ]);\n};\n\n/**\n * Converts a hash to a replay safe typed data.\n *\n * @param {ToReplaySafeTypedDataParams} params - The parameters for converting a hash to a replay safe typed data.\n * @returns {object} The replay safe typed data.\n */\nexport function toReplaySafeTypedData({\n  address,\n  chainId,\n  hash,\n  salt,\n}: {\n  address: Address;\n  chainId: number;\n  hash: Hash;\n  salt?: Hex;\n}) {\n  return {\n    domain: {\n      chainId,\n      verifyingContract: address,\n      ...(salt ? { salt } : {}),\n    },\n    types: {\n      ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n    },\n    message: {\n      hash,\n    },\n    primaryType: \"ReplaySafeHash\" as const,\n  };\n}\n"]}

package/dist/esm/types.d.ts

@@ -1,10 +1,17 @@
 import type { Abi, Address, Hex, IsUndefined, SignableMessage, TypedDataDefinition } from "viem";
-import type { EntryPointVersion, SmartAccount } from "viem/account-abstraction";
+import type { EntryPointVersion, SmartAccount, SmartAccountImplementation } from "viem/account-abstraction";
 export type GetAccountParameter<TAccount extends SmartAccount | undefined = SmartAccount | undefined, TAccountOverride extends SmartAccount = SmartAccount> = IsUndefined<TAccount> extends true ? {
     account: TAccountOverride;
 } : {
     account?: TAccountOverride;
 };
+/**
+ * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.
+ * This is useful for account implementations that always provide the `decodeCalls` functionality.
+ */
+export type SmartAccountWithDecodeCalls<TImplementation extends SmartAccountImplementation> = SmartAccount<TImplementation> & {
+    decodeCalls: NonNullable<SmartAccount<TImplementation>["decodeCalls"]>;
+};
 export type SignatureRequest = {
     type: "personal_sign";
     data: SignableMessage;

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Abi,\n  Address,\n  Hex,\n  IsUndefined,\n  SignableMessage,\n  TypedDataDefinition,\n} from \"viem\";\nimport type { EntryPointVersion, SmartAccount } from \"viem/account-abstraction\";\n\nexport type GetAccountParameter<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n  TAccountOverride extends SmartAccount = SmartAccount,\n> =\n  IsUndefined<TAccount> extends true\n    ? { account: TAccountOverride }\n    : { account?: TAccountOverride };\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 StaticSmartAccountImplementation<\n  eip7702 extends boolean = boolean,\n  entryPointVersion extends EntryPointVersion = EntryPointVersion,\n  factoryArgs extends {} = {},\n  entryPointAbi extends Abi | readonly unknown[] = Abi,\n  accountAbi extends Abi | readonly unknown[] = Abi,\n  factoryAbi extends Abi | readonly unknown[] = Abi,\n> = {\n  readonly entryPoint: {\n    readonly abi: entryPointAbi;\n    readonly address: Address;\n    readonly version: entryPointVersion;\n  };\n  readonly accountAbi: accountAbi;\n} & (eip7702 extends false\n  ? {\n      // Smart contract account specific fields\n      readonly accountImplementation: Address;\n      readonly getFactoryData: (factoryArgs: factoryArgs) => Hex;\n      readonly predictAccountAddress: (factoryArgs: factoryArgs) => Address;\n      readonly factoryAddress: Address;\n      readonly factoryAbi: factoryAbi;\n    }\n  : {}) &\n  (eip7702 extends true\n    ? {\n        // EIP-7702 account specific fields\n        readonly delegationAddress: Address;\n      }\n    : {});\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Abi,\n  Address,\n  Hex,\n  IsUndefined,\n  SignableMessage,\n  TypedDataDefinition,\n} from \"viem\";\nimport type {\n  EntryPointVersion,\n  SmartAccount,\n  SmartAccountImplementation,\n} from \"viem/account-abstraction\";\n\nexport type GetAccountParameter<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n  TAccountOverride extends SmartAccount = SmartAccount,\n> =\n  IsUndefined<TAccount> extends true\n    ? { account: TAccountOverride }\n    : { account?: TAccountOverride };\n\n/**\n * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.\n * This is useful for account implementations that always provide the `decodeCalls` functionality.\n */\nexport type SmartAccountWithDecodeCalls<\n  TImplementation extends SmartAccountImplementation,\n> = SmartAccount<TImplementation> & {\n  decodeCalls: NonNullable<SmartAccount<TImplementation>[\"decodeCalls\"]>;\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 StaticSmartAccountImplementation<\n  eip7702 extends boolean = boolean,\n  entryPointVersion extends EntryPointVersion = EntryPointVersion,\n  factoryArgs extends {} = {},\n  entryPointAbi extends Abi | readonly unknown[] = Abi,\n  accountAbi extends Abi | readonly unknown[] = Abi,\n  factoryAbi extends Abi | readonly unknown[] = Abi,\n> = {\n  readonly entryPoint: {\n    readonly abi: entryPointAbi;\n    readonly address: Address;\n    readonly version: entryPointVersion;\n  };\n  readonly accountAbi: accountAbi;\n} & (eip7702 extends false\n  ? {\n      // Smart contract account specific fields\n      readonly accountImplementation: Address;\n      readonly getFactoryData: (factoryArgs: factoryArgs) => Hex;\n      readonly predictAccountAddress: (factoryArgs: factoryArgs) => Address;\n      readonly factoryAddress: Address;\n      readonly factoryAbi: factoryAbi;\n    }\n  : {}) &\n  (eip7702 extends true\n    ? {\n        // EIP-7702 account specific fields\n        readonly delegationAddress: Address;\n      }\n    : {});\n"]}

package/dist/esm/utils.d.ts

@@ -1,6 +1,36 @@
-import { type Client, type Hex } from "viem";
-import type { UserOperation } from "viem/account-abstraction";
+import { type Address, type Client, type Hex } from "viem";
+import { type EntryPointVersion, type UserOperation } from "viem/account-abstraction";
+/**
+ * Checks if the current chain supports RIP-7212 (precompiled contract for secp256r1 curve operations).
+ * This is used to determine if the chain has native support for P256 signature verification,
+ * which is commonly used in WebAuthn/passkey implementations.
+ *
+ * @param {Client} client - The viem client to use for the check
+ * @returns {Promise<boolean>} True if the chain supports RIP-7212, false otherwise
+ */
 export declare const chainHas7212: (client: Client) => Promise<boolean>;
 export declare function packAccountGasLimits(data: Pick<UserOperation, "verificationGasLimit" | "callGasLimit"> | Pick<UserOperation, "maxPriorityFeePerGas" | "maxFeePerGas">): Hex;
 export declare function packPaymasterData({ paymaster, paymasterVerificationGasLimit, paymasterPostOpGasLimit, paymasterData, }: Pick<UserOperation, "paymaster" | "paymasterVerificationGasLimit" | "paymasterPostOpGasLimit" | "paymasterData">): Hex;
 export declare const bigIntMultiply: (base: number | bigint | Hex, multiplier: number, roundingMode?: "ROUND" | "FLOOR" | "CEIL") => bigint;
+/**
+ * Derives the counterfactual smart account address from init code by calling
+ * the entry point's `getSenderAddress` function.
+ *
+ * @param {Client} client - The viem client to use for the call.
+ * @param {object} params - The parameters for deriving the sender address.
+ * @param {Hex} params.factory - The factory address for the account.
+ * @param {Hex} params.factoryData - The factory data for the account.
+ * @param {object} params.entryPoint - The entry point contract details.
+ * @param {EntryPointVersion} [params.entryPoint.version] - The entry point version.
+ * @param {Address} params.entryPoint.address - The entry point contract address.
+ * @returns {Promise<Address>} The counterfactual address of the smart account.
+ */
+export declare const getSenderFromFactoryData: (client: Client, params: {
+    factory: Hex;
+    factoryData: Hex;
+    entryPoint: {
+        version: EntryPointVersion;
+        address: Address;
+    };
+}) => Promise<Address>;
+export declare function is7702Delegated(delegation: Address, code: Hex | undefined): boolean;

package/dist/esm/utils.js

@@ -1,8 +1,17 @@
-import { concat, toHex } from "viem";
+import { concatHex, RawContractError, BaseError as ViemBaseError, toHex, } from "viem";
+import { decodeErrorResult, encodeFunctionData, getAction, getAddress, isHex, } from "viem/utils";
+import { entryPoint07Abi, } from "viem/account-abstraction";
+import { assertNever, BaseError } from "@alchemy/common";
 import { call } from "viem/actions";
-import { getAction } from "viem/utils";
-import { BaseError } from "@alchemy/common";
 const RIP_7212_CHECK_BYTECODE = "0x60806040526040517f532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25815260056020820152600160408201527f4a03ef9f92eb268cafa601072489a56380fa0dc43171d7712813b3a19a1eb5e560608201527f3e213e28a608ce9a2f4a17fd830c6654018a79b3e0263d91a8ba90622df6f2f0608082015260208160a0836101005afa503d5f823e3d81f3fe";
+/**
+ * Checks if the current chain supports RIP-7212 (precompiled contract for secp256r1 curve operations).
+ * This is used to determine if the chain has native support for P256 signature verification,
+ * which is commonly used in WebAuthn/passkey implementations.
+ *
+ * @param {Client} client - The viem client to use for the check
+ * @returns {Promise<boolean>} True if the chain supports RIP-7212, false otherwise
+ */
 export const chainHas7212 = async (client) => {
     const callAction = getAction(client, call, "call");
     const { data } = await callAction({
@@ -11,7 +20,7 @@ export const chainHas7212 = async (client) => {
     return data ? BigInt(data) === 1n : false;
 };
 export function packAccountGasLimits(data) {
-    return concat(Object.values(data).map((v) => toHex(v, { size: 16 })));
+    return concatHex(Object.values(data).map((v) => toHex(v, { size: 16 })));
 }
 export function packPaymasterData({ paymaster, paymasterVerificationGasLimit, paymasterPostOpGasLimit, paymasterData, }) {
     if (!paymaster ||
@@ -20,7 +29,7 @@ export function packPaymasterData({ paymaster, paymasterVerificationGasLimit, pa
         !paymasterData) {
         return "0x";
     }
-    return concat([
+    return concatHex([
         paymaster,
         toHex(paymasterVerificationGasLimit, { size: 16 }),
         toHex(paymasterPostOpGasLimit, { size: 16 }),
@@ -49,4 +58,65 @@ export const bigIntMultiply = (base, multiplier, roundingMode = "CEIL") => {
             return product >= 0n ? product / scale : (product - scale + 1n) / scale;
     }
 };
+/**
+ * Derives the counterfactual smart account address from init code by calling
+ * the entry point's `getSenderAddress` function.
+ *
+ * @param {Client} client - The viem client to use for the call.
+ * @param {object} params - The parameters for deriving the sender address.
+ * @param {Hex} params.factory - The factory address for the account.
+ * @param {Hex} params.factoryData - The factory data for the account.
+ * @param {object} params.entryPoint - The entry point contract details.
+ * @param {EntryPointVersion} [params.entryPoint.version] - The entry point version.
+ * @param {Address} params.entryPoint.address - The entry point contract address.
+ * @returns {Promise<Address>} The counterfactual address of the smart account.
+ */
+export const getSenderFromFactoryData = async (client, params) => {
+    const action = getAction(client, call, "call");
+    const data = encodeFunctionData({
+        abi: entryPoint07Abi, // getSenderAddress is the same for EP v0.6, EP v0.7, and v0.8
+        functionName: "getSenderAddress",
+        args: [concatHex([params.factory, params.factoryData])],
+    });
+    try {
+        // getSenderAddress is expected to revert with the computed sender
+        await action({ to: params.entryPoint.address, data });
+    }
+    catch (err) {
+        const revertData = getRevertErrorData(err);
+        if (!isHex(revertData)) {
+            throw new BaseError("Failed to get sender address from init code: no revert data found.");
+        }
+        switch (params.entryPoint.version) {
+            case "0.9":
+            case "0.8":
+            case "0.7": {
+                const decoded = decodeErrorResult({
+                    abi: entryPoint07Abi, // same error signature for EP v0.7 and v0.8
+                    data: revertData,
+                });
+                if (decoded.errorName !== "SenderAddressResult") {
+                    throw new BaseError(`Unexpected error from getSenderAddress: ${decoded.errorName}`);
+                }
+                return decoded.args[0];
+            }
+            case "0.6":
+                // EP v0.6: last 20 bytes is the address.
+                return getAddress(`0x${revertData.slice(-40)}`);
+            default:
+                return assertNever(params.entryPoint.version, "Unexpected entry point version");
+        }
+    }
+    throw new BaseError("Expected getSenderAddress to revert.");
+};
+// Borrowed from Viem: https://github.com/wevm/viem/blob/3ff6c2f19350dcbe49017e2b3d5a2cf761ab9070/src/actions/public/call.ts#L473
+function getRevertErrorData(err) {
+    if (!(err instanceof ViemBaseError))
+        return undefined;
+    const error = err.walk();
+    return typeof error?.data === "object" ? error.data?.data : error.data;
+}
+export function is7702Delegated(delegation, code) {
+    return (code?.toLowerCase() === concatHex(["0xef0100", delegation]).toLowerCase());
+}
 //# sourceMappingURL=utils.js.map

package/dist/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Client, concat, type Hex, toHex } from \"viem\";\nimport { call } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport type { UserOperation } from \"viem/account-abstraction\";\nimport { BaseError } from \"@alchemy/common\";\n\nconst RIP_7212_CHECK_BYTECODE =\n  \"0x60806040526040517f532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25815260056020820152600160408201527f4a03ef9f92eb268cafa601072489a56380fa0dc43171d7712813b3a19a1eb5e560608201527f3e213e28a608ce9a2f4a17fd830c6654018a79b3e0263d91a8ba90622df6f2f0608082015260208160a0836101005afa503d5f823e3d81f3fe\";\n\nexport const chainHas7212 = async (client: Client): Promise<boolean> => {\n  const callAction = getAction(client, call, \"call\");\n\n  const { data } = await callAction({\n    data: RIP_7212_CHECK_BYTECODE,\n  });\n\n  return data ? BigInt(data) === 1n : false;\n};\n\nexport function packAccountGasLimits(\n  data:\n    | Pick<UserOperation, \"verificationGasLimit\" | \"callGasLimit\">\n    | Pick<UserOperation, \"maxPriorityFeePerGas\" | \"maxFeePerGas\">,\n): Hex {\n  return concat(Object.values(data).map((v) => toHex(v, { size: 16 })));\n}\n\nexport function packPaymasterData({\n  paymaster,\n  paymasterVerificationGasLimit,\n  paymasterPostOpGasLimit,\n  paymasterData,\n}: Pick<\n  UserOperation,\n  | \"paymaster\"\n  | \"paymasterVerificationGasLimit\"\n  | \"paymasterPostOpGasLimit\"\n  | \"paymasterData\"\n>): Hex {\n  if (\n    !paymaster ||\n    !paymasterVerificationGasLimit ||\n    !paymasterPostOpGasLimit ||\n    !paymasterData\n  ) {\n    return \"0x\";\n  }\n  return concat([\n    paymaster,\n    toHex(paymasterVerificationGasLimit, { size: 16 }),\n    toHex(paymasterPostOpGasLimit, { size: 16 }),\n    paymasterData,\n  ]);\n}\n\nexport const bigIntMultiply = (\n  base: number | bigint | Hex,\n  multiplier: number,\n  roundingMode: \"ROUND\" | \"FLOOR\" | \"CEIL\" = \"CEIL\",\n) => {\n  if (Number.isInteger(multiplier)) {\n    return BigInt(base) * BigInt(multiplier);\n  }\n\n  const multiplierStr = multiplier.toString();\n  const decimalPlaces = multiplierStr.split(\".\")[1]?.length ?? 0;\n\n  if (decimalPlaces > 4) {\n    throw new BaseError(\"bigIntMultiply max precision is 4 decimal places.\");\n  }\n\n  const scale = BigInt(10 ** decimalPlaces);\n  const scaledMultiplier = BigInt(multiplierStr.replace(\".\", \"\"));\n  const product = BigInt(base) * scaledMultiplier;\n\n  switch (roundingMode) {\n    case \"ROUND\":\n      return (product + scale / 2n) / scale;\n    case \"CEIL\":\n      return product >= 0n ? (product + scale - 1n) / scale : product / scale;\n    case \"FLOOR\":\n    default:\n      return product >= 0n ? product / scale : (product - scale + 1n) / scale;\n  }\n};\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Client,\n  concatHex,\n  type Hex,\n  RawContractError,\n  BaseError as ViemBaseError,\n  toHex,\n} from \"viem\";\nimport {\n  decodeErrorResult,\n  encodeFunctionData,\n  getAction,\n  getAddress,\n  isHex,\n} from \"viem/utils\";\nimport {\n  entryPoint07Abi,\n  type EntryPointVersion,\n  type UserOperation,\n} from \"viem/account-abstraction\";\nimport { assertNever, BaseError } from \"@alchemy/common\";\nimport { call } from \"viem/actions\";\n\nconst RIP_7212_CHECK_BYTECODE =\n  \"0x60806040526040517f532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25815260056020820152600160408201527f4a03ef9f92eb268cafa601072489a56380fa0dc43171d7712813b3a19a1eb5e560608201527f3e213e28a608ce9a2f4a17fd830c6654018a79b3e0263d91a8ba90622df6f2f0608082015260208160a0836101005afa503d5f823e3d81f3fe\";\n\n/**\n * Checks if the current chain supports RIP-7212 (precompiled contract for secp256r1 curve operations).\n * This is used to determine if the chain has native support for P256 signature verification,\n * which is commonly used in WebAuthn/passkey implementations.\n *\n * @param {Client} client - The viem client to use for the check\n * @returns {Promise<boolean>} True if the chain supports RIP-7212, false otherwise\n */\nexport const chainHas7212 = async (client: Client): Promise<boolean> => {\n  const callAction = getAction(client, call, \"call\");\n\n  const { data } = await callAction({\n    data: RIP_7212_CHECK_BYTECODE,\n  });\n\n  return data ? BigInt(data) === 1n : false;\n};\n\nexport function packAccountGasLimits(\n  data:\n    | Pick<UserOperation, \"verificationGasLimit\" | \"callGasLimit\">\n    | Pick<UserOperation, \"maxPriorityFeePerGas\" | \"maxFeePerGas\">,\n): Hex {\n  return concatHex(Object.values(data).map((v) => toHex(v, { size: 16 })));\n}\n\nexport function packPaymasterData({\n  paymaster,\n  paymasterVerificationGasLimit,\n  paymasterPostOpGasLimit,\n  paymasterData,\n}: Pick<\n  UserOperation,\n  | \"paymaster\"\n  | \"paymasterVerificationGasLimit\"\n  | \"paymasterPostOpGasLimit\"\n  | \"paymasterData\"\n>): Hex {\n  if (\n    !paymaster ||\n    !paymasterVerificationGasLimit ||\n    !paymasterPostOpGasLimit ||\n    !paymasterData\n  ) {\n    return \"0x\";\n  }\n  return concatHex([\n    paymaster,\n    toHex(paymasterVerificationGasLimit, { size: 16 }),\n    toHex(paymasterPostOpGasLimit, { size: 16 }),\n    paymasterData,\n  ]);\n}\n\nexport const bigIntMultiply = (\n  base: number | bigint | Hex,\n  multiplier: number,\n  roundingMode: \"ROUND\" | \"FLOOR\" | \"CEIL\" = \"CEIL\",\n) => {\n  if (Number.isInteger(multiplier)) {\n    return BigInt(base) * BigInt(multiplier);\n  }\n\n  const multiplierStr = multiplier.toString();\n  const decimalPlaces = multiplierStr.split(\".\")[1]?.length ?? 0;\n\n  if (decimalPlaces > 4) {\n    throw new BaseError(\"bigIntMultiply max precision is 4 decimal places.\");\n  }\n\n  const scale = BigInt(10 ** decimalPlaces);\n  const scaledMultiplier = BigInt(multiplierStr.replace(\".\", \"\"));\n  const product = BigInt(base) * scaledMultiplier;\n\n  switch (roundingMode) {\n    case \"ROUND\":\n      return (product + scale / 2n) / scale;\n    case \"CEIL\":\n      return product >= 0n ? (product + scale - 1n) / scale : product / scale;\n    case \"FLOOR\":\n    default:\n      return product >= 0n ? product / scale : (product - scale + 1n) / scale;\n  }\n};\n\n/**\n * Derives the counterfactual smart account address from init code by calling\n * the entry point's `getSenderAddress` function.\n *\n * @param {Client} client - The viem client to use for the call.\n * @param {object} params - The parameters for deriving the sender address.\n * @param {Hex} params.factory - The factory address for the account.\n * @param {Hex} params.factoryData - The factory data for the account.\n * @param {object} params.entryPoint - The entry point contract details.\n * @param {EntryPointVersion} [params.entryPoint.version] - The entry point version.\n * @param {Address} params.entryPoint.address - The entry point contract address.\n * @returns {Promise<Address>} The counterfactual address of the smart account.\n */\nexport const getSenderFromFactoryData = async (\n  client: Client,\n  params: {\n    factory: Hex;\n    factoryData: Hex;\n    entryPoint: {\n      version: EntryPointVersion;\n      address: Address;\n    };\n  },\n): Promise<Address> => {\n  const action = getAction(client, call, \"call\");\n\n  const data = encodeFunctionData({\n    abi: entryPoint07Abi, // getSenderAddress is the same for EP v0.6, EP v0.7, and v0.8\n    functionName: \"getSenderAddress\",\n    args: [concatHex([params.factory, params.factoryData])],\n  });\n\n  try {\n    // getSenderAddress is expected to revert with the computed sender\n    await action({ to: params.entryPoint.address, data });\n  } catch (err) {\n    const revertData = getRevertErrorData(err);\n    if (!isHex(revertData)) {\n      throw new BaseError(\n        \"Failed to get sender address from init code: no revert data found.\",\n      );\n    }\n\n    switch (params.entryPoint.version) {\n      case \"0.9\":\n      case \"0.8\":\n      case \"0.7\": {\n        const decoded = decodeErrorResult({\n          abi: entryPoint07Abi, // same error signature for EP v0.7 and v0.8\n          data: revertData,\n        });\n        if (decoded.errorName !== \"SenderAddressResult\") {\n          throw new BaseError(\n            `Unexpected error from getSenderAddress: ${decoded.errorName}`,\n          );\n        }\n        return decoded.args[0];\n      }\n      case \"0.6\":\n        // EP v0.6: last 20 bytes is the address.\n        return getAddress(`0x${revertData.slice(-40)}`);\n      default:\n        return assertNever(\n          params.entryPoint.version,\n          \"Unexpected entry point version\",\n        );\n    }\n  }\n  throw new BaseError(\"Expected getSenderAddress to revert.\");\n};\n\n// Borrowed from Viem: https://github.com/wevm/viem/blob/3ff6c2f19350dcbe49017e2b3d5a2cf761ab9070/src/actions/public/call.ts#L473\nfunction getRevertErrorData(err: unknown) {\n  if (!(err instanceof ViemBaseError)) return undefined;\n  const error = err.walk() as RawContractError;\n  return typeof error?.data === \"object\" ? error.data?.data : error.data;\n}\n\nexport function is7702Delegated(\n  delegation: Address,\n  code: Hex | undefined,\n): boolean {\n  return (\n    code?.toLowerCase() === concatHex([\"0xef0100\", delegation]).toLowerCase()\n  );\n}\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.0.0";
+export declare const VERSION = "0.0.0-alpha.20";

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 = "0.0.0";
+export const VERSION = "0.0.0-alpha.20";
 //# 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,OAAO,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"0.0.0\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"0.0.0-alpha.20\";\n"]}

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
+export type * from "./types.js";
+export { chainHas7212 } from "./utils.js";
 export type * from "./light-account/accounts/account.js";
 export { toLightAccount } from "./light-account/accounts/account.js";
 export type * from "./light-account/accounts/multi-owner-account.js";
@@ -30,14 +32,13 @@ export type * from "./ma-v2/decorators/deferralActions.js";
 export { deferralActions } from "./ma-v2/decorators/deferralActions.js";
 export type * from "./ma-v2/decorators/installValidation.js";
 export { installValidationActions } from "./ma-v2/decorators/installValidation.js";
-export { semiModularAccountV2StaticImpl, semiModularAccount7702StaticImpl, webAuthnModularAccountV2StaticImpl, } from "./ma-v2/mav2StaticImpl.js";
+export { semiModularAccountV2StaticImpl, semiModularAccount7702StaticImpl, } from "./ma-v2/mav2StaticImpl.js";
 export type * from "./ma-v2/mav2StaticImpl.js";
 export { AllowlistModule } from "./ma-v2/modules/allowlist-module/module.js";
 export { NativeTokenLimitModule } from "./ma-v2/modules/native-token-limit-module/module.js";
 export { PaymasterGuardModule } from "./ma-v2/modules/paymaster-guard-module/module.js";
 export { SingleSignerValidationModule } from "./ma-v2/modules/single-signer-validation/module.js";
 export { TimeRangeModule } from "./ma-v2/modules/time-range-module/module.js";
-export { WebAuthnValidationModule } from "./ma-v2/modules/webauthn-validation/module.js";
 export type * from "./ma-v2/permissionBuilder.js";
 export { PermissionBuilder, PermissionType, } from "./ma-v2/permissionBuilder.js";
 export type * from "./ma-v2/predictAddress.js";
@@ -50,7 +51,7 @@ export { parseDeferredAction, buildDeferredActionDigest, } from "./ma-v2/utils/d
 export type * from "./ma-v2/utils/hooks.js";
 export { serializeValidationConfig, serializeHookConfig, } from "./ma-v2/utils/hooks.js";
 export type * from "./ma-v2/utils/signature.js";
-export { packUOSignature, pack1271Signature, toReplaySafeTypedData, toWebAuthnSignature, } from "./ma-v2/utils/signature.js";
+export { packUOSignature, pack1271Signature, toReplaySafeTypedData, } from "./ma-v2/utils/signature.js";
 export { EntityIdOverrideError } from "./errors/EntityIdOverrideError.js";
 export { InvalidDeferredActionNonceError } from "./errors/InvalidDeferredActionNonceError.js";
 export { InvalidEntityIdError } from "./errors/InvalidEntityIdError.js";

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

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

package/dist/types/light-account/accounts/account.d.ts

@@ -8,16 +8,21 @@ export type LightAccount<TLightAccountVersion extends LightAccountVersion<"Light
 export type ToLightAccountParams<TLightAccountVersion extends LightAccountVersion<"LightAccount"> = LightAccountVersion<"LightAccount">> = {
     client: Client<Transport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     owner: JsonRpcAccount | LocalAccount;
-    salt?: bigint;
     accountAddress?: Address;
-    factoryAddress?: Address;
+    factory?: Address;
     version?: TLightAccountVersion;
-};
+} & ({
+    salt?: bigint;
+    factoryData?: never;
+} | {
+    salt?: never;
+    factoryData?: Hex;
+});
 /**
  * Creates a light account.
  *
  * @param {ToLightAccountParams} param0 - The parameters for creating a light account.
  * @returns {Promise<LightAccount<TSigner, TLightAccountVersion>>} A light account.
  */
-export declare function toLightAccount<TLightAccountVersion extends LightAccountVersion<"LightAccount"> = LightAccountVersion<"LightAccount">>({ client, owner, salt: salt_, accountAddress: accountAddress_, version, factoryAddress, }: ToLightAccountParams<TLightAccountVersion>): Promise<LightAccount<TLightAccountVersion>>;
+export declare function toLightAccount<TLightAccountVersion extends LightAccountVersion<"LightAccount"> = LightAccountVersion<"LightAccount">>({ client, owner, salt: salt_, accountAddress: accountAddress_, version, factory, factoryData: factoryData_, }: ToLightAccountParams<TLightAccountVersion>): Promise<LightAccount<TLightAccountVersion>>;
 //# sourceMappingURL=account.d.ts.map