@account-kit/wallet-client 0.1.0-alpha.7 → 0.1.0-alpha.8

package/dist/esm/client/actions/prepareCalls.d.ts

@@ -26,7 +26,7 @@ export type PrepareCallsResult = IsomorphicPrepareCallsResult;
  * the user operation data and signature request
  *
  * @example
- * // Prepare a sponosored user operation call
+ * // Prepare a sponsored user operation call
  * const result = await client.prepareCalls({
  *   calls: [{
  *     to: "0x1234...",

package/dist/esm/client/actions/prepareCalls.js

@@ -14,7 +14,7 @@ import { toHex } from "viem";
  * the user operation data and signature request
  *
  * @example
- * // Prepare a sponosored user operation call
+ * // Prepare a sponsored user operation call
  * const result = await client.prepareCalls({
  *   calls: [{
  *     to: "0x1234...",

package/dist/esm/client/actions/prepareCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/client/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAmB7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAGhC,MAA4B,EAC5B,MAAoC;IAEpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,gBAAgB,EAAE,CAAC;QAC9D,MAAM,CAAC,YAAY,GAAG;YACpB,GAAG,MAAM,CAAC,YAAY;YACtB,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG;QACd,GAAG,MAAM;QACT,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,IAAI;KACL,CAAC;IAEF,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC;QAC1B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,CAAC,OAAO,CAAC;KAClB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { AccountNotFoundError } from \"@aa-sdk/core\";\nimport { toHex, type Address, type IsUndefined } from \"viem\";\nimport type {\n  PrepareCallsParams as IsomorphicPrepareCallsParams,\n  PrepareCallsResult as IsomorphicPrepareCallsResult,\n} from \"../../isomorphic/actions/prepareCalls.ts\";\nimport type { InnerWalletApiClient } from \"../../types.ts\";\n\nexport type GetAccountParam<TAccount> =\n  IsUndefined<TAccount> extends true\n    ? { account: Address }\n    : { account?: Address };\n\nexport type PrepareCallsParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Omit<IsomorphicPrepareCallsParams, \"from\" | \"chainId\"> &\n  (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never });\n\nexport type PrepareCallsResult = IsomorphicPrepareCallsResult;\n\n/**\n * Prepares a set of contract calls for execution by building a user operation.\n * Returns the built user operation and a signature request that needs to be signed\n * before submitting to sendPreparedCalls.\n *\n * @param {InnerWalletApiClient<TAccount>} client - The wallet API client to use for the request\n * @param {PrepareCallsParams<TAccount>} params - Parameters for preparing calls\n * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute\n * @param {Address} [params.from] - The address to execute the calls from (required if the client wasn't initialized with an account)\n * @param {object} [params.capabilities] - Optional capabilities to include with the request\n * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing\n * the user operation data and signature request\n *\n * @example\n * // Prepare a sponosored user operation call\n * const result = await client.prepareCalls({\n *   calls: [{\n *     to: \"0x1234...\",\n *     data: \"0xabcdef...\",\n *     value: \"0x0\"\n *   }],\n *   capabilities: {\n *     paymasterService: { policyId: \"your-policy-id\" }\n *   }\n * });\n */\nexport async function prepareCalls<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: PrepareCallsParams<TAccount>,\n): Promise<PrepareCallsResult> {\n  const from = params.from ?? client.account?.address;\n\n  if (!from) {\n    throw new AccountNotFoundError();\n  }\n\n  if (client.policyId && !params.capabilities?.paymasterService) {\n    params.capabilities = {\n      ...params.capabilities,\n      paymasterService: { policyId: client.policyId },\n    };\n  }\n\n  const params_ = {\n    ...params,\n    chainId: toHex(client.chain.id),\n    from,\n  };\n\n  return await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [params_],\n  });\n}\n"]}
+{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/client/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAmB7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAGhC,MAA4B,EAC5B,MAAoC;IAEpC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,gBAAgB,EAAE,CAAC;QAC9D,MAAM,CAAC,YAAY,GAAG;YACpB,GAAG,MAAM,CAAC,YAAY;YACtB,gBAAgB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG;QACd,GAAG,MAAM;QACT,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,IAAI;KACL,CAAC;IAEF,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC;QAC1B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,CAAC,OAAO,CAAC;KAClB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { AccountNotFoundError } from \"@aa-sdk/core\";\nimport { toHex, type Address, type IsUndefined } from \"viem\";\nimport type {\n  PrepareCallsParams as IsomorphicPrepareCallsParams,\n  PrepareCallsResult as IsomorphicPrepareCallsResult,\n} from \"../../isomorphic/actions/prepareCalls.ts\";\nimport type { InnerWalletApiClient } from \"../../types.ts\";\n\nexport type GetAccountParam<TAccount> =\n  IsUndefined<TAccount> extends true\n    ? { account: Address }\n    : { account?: Address };\n\nexport type PrepareCallsParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Omit<IsomorphicPrepareCallsParams, \"from\" | \"chainId\"> &\n  (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never });\n\nexport type PrepareCallsResult = IsomorphicPrepareCallsResult;\n\n/**\n * Prepares a set of contract calls for execution by building a user operation.\n * Returns the built user operation and a signature request that needs to be signed\n * before submitting to sendPreparedCalls.\n *\n * @param {InnerWalletApiClient<TAccount>} client - The wallet API client to use for the request\n * @param {PrepareCallsParams<TAccount>} params - Parameters for preparing calls\n * @param {Array<{to: Address, data?: Hex, value?: Hex}>} params.calls - Array of contract calls to execute\n * @param {Address} [params.from] - The address to execute the calls from (required if the client wasn't initialized with an account)\n * @param {object} [params.capabilities] - Optional capabilities to include with the request\n * @returns {Promise<PrepareCallsResult>} A Promise that resolves to the prepared calls result containing\n * the user operation data and signature request\n *\n * @example\n * // Prepare a sponsored user operation call\n * const result = await client.prepareCalls({\n *   calls: [{\n *     to: \"0x1234...\",\n *     data: \"0xabcdef...\",\n *     value: \"0x0\"\n *   }],\n *   capabilities: {\n *     paymasterService: { policyId: \"your-policy-id\" }\n *   }\n * });\n */\nexport async function prepareCalls<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  params: PrepareCallsParams<TAccount>,\n): Promise<PrepareCallsResult> {\n  const from = params.from ?? client.account?.address;\n\n  if (!from) {\n    throw new AccountNotFoundError();\n  }\n\n  if (client.policyId && !params.capabilities?.paymasterService) {\n    params.capabilities = {\n      ...params.capabilities,\n      paymasterService: { policyId: client.policyId },\n    };\n  }\n\n  const params_ = {\n    ...params,\n    chainId: toHex(client.chain.id),\n    from,\n  };\n\n  return await client.request({\n    method: \"wallet_prepareCalls\",\n    params: [params_],\n  });\n}\n"]}

package/dist/esm/client/actions/signSignatureRequest.d.ts

@@ -3,9 +3,10 @@ import type { Static } from "@sinclair/typebox";
 import { type Hex } from "viem";
 import { TypeAuthorizationSignatureRequest, TypePersonalSignSignatureRequest, TypeTypedDataSignatureRequest } from "../../schemas.js";
 import { TypeEip7702UnsignedAuth } from "../../schemas.js";
-export type SignSignatureRequestParams = Static<typeof TypePersonalSignSignatureRequest> | Static<typeof TypeTypedDataSignatureRequest> | (Static<typeof TypeAuthorizationSignatureRequest> & {
+import type { WithoutRawPayload } from "../../types.ts";
+export type SignSignatureRequestParams = WithoutRawPayload<Static<typeof TypePersonalSignSignatureRequest> | Static<typeof TypeTypedDataSignatureRequest> | (Static<typeof TypeAuthorizationSignatureRequest> & {
     data: Static<typeof TypeEip7702UnsignedAuth>;
-});
+})>;
 export type SignSignatureRequestResult = {
     type: "secp256k1";
     data: Hex;

package/dist/esm/client/actions/signSignatureRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"signSignatureRequest.js","sourceRoot":"","sources":["../../../../src/client/actions/signSignatureRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,WAAW,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,iCAAiC,EACjC,gCAAgC,EAChC,6BAA6B,GAC9B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAc1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAA0B,EAC1B,MAAkC;IAElC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;aAC5C,CAAC;QACJ,CAAC;QACD,KAAK,sBAAsB,CAAC,CAAC,CAAC;YAC5B,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;aAC9C,CAAC;QACJ,CAAC;QACD,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC;gBAC1D,GAAG,MAAM,CAAC,IAAI;gBACd,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACzC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACtC,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,kBAAkB,CAAC;oBACvB,CAAC;oBACD,CAAC;oBACD,OAAO,EAAE,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBAC1C,CAAC;aACH,CAAC;QACJ,CAAC;QACD;YACE,OAAO,WAAW,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;IACrE,CAAC;AACH,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { type Hex, hexToNumber, serializeSignature } from \"viem\";\nimport { assertNever } from \"../../utils.js\";\nimport {\n  TypeAuthorizationSignatureRequest,\n  TypePersonalSignSignatureRequest,\n  TypeTypedDataSignatureRequest,\n} from \"../../schemas.js\";\nimport { TypeEip7702UnsignedAuth } from \"../../schemas.js\";\nimport { vToYParity } from \"ox/Signature\";\n\nexport type SignSignatureRequestParams =\n  | Static<typeof TypePersonalSignSignatureRequest>\n  | Static<typeof TypeTypedDataSignatureRequest>\n  | (Static<typeof TypeAuthorizationSignatureRequest> & {\n      data: Static<typeof TypeEip7702UnsignedAuth>;\n    });\n\nexport type SignSignatureRequestResult = {\n  type: \"secp256k1\";\n  data: Hex;\n};\n\n/**\n * Signs a signature request using the provided signer.\n * This method handles different types of signature requests including personal_sign, eth_signTypedData_v4, and authorization.\n *\n * @param {SmartAccountSigner} signer - The signer to use for signing the request\n * @param {SignSignatureRequestParams} params - The signature request parameters\n * @param {string} params.type - The type of signature request ('personal_sign', 'eth_signTypedData_v4', or 'signature_with_authorization')\n * @param {any} params.data - The data to sign, format depends on the signature type\n * @returns {Promise<SignSignatureRequestResult>} A Promise that resolves to the signature result\n * @returns {string} result.type - The signature type (currently only 'secp256k1' is supported)\n * @returns {Hex} result.signature - The hex-encoded signature\n * @returns {Eip7702ExtendedFields[\"eip7702Auth\"]} result.signedAuthorization - The signed EIP-7702 authorization, if applicable\n *\n * @example\n * // Sign a personal message\n * const result = await client.signSignatureRequest({\n *   type: 'personal_sign',\n *   data: 'Hello, world!'\n * });\n *\n * @example\n * // Sign typed data (EIP-712)\n * const result = await client.signSignatureRequest({\n *   type: 'eth_signTypedData_v4',\n *   data: {\n *     domain: { ... },\n *     types: { ... },\n *     primaryType: '...',\n *     message: { ... }\n *   }\n * });\n */\n\nexport async function signSignatureRequest(\n  signer: SmartAccountSigner,\n  params: SignSignatureRequestParams,\n): Promise<SignSignatureRequestResult> {\n  switch (params.type) {\n    case \"personal_sign\": {\n      return {\n        type: \"secp256k1\",\n        data: await signer.signMessage(params.data),\n      };\n    }\n    case \"eth_signTypedData_v4\": {\n      return {\n        type: \"secp256k1\",\n        data: await signer.signTypedData(params.data),\n      };\n    }\n    case \"eip7702Auth\": {\n      if (!signer.signAuthorization) {\n        throw new Error(\"Signer does not implement signAuthorization\");\n      }\n      const { r, s, v, yParity } = await signer.signAuthorization({\n        ...params.data,\n        chainId: hexToNumber(params.data.chainId),\n        nonce: hexToNumber(params.data.nonce),\n      });\n\n      return {\n        type: \"secp256k1\",\n        data: serializeSignature({\n          r,\n          s,\n          yParity: yParity ?? vToYParity(Number(v)),\n        }),\n      };\n    }\n    default:\n      return assertNever(params, `Unexpected signature request type.`);\n  }\n}\n"]}
+{"version":3,"file":"signSignatureRequest.js","sourceRoot":"","sources":["../../../../src/client/actions/signSignatureRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,WAAW,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,iCAAiC,EACjC,gCAAgC,EAChC,6BAA6B,GAC9B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAgB1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAA0B,EAC1B,MAAkC;IAElC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;aAC5C,CAAC;QACJ,CAAC;QACD,KAAK,sBAAsB,CAAC,CAAC,CAAC;YAC5B,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;aAC9C,CAAC;QACJ,CAAC;QACD,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC;gBAC1D,GAAG,MAAM,CAAC,IAAI;gBACd,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACzC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACtC,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,kBAAkB,CAAC;oBACvB,CAAC;oBACD,CAAC;oBACD,OAAO,EAAE,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBAC1C,CAAC;aACH,CAAC;QACJ,CAAC;QACD;YACE,OAAO,WAAW,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;IACrE,CAAC;AACH,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { type Hex, hexToNumber, serializeSignature } from \"viem\";\nimport { assertNever } from \"../../utils.js\";\nimport {\n  TypeAuthorizationSignatureRequest,\n  TypePersonalSignSignatureRequest,\n  TypeTypedDataSignatureRequest,\n} from \"../../schemas.js\";\nimport { TypeEip7702UnsignedAuth } from \"../../schemas.js\";\nimport { vToYParity } from \"ox/Signature\";\nimport type { WithoutRawPayload } from \"../../types.ts\";\n\nexport type SignSignatureRequestParams = WithoutRawPayload<\n  | Static<typeof TypePersonalSignSignatureRequest>\n  | Static<typeof TypeTypedDataSignatureRequest>\n  | (Static<typeof TypeAuthorizationSignatureRequest> & {\n      data: Static<typeof TypeEip7702UnsignedAuth>;\n    })\n>;\n\nexport type SignSignatureRequestResult = {\n  type: \"secp256k1\";\n  data: Hex;\n};\n\n/**\n * Signs a signature request using the provided signer.\n * This method handles different types of signature requests including personal_sign, eth_signTypedData_v4, and authorization.\n *\n * @param {SmartAccountSigner} signer - The signer to use for signing the request\n * @param {SignSignatureRequestParams} params - The signature request parameters\n * @param {string} params.type - The type of signature request ('personal_sign', 'eth_signTypedData_v4', or 'signature_with_authorization')\n * @param {any} params.data - The data to sign, format depends on the signature type\n * @returns {Promise<SignSignatureRequestResult>} A Promise that resolves to the signature result\n * @returns {string} result.type - The signature type (currently only 'secp256k1' is supported)\n * @returns {Hex} result.signature - The hex-encoded signature\n * @returns {Eip7702ExtendedFields[\"eip7702Auth\"]} result.signedAuthorization - The signed EIP-7702 authorization, if applicable\n *\n * @example\n * // Sign a personal message\n * const result = await client.signSignatureRequest({\n *   type: 'personal_sign',\n *   data: 'Hello, world!'\n * });\n *\n * @example\n * // Sign typed data (EIP-712)\n * const result = await client.signSignatureRequest({\n *   type: 'eth_signTypedData_v4',\n *   data: {\n *     domain: { ... },\n *     types: { ... },\n *     primaryType: '...',\n *     message: { ... }\n *   }\n * });\n */\n\nexport async function signSignatureRequest(\n  signer: SmartAccountSigner,\n  params: SignSignatureRequestParams,\n): Promise<SignSignatureRequestResult> {\n  switch (params.type) {\n    case \"personal_sign\": {\n      return {\n        type: \"secp256k1\",\n        data: await signer.signMessage(params.data),\n      };\n    }\n    case \"eth_signTypedData_v4\": {\n      return {\n        type: \"secp256k1\",\n        data: await signer.signTypedData(params.data),\n      };\n    }\n    case \"eip7702Auth\": {\n      if (!signer.signAuthorization) {\n        throw new Error(\"Signer does not implement signAuthorization\");\n      }\n      const { r, s, v, yParity } = await signer.signAuthorization({\n        ...params.data,\n        chainId: hexToNumber(params.data.chainId),\n        nonce: hexToNumber(params.data.nonce),\n      });\n\n      return {\n        type: \"secp256k1\",\n        data: serializeSignature({\n          r,\n          s,\n          yParity: yParity ?? vToYParity(Number(v)),\n        }),\n      };\n    }\n    default:\n      return assertNever(params, `Unexpected signature request type.`);\n  }\n}\n"]}

package/dist/esm/isomorphic/actions/createSession.js

@@ -1,12 +1,13 @@
 import { createSmartAccountClient, } from "@aa-sdk/core";
 import { deferralActions, PermissionBuilder, } from "@account-kit/smart-contracts/experimental";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, custom, hexToNumber, toHex, } from "viem";
+import { ChainNotFoundError, custom, hashTypedData, hexToNumber, toHex, } from "viem";
+import { InvalidRequestError } from "ox/RpcResponse";
 import { TypePermission } from "../../capabilities/permissions/index.js";
 import { isGlobalValidation } from "../../capabilities/permissions/mav2.js";
 import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { InvalidRequestError } from "ox/RpcResponse";
+import { supportsFeature } from "../utils/supportsFeature.js";
 export async function createSession(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
@@ -30,6 +31,13 @@ export async function createSession(client, params) {
             message: "No counterfactual info found.",
         });
     }
+    if (counterfactualInfo &&
+        !supportsFeature(counterfactualInfo, "permissions")) {
+        throw new InvalidRequestError({
+            message: "Account type does not support createSession",
+        });
+    }
+    // At this point we know the account supports the permission feature
     const account = await createAccount({
         chain: client.chain,
         transport: custom(client.transport),
@@ -73,6 +81,7 @@ export async function createSession(client, params) {
         signatureRequest: {
             type: "eth_signTypedData_v4",
             data: typedData,
+            rawPayload: hashTypedData(typedData),
         },
         fullPreSignatureDeferredActionDigest,
     };

package/dist/esm/isomorphic/actions/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { TypePermission } from \"../../capabilities/permissions/index.js\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_createSession } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.account,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  if (delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"'wallet_createSession' does not currently support 7702 accounts.\",\n    });\n  }\n\n  if (!counterfactualInfo) {\n    throw new InvalidRequestError({\n      message: \"No counterfactual info found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n    delegation,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new InvalidRequestError({\n      message: \"Sessions are currently only supported by MAv2 accounts.\",\n    });\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: {\n        ...params.key,\n        // Alias 'ecdsa' to 'secp256k1'\n        type: params.key.type === \"ecdsa\" ? \"secp256k1\" : params.key.type,\n      },\n      entityId,\n      nonce,\n      deadline: params.expirySec,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\" as const,\n      data: typedData,\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hashTypedData,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { TypePermission } from \"../../capabilities/permissions/index.js\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_createSession } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { supportsFeature } from \"../utils/supportsFeature.js\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.account,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  if (delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"'wallet_createSession' does not currently support 7702 accounts.\",\n    });\n  }\n\n  if (!counterfactualInfo) {\n    throw new InvalidRequestError({\n      message: \"No counterfactual info found.\",\n    });\n  }\n\n  if (\n    counterfactualInfo &&\n    !supportsFeature(counterfactualInfo, \"permissions\")\n  ) {\n    throw new InvalidRequestError({\n      message: \"Account type does not support createSession\",\n    });\n  }\n\n  // At this point we know the account supports the permission feature\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n    delegation,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new InvalidRequestError({\n      message: \"Sessions are currently only supported by MAv2 accounts.\",\n    });\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: {\n        ...params.key,\n        // Alias 'ecdsa' to 'secp256k1'\n        type: params.key.type === \"ecdsa\" ? \"secp256k1\" : params.key.type,\n      },\n      entityId,\n      nonce,\n      deadline: params.expirySec,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\" as const,\n      data: typedData,\n      rawPayload: hashTypedData(typedData),\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/prepareCalls.js

@@ -1,8 +1,8 @@
 import { deepHexlify, default7702GasEstimator, } from "@aa-sdk/core";
-import { ChainNotFoundError, custom, fromHex, toHex, } from "viem";
+import { ChainNotFoundError, custom, fromHex, hashMessage, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorizationRequest, parseDelegation } from "../utils/7702.js";
+import { createAuthorizationRequest } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
 import { assertNever } from "../../utils.js";
 import { assertValid7702AccountAddress } from "../utils/7702.js";
@@ -12,20 +12,23 @@ export async function prepareCalls(client, params) {
     }
     assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);
     // in local mode, we probably want some kind of caching for this
-    const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth
-        ? {
-            counterfactualInfo: undefined,
-            delegation: parseDelegation(params.capabilities.eip7702Auth),
-        }
-        : await client.request({
-            method: "wallet_requestAccount",
-            params: [
-                {
+    const { counterfactualInfo, delegation } = await client.request({
+        method: "wallet_requestAccount",
+        params: [
+            params.capabilities?.eip7702Auth
+                ? {
+                    signerAddress: params.from,
+                    creationHint: {
+                        accountType: "7702",
+                    },
+                    includeCounterfactualInfo: true,
+                }
+                : {
                     accountAddress: params.from,
                     includeCounterfactualInfo: true,
                 },
-            ],
-        });
+        ],
+    });
     if (!counterfactualInfo && !delegation) {
         throw new InvalidRequestError({
             message: "No counterfactual info or delegated implementation address found.",
@@ -69,6 +72,7 @@ export async function prepareCalls(client, params) {
     }
     const hexlifiedUo = deepHexlify(builtUo);
     const ep = account.getEntryPoint();
+    const uoHash = ep.getUserOperationHash(hexlifiedUo);
     const uoRequest = {
         type: ep.version === "0.7.0"
             ? "user-operation-v070"
@@ -80,8 +84,11 @@ export async function prepareCalls(client, params) {
         signatureRequest: {
             type: "personal_sign",
             data: {
-                raw: ep.getUserOperationHash(hexlifiedUo),
+                raw: uoHash,
             },
+            rawPayload: hashMessage({
+                raw: uoHash,
+            }),
         },
     };
     return authorizationRequest

package/dist/esm/isomorphic/actions/prepareCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  deepHexlify,\n  default7702GasEstimator,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorizationRequest, parseDelegation } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport { assertValid7702AccountAddress } from \"../utils/7702.js\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth\n    ? {\n        counterfactualInfo: undefined,\n        delegation: parseDelegation(params.capabilities.eip7702Auth),\n      }\n    : await client.request({\n        method: \"wallet_requestAccount\",\n        params: [\n          {\n            accountAddress: params.from,\n            includeCounterfactualInfo: true,\n          },\n        ],\n      });\n\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorizationRequest(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  if (authorizationRequest) {\n    // @ts-expect-error - this is available but not typed as public\n    client.middleware.gasEstimator = default7702GasEstimator();\n  }\n\n  // TODO: oops we don't actually support setting the policyId as an override here\n  // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly\n  const builtUo = await client.buildUserOperation({\n    uo: params.calls.map((x) => ({\n      target: x.to,\n      data: x.data ?? \"0x\",\n      value: x.value ? fromHex(x.value, \"bigint\") : undefined,\n    })),\n    account,\n    overrides: params.capabilities?.gasParamsOverride,\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by a separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n\n  const hexlifiedUo = deepHexlify(builtUo);\n\n  const ep = account.getEntryPoint();\n\n  const uoRequest = {\n    type:\n      ep.version === \"0.7.0\"\n        ? (\"user-operation-v070\" as const)\n        : ep.version === \"0.6.0\"\n          ? (\"user-operation-v060\" as const)\n          : assertNever(ep.version, \"Unexpected entry point version\"),\n    data: hexlifiedUo,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\" as const,\n      data: {\n        raw: ep.getUserOperationHash(hexlifiedUo),\n      },\n    },\n  };\n\n  return authorizationRequest\n    ? {\n        type: \"array\" as const,\n        data: [authorizationRequest, uoRequest],\n      }\n    : uoRequest;\n}\n"]}
+{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  deepHexlify,\n  default7702GasEstimator,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  hashMessage,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorizationRequest } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport { assertValid7702AccountAddress } from \"../utils/7702.js\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      params.capabilities?.eip7702Auth\n        ? {\n            signerAddress: params.from,\n            creationHint: {\n              accountType: \"7702\",\n            },\n            includeCounterfactualInfo: true,\n          }\n        : {\n            accountAddress: params.from,\n            includeCounterfactualInfo: true,\n          },\n    ],\n  });\n\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorizationRequest(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  if (authorizationRequest) {\n    // @ts-expect-error - this is available but not typed as public\n    client.middleware.gasEstimator = default7702GasEstimator();\n  }\n\n  // TODO: oops we don't actually support setting the policyId as an override here\n  // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly\n  const builtUo = await client.buildUserOperation({\n    uo: params.calls.map((x) => ({\n      target: x.to,\n      data: x.data ?? \"0x\",\n      value: x.value ? fromHex(x.value, \"bigint\") : undefined,\n    })),\n    account,\n    overrides: params.capabilities?.gasParamsOverride,\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by a separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n\n  const hexlifiedUo = deepHexlify(builtUo);\n\n  const ep = account.getEntryPoint();\n\n  const uoHash = ep.getUserOperationHash(hexlifiedUo);\n\n  const uoRequest = {\n    type:\n      ep.version === \"0.7.0\"\n        ? (\"user-operation-v070\" as const)\n        : ep.version === \"0.6.0\"\n          ? (\"user-operation-v060\" as const)\n          : assertNever(ep.version, \"Unexpected entry point version\"),\n    data: hexlifiedUo,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\" as const,\n      data: {\n        raw: uoHash,\n      },\n      rawPayload: hashMessage({\n        raw: uoHash,\n      }),\n    },\n  };\n\n  return authorizationRequest\n    ? {\n        type: \"array\" as const,\n        data: [authorizationRequest, uoRequest],\n      }\n    : uoRequest;\n}\n"]}

package/dist/esm/isomorphic/actions/sendPreparedCalls.js

@@ -63,17 +63,62 @@ export async function sendPreparedCalls(client, params) {
             ? parseSignature(decodeSignature(authorization.signature).data)
             : undefined;
         const uoSigHex = decodeSignature(userOp.signature).data;
+        const { counterfactualInfo, delegation } = await client.request({
+            method: "wallet_requestAccount",
+            params: [
+                {
+                    accountAddress: userOp.data.sender,
+                    includeCounterfactualInfo: true,
+                },
+            ],
+        });
+        if (!counterfactualInfo && !delegation) {
+            throw new InvalidRequestError({
+                message: "No counterfactual info or delegated implementation address found.",
+            });
+        }
+        const factoryType = counterfactualInfo?.factoryType;
+        // build signature based on account type
+        const signature = (() => {
+            switch (factoryType) {
+                // light accounts
+                case "LightAccountV1.0.1":
+                case "LightAccountV1.0.2":
+                case "LightAccountV1.1.0":
+                    // For LAv1, we always just pass the signature.
+                    return uoSigHex;
+                case "LightAccountV2.0.0":
+                    // for LAv2, we need to prepend the "SignatureType.EOA" byte
+                    return concat(["0x00", uoSigHex]);
+                case undefined: // undefined defaults to sma-b
+                case "MAv2.0.0-sma-b":
+                    // For sma-b, we need to handle deferred actions if needed and prepend the "Reserved
+                    // Signature Segment" and "SignatureType.EOA" bytes
+                    return deferredAction != null
+                        ? concatHex([
+                            `0x${deferredAction.slice(68)}`, // Cuts off stuff prepended to the digest (nonce, etc.).
+                            "0xFF",
+                            "0x00",
+                            uoSigHex,
+                        ])
+                        : concat(["0xFF", "0x00", uoSigHex]);
+                case "MAv2.0.0-ma-ssv":
+                case "MAv2.0.0-ma-webauthn":
+                case "LightAccountV2.0.0-MultiOwner":
+                case "MAv1.0.0-MultiOwner":
+                case "MAv1.0.0-MultiSig":
+                case "unknown":
+                    throw new InvalidRequestError({
+                        message: `Unsupported factory type: ${factoryType}`,
+                    });
+                default:
+                    return assertNever(factoryType, "Unsupported factory type");
+            }
+        })();
         return client
             .sendRawUserOperation({
             ...userOp.data,
-            signature: deferredAction != null
-                ? concatHex([
-                    `0x${deferredAction.slice(68)}`, // Cuts off stuff prepended to the digest (nonce, etc. that we had previously).
-                    "0xff",
-                    "0x00",
-                    uoSigHex,
-                ])
-                : concat(["0xFF", "0x00", uoSigHex]),
+            signature,
             eip7702Auth: idx === 0 && authorization && authSig
                 ? {
                     ...authorization.data,

package/dist/esm/isomorphic/actions/sendPreparedCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  numberToHex,\n  parseSignature,\n  toHex,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport { type wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { isSupportedDelegationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { decodeSignature } from \"../utils/decodeSignature.js\";\n\nexport type SendPreparedCallsParams = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new InvalidRequestError({\n        message:\n          \"Remote mode deferred action not supported in isomorphic client\",\n      });\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const userOps =\n    params.type === \"array\"\n      ? params.data.filter((it) => {\n          const isUserOp =\n            it.type === \"user-operation-v060\" ||\n            it.type === \"user-operation-v070\";\n          if (isUserOp && it.chainId !== toHex(client.chain.id)) {\n            throw new InvalidRequestError({\n              message:\n                \"Multiple chain IDs in a single request are not currently supported.\",\n            });\n          }\n          return isUserOp;\n        })\n      : [params];\n\n  const authorizations =\n    params.type === \"array\"\n      ? params.data.filter((it) => it.type === \"authorization\")\n      : [];\n\n  if (authorizations.length > 1) {\n    throw new InvalidRequestError({\n      message:\n        \"Multiple authorizations in a single request are not currently supported\",\n    });\n  }\n  const [authorization] = authorizations;\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    authorization &&\n    !isSupportedDelegationAddress7702(authorization.data.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${authorization.data.address}`,\n    });\n  }\n\n  const hashes = await Promise.all(\n    userOps.map(async (userOp, idx) => {\n      const ep: { address: Address } =\n        userOp.type === \"user-operation-v060\"\n          ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n          : userOp.type === \"user-operation-v070\"\n            ? getEntryPoint(client.chain, { version: \"0.7.0\" })\n            : assertNever(userOp, \"Unexpected user op type\");\n      const authSig = authorization\n        ? parseSignature(decodeSignature(authorization.signature).data)\n        : undefined;\n      const uoSigHex = decodeSignature(userOp.signature).data;\n      return client\n        .sendRawUserOperation(\n          {\n            ...userOp.data,\n            signature:\n              deferredAction != null\n                ? concatHex([\n                    `0x${deferredAction.slice(68)}`, // Cuts off stuff prepended to the digest (nonce, etc. that we had previously).\n                    \"0xff\",\n                    \"0x00\",\n                    uoSigHex,\n                  ])\n                : concat([\"0xFF\", \"0x00\", uoSigHex]),\n            eip7702Auth:\n              idx === 0 && authorization && authSig\n                ? {\n                    ...authorization.data,\n                    chainId: authorization.chainId,\n                    ...{\n                      ...authSig,\n                      yParity: numberToHex(authSig.yParity),\n                    },\n                  }\n                : undefined,\n          },\n          ep.address,\n        )\n        .catch((err) => {\n          if (\n            err instanceof BaseError &&\n            err.details.endsWith(\"is not a contract and initCode is empty\")\n          ) {\n            throw new BaseError(\n              `${err.details} (If using 7702, be sure you include the signed authorization in the request parameters)`,\n            );\n          }\n          throw err;\n        });\n    }),\n  );\n\n  return {\n    preparedCallIds: hashes.map((hash) =>\n      Value.Encode(TypeCallId, {\n        chainId: toHex(client.chain.id),\n        hash,\n      }),\n    ),\n  };\n}\n"]}
+{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  numberToHex,\n  parseSignature,\n  toHex,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport { type wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { isSupportedDelegationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { decodeSignature } from \"../utils/decodeSignature.js\";\n\nexport type SendPreparedCallsParams = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new InvalidRequestError({\n        message:\n          \"Remote mode deferred action not supported in isomorphic client\",\n      });\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const userOps =\n    params.type === \"array\"\n      ? params.data.filter((it) => {\n          const isUserOp =\n            it.type === \"user-operation-v060\" ||\n            it.type === \"user-operation-v070\";\n          if (isUserOp && it.chainId !== toHex(client.chain.id)) {\n            throw new InvalidRequestError({\n              message:\n                \"Multiple chain IDs in a single request are not currently supported.\",\n            });\n          }\n          return isUserOp;\n        })\n      : [params];\n\n  const authorizations =\n    params.type === \"array\"\n      ? params.data.filter((it) => it.type === \"authorization\")\n      : [];\n\n  if (authorizations.length > 1) {\n    throw new InvalidRequestError({\n      message:\n        \"Multiple authorizations in a single request are not currently supported\",\n    });\n  }\n  const [authorization] = authorizations;\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    authorization &&\n    !isSupportedDelegationAddress7702(authorization.data.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${authorization.data.address}`,\n    });\n  }\n\n  const hashes = await Promise.all(\n    userOps.map(async (userOp, idx) => {\n      const ep: { address: Address } =\n        userOp.type === \"user-operation-v060\"\n          ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n          : userOp.type === \"user-operation-v070\"\n            ? getEntryPoint(client.chain, { version: \"0.7.0\" })\n            : assertNever(userOp, \"Unexpected user op type\");\n      const authSig = authorization\n        ? parseSignature(decodeSignature(authorization.signature).data)\n        : undefined;\n      const uoSigHex = decodeSignature(userOp.signature).data;\n\n      const { counterfactualInfo, delegation } = await client.request({\n        method: \"wallet_requestAccount\",\n        params: [\n          {\n            accountAddress: userOp.data.sender,\n            includeCounterfactualInfo: true,\n          },\n        ],\n      });\n\n      if (!counterfactualInfo && !delegation) {\n        throw new InvalidRequestError({\n          message:\n            \"No counterfactual info or delegated implementation address found.\",\n        });\n      }\n\n      const factoryType = counterfactualInfo?.factoryType;\n\n      // build signature based on account type\n      const signature = (() => {\n        switch (factoryType) {\n          // light accounts\n          case \"LightAccountV1.0.1\":\n          case \"LightAccountV1.0.2\":\n          case \"LightAccountV1.1.0\":\n            // For LAv1, we always just pass the signature.\n            return uoSigHex;\n          case \"LightAccountV2.0.0\":\n            // for LAv2, we need to prepend the \"SignatureType.EOA\" byte\n            return concat([\"0x00\", uoSigHex]);\n          case undefined: // undefined defaults to sma-b\n          case \"MAv2.0.0-sma-b\":\n            // For sma-b, we need to handle deferred actions if needed and prepend the \"Reserved\n            // Signature Segment\" and \"SignatureType.EOA\" bytes\n            return deferredAction != null\n              ? concatHex([\n                  `0x${deferredAction.slice(68)}`, // Cuts off stuff prepended to the digest (nonce, etc.).\n                  \"0xFF\",\n                  \"0x00\",\n                  uoSigHex,\n                ])\n              : concat([\"0xFF\", \"0x00\", uoSigHex]);\n          case \"MAv2.0.0-ma-ssv\":\n          case \"MAv2.0.0-ma-webauthn\":\n          case \"LightAccountV2.0.0-MultiOwner\":\n          case \"MAv1.0.0-MultiOwner\":\n          case \"MAv1.0.0-MultiSig\":\n          case \"unknown\":\n            throw new InvalidRequestError({\n              message: `Unsupported factory type: ${factoryType}`,\n            });\n          default:\n            return assertNever(factoryType, \"Unsupported factory type\");\n        }\n      })();\n\n      return client\n        .sendRawUserOperation(\n          {\n            ...userOp.data,\n            signature,\n            eip7702Auth:\n              idx === 0 && authorization && authSig\n                ? {\n                    ...authorization.data,\n                    chainId: authorization.chainId,\n                    ...{\n                      ...authSig,\n                      yParity: numberToHex(authSig.yParity),\n                    },\n                  }\n                : undefined,\n          },\n          ep.address,\n        )\n        .catch((err) => {\n          if (\n            err instanceof BaseError &&\n            err.details.endsWith(\"is not a contract and initCode is empty\")\n          ) {\n            throw new BaseError(\n              `${err.details} (If using 7702, be sure you include the signed authorization in the request parameters)`,\n            );\n          }\n          throw err;\n        });\n    }),\n  );\n\n  return {\n    preparedCallIds: hashes.map((hash) =>\n      Value.Encode(TypeCallId, {\n        chainId: toHex(client.chain.id),\n        hash,\n      }),\n    ),\n  };\n}\n"]}

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

@@ -50,11 +50,13 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                         [x: string]: unknown;
                     };
                 };
+                rawPayload: `0x${string}`;
             } | {
                 type: "personal_sign";
                 data: string | {
                     raw: `0x${string}`;
                 };
+                rawPayload: `0x${string}`;
             };
         } | {
             type: "user-operation-v070";
@@ -96,11 +98,13 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                         [x: string]: unknown;
                     };
                 };
+                rawPayload: `0x${string}`;
             } | {
                 type: "personal_sign";
                 data: string | {
                     raw: `0x${string}`;
                 };
+                rawPayload: `0x${string}`;
             };
         } | {
             type: "authorization";
@@ -111,6 +115,7 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             };
             signatureRequest: {
                 type: "eip7702Auth";
+                rawPayload: `0x${string}`;
             };
         })[];
     } | {
@@ -149,11 +154,13 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                     [x: string]: unknown;
                 };
             };
