@account-kit/wallet-client 0.1.0-alpha.4 → 0.1.0-alpha.5

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 { createAuthorization } from \"../utils/7702.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  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.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: params.key,\n      entityId,\n      nonce,\n      deadline: params.expiry,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorization(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  const signatureRequest = {\n    type: \"eth_signTypedData_v4\" as const,\n    data: typedData,\n  };\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\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  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 { createAuthorization } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport {\n  parseDelegation,\n  assertValid7702AccountAddress,\n} from \"../utils/7702.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  assertValid7702AccountAddress(\n    params.account,\n    params.capabilities?.eip7702Auth,\n  );\n\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.account,\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.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.expiry,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorization(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  const signatureRequest = {\n    type: \"eth_signTypedData_v4\" as const,\n    data: typedData,\n  };\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}

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

@@ -1,8 +1,10 @@
 import {} from "@aa-sdk/core";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, isHex, } from "viem";
+import { ChainNotFoundError, hexToNumber, isHex, } from "viem";
 import { TypeCallId } from "../../schemas.js";
 import { castToHex } from "../../utils.js";
+import { InternalError, BaseError } from "ox/RpcResponse";
+import { polygon, mainnet, base, worldchain, optimism, arbitrum, sepolia, polygonAmoy, baseSepolia, optimismSepolia, worldchainSepolia, arbitrumSepolia, } from "viem/chains";
 const ReceiptStatus = {
     reverted: "0x0",
     success: "0x1",
@@ -20,22 +22,73 @@ export const CallStatusCode = {
     /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */
     PARTIAL_CHAIN_RULES_FAILURE: 600,
 };
+// https://eips.ethereum.org/EIPS/eip-5792#error-codes
+const ErrorCode = {
+    UNKNOWN_BUNDLE_ID: 5730,
+};
+// "eth_getUserOperationByHash" is limited to the last 150 blocks
+//  for all networks except those in this list.
+// https://www.alchemy.com/docs/node/bundler-api/bundler-api-endpoints/eth-get-user-operation-by-hash
+const GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS = [
+    mainnet.id,
+    sepolia.id,
+    polygon.id,
+    polygonAmoy.id,
+    base.id,
+    baseSepolia.id,
+    optimism.id,
+    optimismSepolia.id,
+    worldchain.id,
+    worldchainSepolia.id,
+    arbitrum.id,
+    arbitrumSepolia.id,
+];
 export async function getCallsStatus(client, callId) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
     const { chainId, hash } = Value.Decode(TypeCallId, callId);
-    const result = await client.getUserOperationReceipt(hash);
-    return {
+    const baseResp = {
         id: callId,
         chainId,
         atomic: true,
-        status: !result?.receipt
-            ? CallStatusCode.PENDING
-            : result.success
-                ? CallStatusCode.CONFIRMED
-                : CallStatusCode.CHAIN_RULES_FAILURE,
-        receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],
+    };
+    const result = await client.getUserOperationByHash(hash);
+    if (!result &&
+        GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS.includes(hexToNumber(chainId))) {
+        // This network has unlimited range, so we should always have a result here if the callId is valid.
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: ErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    if (result && !result.transactionHash) {
+        // A result but no txn hash means it's valid but pending.
+        return {
+            ...baseResp,
+            status: CallStatusCode.PENDING,
+        };
+    }
+    const receipt = await client.getUserOperationReceipt(hash);
+    if (result?.transactionHash && !receipt) {
+        // This should never happen.
+        throw new InternalError({
+            message: `Failed to get receipt for callId ${callId}`,
+        });
+    }
+    if (!receipt) {
+        // This covers txns older than 150 blocks which were not retrievable by "eth_getUserOperationByHash".
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: ErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    return {
+        ...baseResp,
+        status: receipt.success
+            ? CallStatusCode.CONFIRMED
+            : CallStatusCode.CHAIN_RULES_FAILURE,
+        receipts: [transformReceipt(receipt.receipt)],
     };
 }
 function transformReceipt(receipt) {

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

@@ -1 +1 @@
-{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,KAAK,GAKN,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAU3C,MAAM,aAAa,GAA8C;IAC/D,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,iCAAiC;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,oFAAoF;IACpF,OAAO,EAAE,GAAG;IACZ,iGAAiG;IACjG,SAAS,EAAE,GAAG;IACd,oEAAoE;IACpE,gBAAgB,EAAE,GAAG;IACrB,wGAAwG;IACxG,mBAAmB,EAAE,GAAG;IACxB,wGAAwG;IACxG,2BAA2B,EAAE,GAAG;CACxB,CAAC;AAEX,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAMC,EACD,MAA4B;IAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO;QACL,EAAE,EAAE,MAAM;QACV,OAAO;QACP,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO;YACtB,CAAC,CAAC,cAAc,CAAC,OAAO;YACxB,CAAC,CAAC,MAAM,CAAC,OAAO;gBACd,CAAC,CAAC,cAAc,CAAC,SAAS;gBAC1B,CAAC,CAAC,cAAc,CAAC,mBAAmB;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC5E,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA2B;IAE3B,OAAO;QACL,wGAAwG;QACxG,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,MAAM;YAChB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,+FAA+F;QAC/F,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAC3C,2FAA2F;QAC3F,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACnC,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC/B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  isHex,\n  type Chain,\n  type Hex,\n  type TransactionReceipt,\n  type Transport,\n} from \"viem\";\nimport type { wallet_getCallsStatus } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { castToHex } from \"../../utils.js\";\n\nexport type GetCallsStatusParams = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type GetCallsStatusResponse = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"ReturnType\"]\n>;\n\nconst ReceiptStatus: Record<TransactionReceipt[\"status\"], Hex> = {\n  reverted: \"0x0\",\n  success: \"0x1\",\n};\n\n/** EIP-5792 call status codes */\nexport const CallStatusCode = {\n  /** Batch has been received by the wallet but has not completed execution onchain */\n  PENDING: 100,\n  /** Batch has been included onchain without reverts, receipts array contains info of all calls */\n  CONFIRMED: 200,\n  /** Batch has not been included onchain and wallet will not retry */\n  OFFCHAIN_FAILURE: 400,\n  /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */\n  CHAIN_RULES_FAILURE: 500,\n  /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */\n  PARTIAL_CHAIN_RULES_FAILURE: 600,\n} as const;\n\nexport async function getCallsStatus(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  callId: GetCallsStatusParams,\n): Promise<GetCallsStatusResponse> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { chainId, hash } = Value.Decode(TypeCallId, callId);\n\n  const result = await client.getUserOperationReceipt(hash);\n\n  return {\n    id: callId,\n    chainId,\n    atomic: true,\n    status: !result?.receipt\n      ? CallStatusCode.PENDING\n      : result.success\n        ? CallStatusCode.CONFIRMED\n        : CallStatusCode.CHAIN_RULES_FAILURE,\n    receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],\n  };\n}\n\nfunction transformReceipt(\n  receipt: TransactionReceipt,\n): NonNullable<GetCallsStatusResponse[\"receipts\"]>[number] {\n  return {\n    // viem's type for status is \"success\" | \"reverted\", but the actual value seems to already be 0x0 or 0x1\n    status: isHex(receipt.status)\n      ? receipt.status\n      : ReceiptStatus[receipt.status],\n    blockHash: receipt.blockHash,\n    // viem's type for blockNumber is bigint, but the actual value seems to already be a hex string\n    blockNumber: castToHex(receipt.blockNumber),\n    // viem's type for gasUsed is bigint, but the actual value seems to already be a hex string\n    gasUsed: castToHex(receipt.gasUsed),\n    transactionHash: receipt.transactionHash,\n    logs: receipt.logs.map((log) => ({\n      address: log.address,\n      data: log.data,\n      topics: log.topics,\n    })),\n  };\n}\n"]}
+{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/getCallsStatus.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  hexToNumber,\n  isHex,\n  type Chain,\n  type Hex,\n  type TransactionReceipt,\n  type Transport,\n} from \"viem\";\nimport type { wallet_getCallsStatus } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { castToHex } from \"../../utils.js\";\nimport { InternalError, BaseError } from \"ox/RpcResponse\";\nimport {\n  polygon,\n  mainnet,\n  base,\n  worldchain,\n  optimism,\n  arbitrum,\n  sepolia,\n  polygonAmoy,\n  baseSepolia,\n  optimismSepolia,\n  worldchainSepolia,\n  arbitrumSepolia,\n} from \"viem/chains\";\n\nexport type GetCallsStatusParams = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type GetCallsStatusResponse = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"ReturnType\"]\n>;\n\nconst ReceiptStatus: Record<TransactionReceipt[\"status\"], Hex> = {\n  reverted: \"0x0\",\n  success: \"0x1\",\n};\n\n/** EIP-5792 call status codes */\nexport const CallStatusCode = {\n  /** Batch has been received by the wallet but has not completed execution onchain */\n  PENDING: 100,\n  /** Batch has been included onchain without reverts, receipts array contains info of all calls */\n  CONFIRMED: 200,\n  /** Batch has not been included onchain and wallet will not retry */\n  OFFCHAIN_FAILURE: 400,\n  /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */\n  CHAIN_RULES_FAILURE: 500,\n  /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */\n  PARTIAL_CHAIN_RULES_FAILURE: 600,\n} as const;\n\n// https://eips.ethereum.org/EIPS/eip-5792#error-codes\nconst ErrorCode = {\n  UNKNOWN_BUNDLE_ID: 5730,\n};\n\n// \"eth_getUserOperationByHash\" is limited to the last 150 blocks\n//  for all networks except those in this list.\n// https://www.alchemy.com/docs/node/bundler-api/bundler-api-endpoints/eth-get-user-operation-by-hash\nconst GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS: number[] = [\n  mainnet.id,\n  sepolia.id,\n  polygon.id,\n  polygonAmoy.id,\n  base.id,\n  baseSepolia.id,\n  optimism.id,\n  optimismSepolia.id,\n  worldchain.id,\n  worldchainSepolia.id,\n  arbitrum.id,\n  arbitrumSepolia.id,\n];\n\nexport async function getCallsStatus(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  callId: GetCallsStatusParams,\n): Promise<GetCallsStatusResponse> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n  const { chainId, hash } = Value.Decode(TypeCallId, callId);\n\n  const baseResp = {\n    id: callId,\n    chainId,\n    atomic: true,\n  };\n\n  const result = await client.getUserOperationByHash(hash);\n  if (\n    !result &&\n    GET_USER_OP_BY_HASH_UNLIMITED_RANGE_NETWORKS.includes(hexToNumber(chainId))\n  ) {\n    // This network has unlimited range, so we should always have a result here if the callId is valid.\n    throw new BaseError({\n      message: `callId ${callId} not found`,\n      code: ErrorCode.UNKNOWN_BUNDLE_ID,\n    });\n  }\n  if (result && !result.transactionHash) {\n    // A result but no txn hash means it's valid but pending.\n    return {\n      ...baseResp,\n      status: CallStatusCode.PENDING,\n    };\n  }\n\n  const receipt = await client.getUserOperationReceipt(hash);\n  if (result?.transactionHash && !receipt) {\n    // This should never happen.\n    throw new InternalError({\n      message: `Failed to get receipt for callId ${callId}`,\n    });\n  }\n  if (!receipt) {\n    // This covers txns older than 150 blocks which were not retrievable by \"eth_getUserOperationByHash\".\n    throw new BaseError({\n      message: `callId ${callId} not found`,\n      code: ErrorCode.UNKNOWN_BUNDLE_ID,\n    });\n  }\n\n  return {\n    ...baseResp,\n    status: receipt.success\n      ? CallStatusCode.CONFIRMED\n      : CallStatusCode.CHAIN_RULES_FAILURE,\n    receipts: [transformReceipt(receipt.receipt)],\n  };\n}\n\nfunction transformReceipt(\n  receipt: TransactionReceipt,\n): NonNullable<GetCallsStatusResponse[\"receipts\"]>[number] {\n  return {\n    // viem's type for status is \"success\" | \"reverted\", but the actual value seems to already be 0x0 or 0x1\n    status: isHex(receipt.status)\n      ? receipt.status\n      : ReceiptStatus[receipt.status],\n    blockHash: receipt.blockHash,\n    // viem's type for blockNumber is bigint, but the actual value seems to already be a hex string\n    blockNumber: castToHex(receipt.blockNumber),\n    // viem's type for gasUsed is bigint, but the actual value seems to already be a hex string\n    gasUsed: castToHex(receipt.gasUsed),\n    transactionHash: receipt.transactionHash,\n    logs: receipt.logs.map((log) => ({\n      address: log.address,\n      data: log.data,\n      topics: log.topics,\n    })),\n  };\n}\n"]}

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