+            rawPayload: `0x${string}`;
         } | {
             type: "personal_sign";
             data: string | {
                 raw: `0x${string}`;
             };
+            rawPayload: `0x${string}`;
         };
     } | {
         type: "user-operation-v070";
@@ -195,11 +202,13 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                     [x: string]: unknown;
                 };
             };
+            rawPayload: `0x${string}`;
         } | {
             type: "personal_sign";
             data: string | {
                 raw: `0x${string}`;
             };
+            rawPayload: `0x${string}`;
         };
     }>;
     sendPreparedCalls: (params: SendPreparedCallsParams) => Promise<{

package/dist/esm/isomorphic/utils/7702.js

@@ -1,6 +1,7 @@
-import { concatHex, numberToHex, isAddress, } from "viem";
+import { concatHex, numberToHex, isAddress, hexToNumber, } from "viem";
 import { PreparedCall_Authorization } from "../../schemas.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import { hashAuthorization } from "viem/utils";
 export const createAuthorizationRequest = async (client, params) => {
     const expectedCode = concatHex(["0xef0100", params.delegation]);
     const code = (await client.getCode({ address: params.address })) ?? "0x";
@@ -19,6 +20,11 @@ export const createAuthorizationRequest = async (client, params) => {
         chainId: numberToHex(client.chain.id),
         signatureRequest: {
             type: "eip7702Auth",
+            rawPayload: hashAuthorization({
+                chainId: client.chain.id,
+                nonce: hexToNumber(data.nonce),
+                address: params.delegation,
+            }),
         },
     };
 };
@@ -49,13 +55,20 @@ export const parseDelegation = (eip7702AuthCapability) => {
             : getDelegationAddressForAccountType7702(eip7702AuthCapability.delegation);
 };
 export const assertValid7702AccountAddress = (fromAddress, eip7702AuthCapability) => {
-    if (eip7702AuthCapability &&
-        typeof eip7702AuthCapability === "object" &&
-        "account" in eip7702AuthCapability &&
-        eip7702AuthCapability?.account !== fromAddress) {
-        throw new InvalidRequestError({
-            message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,
-        });
+    if (eip7702AuthCapability) {
+        if (typeof eip7702AuthCapability === "object" &&
+            "account" in eip7702AuthCapability &&
+            eip7702AuthCapability?.account !== fromAddress) {
+            throw new InvalidRequestError({
+                message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,
+            });
+        }
+        const delegation = parseDelegation(eip7702AuthCapability);
+        if (!isSupportedDelegationAddress7702(delegation)) {
+            throw new InvalidRequestError({
+                message: `Unsupported 7702 delegation address: ${delegation}`,
+            });
+        }
     }
 };
 //# sourceMappingURL=7702.js.map

package/dist/esm/isomorphic/utils/7702.js.map

@@ -1 +1 @@
-{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  numberToHex,\n  type Address,\n  type Chain,\n  type Transport,\n  isAddress,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { PreparedCall_Authorization } from \"../../schemas.js\";\nimport type { Eip7702AuthCapability } from \"../../capabilities/eip7702Auth.ts\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport const createAuthorizationRequest = async (\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: { address: Address; delegation: Address },\n): Promise<Static<typeof PreparedCall_Authorization> | undefined> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  if (code.toLowerCase() === expectedCode.toLowerCase()) {\n    return undefined; // Already authorized.\n  }\n  const data = {\n    address: params.delegation,\n    nonce: numberToHex(\n      await client.getTransactionCount({\n        address: params.address,\n      }),\n    ),\n  };\n  return {\n    type: \"authorization\" as const,\n    data,\n    chainId: numberToHex(client.chain.id),\n    signatureRequest: {\n      type: \"eip7702Auth\" as const,\n    },\n  };\n};\n\nexport const EIP_7702_ACCOUNT_TYPE = [\"ModularAccountV2\"] as const;\n\ntype Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];\n\nconst Eip7702AccountTypeToDelegationAddress = {\n  ModularAccountV2: \"0x69007702764179f14F51cdce752f4f775d74E139\",\n} as const satisfies Record<Supported7702AccountType, Address>;\n\nconst DelegationAddressToAccountType: Record<\n  Address,\n  Supported7702AccountType\n> = Object.fromEntries(\n  Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [\n    value,\n    key,\n  ]),\n) as Record<Address, Supported7702AccountType>;\n\nexport const SUPPORTED_DELEGATION_ADDRESSES = Object.values(\n  Eip7702AccountTypeToDelegationAddress,\n);\n\nexport const isSupportedDelegationAddress7702 = (address: Address): boolean => {\n  return (SUPPORTED_DELEGATION_ADDRESSES as Address[]).includes(address);\n};\n\nexport const getAccountTypeForDelegationAddress7702 = (\n  address: Address,\n): Supported7702AccountType | undefined => {\n  return DelegationAddressToAccountType[address];\n};\n\nconst getDelegationAddressForAccountType7702 = (\n  accountType: Supported7702AccountType,\n): (typeof SUPPORTED_DELEGATION_ADDRESSES)[number] => {\n  return Eip7702AccountTypeToDelegationAddress[accountType];\n};\n\nconst DEFAULT_7702_DELEGATION_ADDR =\n  Eip7702AccountTypeToDelegationAddress[\"ModularAccountV2\"];\n\nexport const parseDelegation = (\n  eip7702AuthCapability: Static<typeof Eip7702AuthCapability>,\n) => {\n  return eip7702AuthCapability === true\n    ? DEFAULT_7702_DELEGATION_ADDR\n    : isAddress(eip7702AuthCapability.delegation)\n      ? eip7702AuthCapability.delegation\n      : getDelegationAddressForAccountType7702(\n          eip7702AuthCapability.delegation,\n        );\n};\n\nexport const assertValid7702AccountAddress = (\n  fromAddress: Address,\n  eip7702AuthCapability: Static<typeof Eip7702AuthCapability> | undefined,\n) => {\n  if (\n    eip7702AuthCapability &&\n    typeof eip7702AuthCapability === \"object\" &&\n    \"account\" in eip7702AuthCapability &&\n    eip7702AuthCapability?.account !== fromAddress\n  ) {\n    throw new InvalidRequestError({\n      message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,\n    });\n  }\n};\n"]}
+{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  numberToHex,\n  type Address,\n  type Chain,\n  type Transport,\n  isAddress,\n  hexToNumber,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { PreparedCall_Authorization } from \"../../schemas.js\";\nimport type { Eip7702AuthCapability } from \"../../capabilities/eip7702Auth.ts\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { hashAuthorization } from \"viem/utils\";\n\nexport const createAuthorizationRequest = async (\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: { address: Address; delegation: Address },\n): Promise<Static<typeof PreparedCall_Authorization> | undefined> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  if (code.toLowerCase() === expectedCode.toLowerCase()) {\n    return undefined; // Already authorized.\n  }\n  const data = {\n    address: params.delegation,\n    nonce: numberToHex(\n      await client.getTransactionCount({\n        address: params.address,\n      }),\n    ),\n  };\n  return {\n    type: \"authorization\" as const,\n    data,\n    chainId: numberToHex(client.chain.id),\n    signatureRequest: {\n      type: \"eip7702Auth\" as const,\n      rawPayload: hashAuthorization({\n        chainId: client.chain.id,\n        nonce: hexToNumber(data.nonce),\n        address: params.delegation,\n      }),\n    },\n  };\n};\n\nexport const EIP_7702_ACCOUNT_TYPE = [\"ModularAccountV2\"] as const;\n\ntype Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];\n\nconst Eip7702AccountTypeToDelegationAddress = {\n  ModularAccountV2: \"0x69007702764179f14F51cdce752f4f775d74E139\",\n} as const satisfies Record<Supported7702AccountType, Address>;\n\nconst DelegationAddressToAccountType: Record<\n  Address,\n  Supported7702AccountType\n> = Object.fromEntries(\n  Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [\n    value,\n    key,\n  ]),\n) as Record<Address, Supported7702AccountType>;\n\nexport const SUPPORTED_DELEGATION_ADDRESSES = Object.values(\n  Eip7702AccountTypeToDelegationAddress,\n);\n\nexport const isSupportedDelegationAddress7702 = (address: Address): boolean => {\n  return (SUPPORTED_DELEGATION_ADDRESSES as Address[]).includes(address);\n};\n\nexport const getAccountTypeForDelegationAddress7702 = (\n  address: Address,\n): Supported7702AccountType | undefined => {\n  return DelegationAddressToAccountType[address];\n};\n\nconst getDelegationAddressForAccountType7702 = (\n  accountType: Supported7702AccountType,\n): (typeof SUPPORTED_DELEGATION_ADDRESSES)[number] => {\n  return Eip7702AccountTypeToDelegationAddress[accountType];\n};\n\nconst DEFAULT_7702_DELEGATION_ADDR =\n  Eip7702AccountTypeToDelegationAddress[\"ModularAccountV2\"];\n\nexport const parseDelegation = (\n  eip7702AuthCapability: Static<typeof Eip7702AuthCapability>,\n) => {\n  return eip7702AuthCapability === true\n    ? DEFAULT_7702_DELEGATION_ADDR\n    : isAddress(eip7702AuthCapability.delegation)\n      ? eip7702AuthCapability.delegation\n      : getDelegationAddressForAccountType7702(\n          eip7702AuthCapability.delegation,\n        );\n};\n\nexport const assertValid7702AccountAddress = (\n  fromAddress: Address,\n  eip7702AuthCapability: Static<typeof Eip7702AuthCapability> | undefined,\n) => {\n  if (eip7702AuthCapability) {\n    if (\n      typeof eip7702AuthCapability === \"object\" &&\n      \"account\" in eip7702AuthCapability &&\n      eip7702AuthCapability?.account !== fromAddress\n    ) {\n      throw new InvalidRequestError({\n        message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,\n      });\n    }\n\n    const delegation = parseDelegation(eip7702AuthCapability);\n\n    if (!isSupportedDelegationAddress7702(delegation)) {\n      throw new InvalidRequestError({\n        message: `Unsupported 7702 delegation address: ${delegation}`,\n      });\n    }\n  }\n};\n"]}