@@ -2,22 +2,29 @@ import { deepHexlify, default7702GasEstimator, } from "@aa-sdk/core";
 import { ChainNotFoundError, custom, fromHex, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorization } from "../utils/7702.js";
+import { createAuthorization, parseDelegation } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import { assertValid7702AccountAddress } from "../utils/7702.js";
 export async function prepareCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
+    assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);
     // in local mode, we probably want some kind of caching for this
-    const { counterfactualInfo, delegation } = await client.request({
-        method: "wallet_requestAccount",
-        params: [
-            {
-                accountAddress: params.from,
-                includeCounterfactualInfo: true,
-            },
-        ],
-    });
+    const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth
+        ? {
+            counterfactualInfo: undefined,
+            delegation: parseDelegation(params.capabilities.eip7702Auth),
+        }
+        : await client.request({
+            method: "wallet_requestAccount",
+            params: [
+                {
+                    accountAddress: params.from,
+                    includeCounterfactualInfo: true,
+                },
+            ],
+        });
     if (!counterfactualInfo && !delegation) {
         throw new InvalidRequestError({
             message: "No counterfactual info or delegated implementation address found.",
@@ -29,7 +36,7 @@ export async function prepareCalls(client, params) {
         signer: createDummySigner(params.from),
         accountAddress: params.from,
         counterfactualInfo,
-        capabilities: params.capabilities,
+        permissions: params.capabilities?.permissions,
         delegation,
     });
     // If using 7702, we need an Authorization (unless it's already authorized).

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 { createAuthorization } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\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  // 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      {\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    capabilities: params.capabilities,\n    delegation,\n  });\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorization(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 the separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n  const uoRequest = deepHexlify(builtUo);\n\n  const signatureRequest = {\n    type: \"personal_sign\" as const,\n    data: {\n      raw: account.getEntryPoint().getUserOperationHash(uoRequest),\n    },\n  };\n\n  return {\n    type:\n      account.getEntryPoint().version === \"0.7.0\"\n        ? \"user-operation-v070\"\n        : \"user-operation-v060\",\n    data: uoRequest,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\n    },\n  };\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  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 { createAuthorization, parseDelegation } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\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 createAuthorization(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 the separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n  const uoRequest = deepHexlify(builtUo);\n\n  const signatureRequest = {\n    type: \"personal_sign\" as const,\n    data: {\n      raw: account.getEntryPoint().getUserOperationHash(uoRequest),\n    },\n  };\n\n  return {\n    type:\n      account.getEntryPoint().version === \"0.7.0\"\n        ? \"user-operation-v070\"\n        : \"user-operation-v060\",\n    data: uoRequest,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\n    },\n  };\n}\n"]}

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

@@ -3,7 +3,7 @@ import { Value } from "@sinclair/typebox/value";
 import { BaseError, ChainNotFoundError, concat, concatHex, toHex, } from "viem";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
 import { TypeCallId } from "../../schemas.js";
-import { isSupportedImplementationAddress7702 } from "../utils/7702.js";
+import { isSupportedDelegationAddress7702 } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
 // TODO: this only supports MAv2 right now, we need to fix this
 export async function sendPreparedCalls(client, params) {
@@ -12,7 +12,7 @@ export async function sendPreparedCalls(client, params) {
     }
     // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
     if (params.signedAuthorization &&
-        !isSupportedImplementationAddress7702(params.signedAuthorization.address)) {
+        !isSupportedDelegationAddress7702(params.signedAuthorization.address)) {
         throw new InvalidRequestError({
             message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,
         });

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 type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  toHex,\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 { isSupportedImplementationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type SendPreparedCallsParams = Omit<\n  StaticDecode<\n    (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\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  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    params.signedAuthorization &&\n    !isSupportedImplementationAddress7702(params.signedAuthorization.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,\n    });\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 entryPoint =\n    params.type === \"user-operation-v060\"\n      ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n      : getEntryPoint(client.chain, { version: \"0.7.0\" });\n\n  const hash = await client\n    .sendRawUserOperation(\n      {\n        ...params.data,\n        signature:\n          deferredAction != null\n            ? concatHex([\n                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).\n                \"0xff\",\n                \"0x00\",\n                params.signature.signature,\n              ])\n            : concat([\"0xFF\", \"0x00\", params.signature.signature]),\n        eip7702Auth: params.signedAuthorization,\n      },\n      entryPoint.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 'signedAuthorization' field in the request parameters)`,\n        );\n      }\n      throw err;\n    });\n\n  const callId = Value.Encode(TypeCallId, {\n    chainId: toHex(client.chain.id),\n    hash,\n  });\n\n  return {\n    preparedCallIds: [callId],\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 type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  toHex,\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\";\n\nexport type SendPreparedCallsParams = Omit<\n  StaticDecode<\n    (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\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  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    params.signedAuthorization &&\n    !isSupportedDelegationAddress7702(params.signedAuthorization.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,\n    });\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 entryPoint =\n    params.type === \"user-operation-v060\"\n      ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n      : getEntryPoint(client.chain, { version: \"0.7.0\" });\n\n  const hash = await client\n    .sendRawUserOperation(\n      {\n        ...params.data,\n        signature:\n          deferredAction != null\n            ? concatHex([\n                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).\n                \"0xff\",\n                \"0x00\",\n                params.signature.signature,\n              ])\n            : concat([\"0xFF\", \"0x00\", params.signature.signature]),\n        eip7702Auth: params.signedAuthorization,\n      },\n      entryPoint.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 'signedAuthorization' field in the request parameters)`,\n        );\n      }\n      throw err;\n    });\n\n  const callId = Value.Encode(TypeCallId, {\n    chainId: toHex(client.chain.id),\n    hash,\n  });\n\n  return {\n    preparedCallIds: [callId],\n  };\n}\n"]}

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

@@ -13,7 +13,7 @@ type ClientParams = {
 };
 export declare function isomorphicClientActions(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>): {
     prepareCalls: (params: PrepareCallsParams) => Promise<{
-        type: "user-operation-v070" | "user-operation-v060";
+        type: "user-operation-v060" | "user-operation-v070";
         chainId: `0x${string}`;
         data: {
             sender: `0x${string}`;

package/dist/esm/isomorphic/utils/7702.d.ts

@@ -1,11 +1,17 @@
 import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
 import { type Authorization, type Address, type Chain, type Transport } from "viem";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import type { Eip7702AuthCapability } from "../../capabilities/eip7702Auth.ts";
+import type { Static } from "@sinclair/typebox";
 export declare const createAuthorization: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
     address: Address;
     delegation: Address;
 }) => Promise<Authorization<number, false> | undefined>;
-type Supported7702AccountType = "ModularAccountV2";
-export declare const getAccountTypeForImplementationAddress7702: (address: Address) => Supported7702AccountType | undefined;
-export declare const isSupportedImplementationAddress7702: (address: string) => boolean;
+export declare const EIP_7702_ACCOUNT_TYPE: readonly ["ModularAccountV2"];
+type Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];
+export declare const SUPPORTED_DELEGATION_ADDRESSES: "0x69007702764179f14F51cdce752f4f775d74E139"[];
+export declare const isSupportedDelegationAddress7702: (address: Address) => boolean;
+export declare const getAccountTypeForDelegationAddress7702: (address: Address) => Supported7702AccountType | undefined;
+export declare const parseDelegation: (eip7702AuthCapability: Static<typeof Eip7702AuthCapability>) => "0x69007702764179f14F51cdce752f4f775d74E139";
+export declare const assertValid7702AccountAddress: (fromAddress: Address, eip7702AuthCapability: Static<typeof Eip7702AuthCapability> | undefined) => void;
 export {};

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

@@ -1,4 +1,5 @@
-import { concatHex, } from "viem";
+import { concatHex, isAddress, } from "viem";
+import { InvalidRequestError } from "ox/RpcResponse";
 export const createAuthorization = async (client, params) => {
     const expectedCode = concatHex(["0xef0100", params.delegation]);
     const code = (await client.getCode({ address: params.address })) ?? "0x";
@@ -13,14 +14,40 @@ export const createAuthorization = async (client, params) => {
         }),
     };
 };
-const IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE = {
-    "0x69007702764179f14F51cdce752f4f775d74E139": "ModularAccountV2",
+export const EIP_7702_ACCOUNT_TYPE = ["ModularAccountV2"];
+const Eip7702AccountTypeToDelegationAddress = {
+    ModularAccountV2: "0x69007702764179f14F51cdce752f4f775d74E139",
 };
-export const getAccountTypeForImplementationAddress7702 = (address) => {
-    return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];
+const DelegationAddressToAccountType = Object.fromEntries(Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [
+    value,
+    key,
+]));
+export const SUPPORTED_DELEGATION_ADDRESSES = Object.values(Eip7702AccountTypeToDelegationAddress);
+export const isSupportedDelegationAddress7702 = (address) => {
+    return SUPPORTED_DELEGATION_ADDRESSES.includes(address);
 };
-const SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE);
-export const isSupportedImplementationAddress7702 = (address) => {
-    return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(address);
+export const getAccountTypeForDelegationAddress7702 = (address) => {
+    return DelegationAddressToAccountType[address];
+};
+const getDelegationAddressForAccountType7702 = (accountType) => {
+    return Eip7702AccountTypeToDelegationAddress[accountType];
+};
+const DEFAULT_7702_DELEGATION_ADDR = Eip7702AccountTypeToDelegationAddress["ModularAccountV2"];
+export const parseDelegation = (eip7702AuthCapability) => {
+    return eip7702AuthCapability === true
+        ? DEFAULT_7702_DELEGATION_ADDR
+        : isAddress(eip7702AuthCapability.delegation)
+            ? eip7702AuthCapability.delegation
+            : 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}.`,
+        });
+    }
 };
 //# 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":"AACA,OAAO,EACL,SAAS,GAKV,MAAM,MAAM,CAAC;AAGd,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAMC,EACD,MAAiD,EACE,EAAE;IACrD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;IACzE,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC,CAAC,sBAAsB;IAC1C,CAAC;IACD,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,UAAU;QAC1B,KAAK,EAAE,MAAM,MAAM,CAAC,mBAAmB,CAAC;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAIF,MAAM,sCAAsC,GAGxC;IACF,4CAA4C,EAAE,kBAAkB;CACjE,CAAC;AAEF,MAAM,CAAC,MAAM,0CAA0C,GAAG,CACxD,OAAgB,EACsB,EAAE;IACxC,OAAO,sCAAsC,CAAC,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,kCAAkC,GAAG,MAAM,CAAC,IAAI,CACpD,sCAAsC,CACvC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAClD,OAAe,EACN,EAAE;IACX,OAAO,kCAAkC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  type Authorization,\n  type Address,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\n\nexport const createAuthorization = 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<Authorization<number, false> | 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  return {\n    chainId: client.chain.id,\n    address: params.delegation,\n    nonce: await client.getTransactionCount({\n      address: params.address,\n    }),\n  };\n};\n\ntype Supported7702AccountType = \"ModularAccountV2\";\n\nconst IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE: Record<\n  Address,\n  Supported7702AccountType\n> = {\n  \"0x69007702764179f14F51cdce752f4f775d74E139\": \"ModularAccountV2\",\n};\n\nexport const getAccountTypeForImplementationAddress7702 = (\n  address: Address,\n): Supported7702AccountType | undefined => {\n  return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];\n};\n\nconst SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(\n  IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE,\n);\n\nexport const isSupportedImplementationAddress7702 = (\n  address: string,\n): boolean => {\n  return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(address);\n};\n"]}
+{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EAKT,SAAS,GACV,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAMC,EACD,MAAiD,EACE,EAAE;IACrD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;IACzE,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC,CAAC,sBAAsB;IAC1C,CAAC;IACD,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,UAAU;QAC1B,KAAK,EAAE,MAAM,MAAM,CAAC,mBAAmB,CAAC;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,kBAAkB,CAAU,CAAC;AAInE,MAAM,qCAAqC,GAAG;IAC5C,gBAAgB,EAAE,4CAA4C;CACF,CAAC;AAE/D,MAAM,8BAA8B,GAGhC,MAAM,CAAC,WAAW,CACpB,MAAM,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1E,KAAK;IACL,GAAG;CACJ,CAAC,CAC0C,CAAC;AAE/C,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,MAAM,CACzD,qCAAqC,CACtC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,OAAgB,EAAW,EAAE;IAC5E,OAAQ,8BAA4C,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,OAAgB,EACsB,EAAE;IACxC,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,sCAAsC,GAAG,CAC7C,WAAqC,EACY,EAAE;IACnD,OAAO,qCAAqC,CAAC,WAAW,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAChC,qCAAqC,CAAC,kBAAkB,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,qBAA2D,EAC3D,EAAE;IACF,OAAO,qBAAqB,KAAK,IAAI;QACnC,CAAC,CAAC,4BAA4B;QAC9B,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC;YAC3C,CAAC,CAAC,qBAAqB,CAAC,UAAU;YAClC,CAAC,CAAC,sCAAsC,CACpC,qBAAqB,CAAC,UAAU,CACjC,CAAC;AACV,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,WAAoB,EACpB,qBAAuE,EACvE,EAAE;IACF,IACE,qBAAqB;QACrB,OAAO,qBAAqB,KAAK,QAAQ;QACzC,SAAS,IAAI,qBAAqB;QAClC,qBAAqB,EAAE,OAAO,KAAK,WAAW,EAC9C,CAAC;QACD,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,+BAA+B,qBAAqB,CAAC,OAAO,8BAA8B,WAAW,GAAG;SAClH,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  type Authorization,\n  type Address,\n  type Chain,\n  type Transport,\n  isAddress,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport type { Eip7702AuthCapability } from \"../../capabilities/eip7702Auth.ts\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport const createAuthorization = 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<Authorization<number, false> | 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  return {\n    chainId: client.chain.id,\n    address: params.delegation,\n    nonce: await client.getTransactionCount({\n      address: params.address,\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"]}

package/dist/esm/isomorphic/utils/createAccount.d.ts

@@ -2,16 +2,16 @@ import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
 import { type ModularAccountV2 } from "@account-kit/smart-contracts";
 import type { StaticDecode } from "@sinclair/typebox";
 import type { Address, Chain, Transport } from "viem";
-import type { Capabilities } from "../../capabilities/index.js";
 import type { TypeSerializedInitcode } from "../../schemas.js";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 type CreateAccountParams = {
     chain: Chain;
     transport: Transport;
     signer: SmartAccountSigner;
     accountAddress: Address;
     counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>;
+    permissions?: StaticDecode<typeof PermissionsCapability>;
     delegation?: Address;
-    capabilities?: StaticDecode<typeof Capabilities>;
 };
 /**
  * Creates a smart account instance from the given parameters.

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

@@ -2,8 +2,9 @@ import { createModularAccountV2, } from "@account-kit/smart-contracts";
 import { concatHex, hexToNumber } from "viem";
 import { parsePermissionsContext } from "./parsePermissionsContext.js";
 import { assertNever } from "../../utils.js";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
 import { InternalError } from "ox/RpcResponse";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 /**
  * Creates a smart account instance from the given parameters.
  * @param params - The parameters for creating a smart account.
@@ -25,7 +26,7 @@ export async function createAccount(params) {
         }
     }
     else if (mode === "7702") {
-        const accountType = getAccountTypeForImplementationAddress7702(params.delegation);
+        const accountType = getAccountTypeForDelegationAddress7702(params.delegation);
         if (accountType !== "ModularAccountV2") {
             throw new InternalError({
                 message: "7702 mode currently only supports ModularAccountV2",
@@ -35,7 +36,7 @@ export async function createAccount(params) {
     else {
         assertNever(mode, "Unexpected mode in createAccount");
     }
-    const parsedContext = parsePermissionsContext(params.capabilities, ci, params.delegation);
+    const parsedContext = parsePermissionsContext(params.permissions, ci, params.delegation);
     const signerEntity = parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
         ? {
             entityId: hexToNumber(parsedContext.entityId),

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

@@ -1 +1 @@
-{"version":3,"file":"createAccount.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createAccount.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,GAEvB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,0CAA0C,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAY/C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B;IAE3B,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC;IAE5D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,WAAW,KAAK,gBAAgB,EAAE,CAAC;YACxC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,8BAA8B;aACtE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,0CAA0C,CAC5D,MAAM,CAAC,UAAW,CACnB,CAAC;QACF,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACvC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,oDAAoD;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,MAAM,CAAC,YAAY,EACnB,EAAE,EACF,MAAM,CAAC,UAAU,CAClB,CAAC;IAEF,MAAM,YAAY,GAChB,aAAa,EAAE,cAAc,KAAK,qBAAqB;QACrD,CAAC,CAAC;YACE,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC;YAC7C,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;SACrD;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,0DAA0D;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,GAAG,aAAa;QAChB,YAAY;QACZ,cAAc,EAAE,aAAa,EAAE,cAAc;QAC7C,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAA6B;IAE7B,OAAO,OAAO,CAAC,MAAM,KAAK,kBAAkB,CAAC;AAC/C,CAAC","sourcesContent":["import type { SmartAccountSigner, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  createModularAccountV2,\n  type ModularAccountV2,\n} from \"@account-kit/smart-contracts\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport type { Address, Chain, Transport } from \"viem\";\nimport { concatHex, hexToNumber } from \"viem\";\nimport type { Capabilities } from \"../../capabilities/index.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForImplementationAddress7702 } from \"./7702.js\";\nimport { InternalError } from \"ox/RpcResponse\";\n\ntype CreateAccountParams = {\n  chain: Chain;\n  transport: Transport;\n  signer: SmartAccountSigner;\n  accountAddress: Address;\n  counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>; // undefined for 7702 accounts\n  delegation?: Address;\n  capabilities?: StaticDecode<typeof Capabilities>;\n};\n\n/**\n * Creates a smart account instance from the given parameters.\n * @param params - The parameters for creating a smart account.\n * @returns A promise that resolves to the created smart account.\n */\nexport async function createAccount(\n  params: CreateAccountParams,\n): Promise<SmartContractAccount> {\n  const { counterfactualInfo: ci, ...accountParams } = params;\n\n  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"default\") {\n    if (!ci) {\n      throw new InternalError({\n        message: \"Counterfactual info not found\",\n      });\n    }\n    if (ci.factoryType !== \"MAv2.0.0-sma-b\") {\n      throw new InternalError({\n        message: `Factory type ${ci.factoryType} is not currently supported.`,\n      });\n    }\n  } else if (mode === \"7702\") {\n    const accountType = getAccountTypeForImplementationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new InternalError({\n        message: \"7702 mode currently only supports ModularAccountV2\",\n      });\n    }\n  } else {\n    assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\n  const parsedContext = parsePermissionsContext(\n    params.capabilities,\n    ci,\n    params.delegation,\n  );\n\n  const signerEntity =\n    parsedContext?.contextVersion === \"NON_DEFERRED_ACTION\"\n      ? {\n          entityId: hexToNumber(parsedContext.entityId),\n          isGlobalValidation: parsedContext.isGlobalValidation,\n        }\n      : undefined;\n\n  // TODO: clean this up to support different account types.\n  return createModularAccountV2({\n    ...accountParams,\n    signerEntity,\n    deferredAction: parsedContext?.deferredAction,\n    initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,\n    mode,\n  });\n}\n\nexport function isModularAccountV2(\n  account: SmartContractAccount,\n): account is ModularAccountV2 {\n  return account.source === \"ModularAccountV2\";\n}\n"]}
+{"version":3,"file":"createAccount.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createAccount.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,GAEvB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAYhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B;IAE3B,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC;IAE5D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,WAAW,KAAK,gBAAgB,EAAE,CAAC;YACxC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,8BAA8B;aACtE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,sCAAsC,CACxD,MAAM,CAAC,UAAW,CACnB,CAAC;QACF,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACvC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,oDAAoD;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,MAAM,CAAC,WAAW,EAClB,EAAE,EACF,MAAM,CAAC,UAAU,CAClB,CAAC;IAEF,MAAM,YAAY,GAChB,aAAa,EAAE,cAAc,KAAK,qBAAqB;QACrD,CAAC,CAAC;YACE,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC;YAC7C,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;SACrD;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,0DAA0D;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,GAAG,aAAa;QAChB,YAAY;QACZ,cAAc,EAAE,aAAa,EAAE,cAAc;QAC7C,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAA6B;IAE7B,OAAO,OAAO,CAAC,MAAM,KAAK,kBAAkB,CAAC;AAC/C,CAAC","sourcesContent":["import type { SmartAccountSigner, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  createModularAccountV2,\n  type ModularAccountV2,\n} from \"@account-kit/smart-contracts\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport type { Address, Chain, Transport } from \"viem\";\nimport { concatHex, hexToNumber } from \"viem\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { InternalError } from \"ox/RpcResponse\";\nimport { PermissionsCapability } from \"../../capabilities/permissions/index.js\";\n\ntype CreateAccountParams = {\n  chain: Chain;\n  transport: Transport;\n  signer: SmartAccountSigner;\n  accountAddress: Address;\n  counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>; // undefined for 7702 accounts\n  permissions?: StaticDecode<typeof PermissionsCapability>;\n  delegation?: Address;\n};\n\n/**\n * Creates a smart account instance from the given parameters.\n * @param params - The parameters for creating a smart account.\n * @returns A promise that resolves to the created smart account.\n */\nexport async function createAccount(\n  params: CreateAccountParams,\n): Promise<SmartContractAccount> {\n  const { counterfactualInfo: ci, ...accountParams } = params;\n\n  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"default\") {\n    if (!ci) {\n      throw new InternalError({\n        message: \"Counterfactual info not found\",\n      });\n    }\n    if (ci.factoryType !== \"MAv2.0.0-sma-b\") {\n      throw new InternalError({\n        message: `Factory type ${ci.factoryType} is not currently supported.`,\n      });\n    }\n  } else if (mode === \"7702\") {\n    const accountType = getAccountTypeForDelegationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new InternalError({\n        message: \"7702 mode currently only supports ModularAccountV2\",\n      });\n    }\n  } else {\n    assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\n  const parsedContext = parsePermissionsContext(\n    params.permissions,\n    ci,\n    params.delegation,\n  );\n\n  const signerEntity =\n    parsedContext?.contextVersion === \"NON_DEFERRED_ACTION\"\n      ? {\n          entityId: hexToNumber(parsedContext.entityId),\n          isGlobalValidation: parsedContext.isGlobalValidation,\n        }\n      : undefined;\n\n  // TODO: clean this up to support different account types.\n  return createModularAccountV2({\n    ...accountParams,\n    signerEntity,\n    deferredAction: parsedContext?.deferredAction,\n    initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,\n    mode,\n  });\n}\n\nexport function isModularAccountV2(\n  account: SmartContractAccount,\n): account is ModularAccountV2 {\n  return account.source === \"ModularAccountV2\";\n}\n"]}

package/dist/esm/isomorphic/utils/parsePermissionsContext.d.ts

@@ -1,8 +1,8 @@
 import type { StaticDecode } from "@sinclair/typebox";
 import type { TypeSerializedInitcode } from "../../schemas.js";
-import type { PrepareCallsParams } from "../actions/prepareCalls.js";
 import type { Address } from "viem";
-export declare function parsePermissionsContext(capabilities: PrepareCallsParams["capabilities"], parsedCi: StaticDecode<typeof TypeSerializedInitcode> | undefined, delegation7702?: Address): ({
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
+export declare function parsePermissionsContext(permissions?: StaticDecode<typeof PermissionsCapability>, parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined, delegation7702?: Address): ({
     contextVersion: keyof typeof import("../../exports/internal.js").PermissionsContextVersion;
 } & {
     contextVersion: "LOCAL_MODE_DEFERRED_ACTION";

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

@@ -1,28 +1,29 @@
 import { InvalidRequestError } from "ox/RpcResponse";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
-export function parsePermissionsContext(capabilities, parsedCi, delegation7702) {
-    if (!capabilities?.permissions) {
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
+export function parsePermissionsContext(permissions, parsedCi, delegation7702) {
+    if (!permissions) {
         return undefined;
     }
-    if ("sessionId" in capabilities.permissions) {
+    if ("sessionId" in permissions) {
         throw new InvalidRequestError({
             message: "Remote permissions are not supported in isomorphic client",
         });
     }
-    if (!("context" in capabilities.permissions)) {
+    if (!("context" in permissions)) {
         return undefined;
     }
     const isMAV2 = (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
         (delegation7702 &&
-            getAccountTypeForImplementationAddress7702(delegation7702) ===
+            getAccountTypeForDelegationAddress7702(delegation7702) ===
                 "ModularAccountV2");
     if (!isMAV2) {
         throw new InvalidRequestError({
             message: "Permissions are currently only supported by MAv2 accounts",
         });
     }
-    const context = decodePermissionsContext(capabilities.permissions);
+    const context = decodePermissionsContext(permissions);
     if (context?.contextVersion === "REMOTE_MODE_DEFERRED_ACTION") {
         throw new InvalidRequestError({
             message: "Remote mode deferred action not supported in isomorphic client",

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

@@ -1 +1 @@
-{"version":3,"file":"parsePermissionsContext.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/parsePermissionsContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAIlF,OAAO,EAAE,0CAA0C,EAAE,MAAM,WAAW,CAAC;AAEvE,MAAM,UAAU,uBAAuB,CACrC,YAAgD,EAChD,QAAiE,EACjE,cAAwB;IAExB,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,WAAW,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,CAAC,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GACV,CAAC,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC;QACvD,CAAC,cAAc;YACb,0CAA0C,CAAC,cAAc,CAAC;gBACxD,kBAAkB,CAAC,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEnE,IAAI,OAAO,EAAE,cAAc,KAAK,6BAA6B,EAAE,CAAC;QAC9D,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport type { PrepareCallsParams } from \"../actions/prepareCalls.js\";\nimport type { Address } from \"viem\";\nimport { getAccountTypeForImplementationAddress7702 } from \"./7702.js\";\n\nexport function parsePermissionsContext(\n  capabilities: PrepareCallsParams[\"capabilities\"],\n  parsedCi: StaticDecode<typeof TypeSerializedInitcode> | undefined,\n  delegation7702?: Address,\n) {\n  if (!capabilities?.permissions) {\n    return undefined;\n  }\n\n  if (\"sessionId\" in capabilities.permissions) {\n    throw new InvalidRequestError({\n      message: \"Remote permissions are not supported in isomorphic client\",\n    });\n  }\n\n  if (!(\"context\" in capabilities.permissions)) {\n    return undefined;\n  }\n\n  const isMAV2 =\n    (parsedCi && parsedCi.factoryType === \"MAv2.0.0-sma-b\") ||\n    (delegation7702 &&\n      getAccountTypeForImplementationAddress7702(delegation7702) ===\n        \"ModularAccountV2\");\n\n  if (!isMAV2) {\n    throw new InvalidRequestError({\n      message: \"Permissions are currently only supported by MAv2 accounts\",\n    });\n  }\n\n  const context = decodePermissionsContext(capabilities.permissions);\n\n  if (context?.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n    throw new InvalidRequestError({\n      message: \"Remote mode deferred action not supported in isomorphic client\",\n    });\n  }\n\n  return context;\n}\n"]}
+{"version":3,"file":"parsePermissionsContext.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/parsePermissionsContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,OAAO,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,MAAM,UAAU,uBAAuB,CACrC,WAAwD,EACxD,QAAkE,EAClE,cAAwB;IAExB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GACV,CAAC,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC;QACvD,CAAC,cAAc;YACb,sCAAsC,CAAC,cAAc,CAAC;gBACpD,kBAAkB,CAAC,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAEtD,IAAI,OAAO,EAAE,cAAc,KAAK,6BAA6B,EAAE,CAAC;QAC9D,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport type { Address } from \"viem\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { PermissionsCapability } from \"../../capabilities/permissions/index.js\";\n\nexport function parsePermissionsContext(\n  permissions?: StaticDecode<typeof PermissionsCapability>,\n  parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined,\n  delegation7702?: Address,\n) {\n  if (!permissions) {\n    return undefined;\n  }\n\n  if (\"sessionId\" in permissions) {\n    throw new InvalidRequestError({\n      message: \"Remote permissions are not supported in isomorphic client\",\n    });\n  }\n\n  if (!(\"context\" in permissions)) {\n    return undefined;\n  }\n\n  const isMAV2 =\n    (parsedCi && parsedCi.factoryType === \"MAv2.0.0-sma-b\") ||\n    (delegation7702 &&\n      getAccountTypeForDelegationAddress7702(delegation7702) ===\n        \"ModularAccountV2\");\n\n  if (!isMAV2) {\n    throw new InvalidRequestError({\n      message: \"Permissions are currently only supported by MAv2 accounts\",\n    });\n  }\n\n  const context = decodePermissionsContext(permissions);\n\n  if (context?.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n    throw new InvalidRequestError({\n      message: \"Remote mode deferred action not supported in isomorphic client\",\n    });\n  }\n\n  return context;\n}\n"]}

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

@@ -1,3 +1,3 @@
-import { type Address, type JsonRpcAccount } from "viem";
+import { type Address } from "viem";
 import type { CreateInnerClientParams, InnerWalletApiClient } from "../types.ts";
-export declare function createLocalClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
+export declare function createLocalClient<TAccount extends Address | undefined = Address | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;