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

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  if (!userOps.length) {\n    throw new InvalidRequestError({\n      message: \"Calls must include at least one user operation\",\n    });\n  }\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          case \"MAv1.0.0-MultiOwner\":\n            // For LAv1 and MAv1-MultiOwner, 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            // TODO: Once we support nested smart accounts, switch this byte depending on the signature type.\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 \"LightAccountV2.0.0-MultiOwner\":\n            // for LAv2-MultiOwner, we need to prepend the \"SignatureType.EOA\" byte\n            // TODO: Once we support nested smart accounts, switch this byte depending on the signature type, and add the smart account signer's address.\n            return concat([\"0x00\", uoSigHex]);\n          case \"MAv2.0.0-ma-ssv\":\n          case \"MAv2.0.0-ma-webauthn\":\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.d.ts

@@ -4,10 +4,15 @@ import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
 import { PreparedCall_Authorization } from "../../schemas.js";
 import type { Eip7702AuthCapability } from "../../capabilities/eip7702Auth.ts";
 import type { Static } from "@sinclair/typebox";
+/** Checks if an address is actively delegated on-chain. */
+export declare const isDelegated: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
+    address: Address;
+    delegation: Address;
+}) => Promise<boolean>;
 export declare const createAuthorizationRequest: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
     address: Address;
     delegation: Address;
-}) => Promise<Static<typeof PreparedCall_Authorization> | undefined>;
+}) => Promise<Static<typeof PreparedCall_Authorization>>;
 export declare const EIP_7702_ACCOUNT_TYPE: readonly ["ModularAccountV2"];
 type Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];
 export declare const SUPPORTED_DELEGATION_ADDRESSES: "0x69007702764179f14F51cdce752f4f775d74E139"[];

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

@@ -1,12 +1,14 @@
-import { concatHex, numberToHex, isAddress, } from "viem";
+import { concatHex, numberToHex, isAddress, hexToNumber, } from "viem";
 import { PreparedCall_Authorization } from "../../schemas.js";
 import { InvalidRequestError } from "ox/RpcResponse";
-export const createAuthorizationRequest = async (client, params) => {
+import { hashAuthorization } from "viem/utils";
+/** Checks if an address is actively delegated on-chain. */
+export const isDelegated = async (client, params) => {
     const expectedCode = concatHex(["0xef0100", params.delegation]);
     const code = (await client.getCode({ address: params.address })) ?? "0x";
-    if (code.toLowerCase() === expectedCode.toLowerCase()) {
-        return undefined; // Already authorized.
-    }
+    return code.toLowerCase() === expectedCode.toLowerCase();
+};
+export const createAuthorizationRequest = async (client, params) => {
     const data = {
         address: params.delegation,
         nonce: numberToHex(await client.getTransactionCount({
@@ -19,6 +21,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 +56,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":"AACA,OAAO,EACL,SAAS,EACT,WAAW,EAIX,SAAS,GACV,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAG9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,MAMC,EACD,MAAiD,EACe,EAAE;IAClE,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,MAAM,IAAI,GAAG;QACX,OAAO,EAAE,MAAM,CAAC,UAAU;QAC1B,KAAK,EAAE,WAAW,CAChB,MAAM,MAAM,CAAC,mBAAmB,CAAC;YAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CACH;KACF,CAAC;IACF,OAAO;QACL,IAAI,EAAE,eAAwB;QAC9B,IAAI;QACJ,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,gBAAgB,EAAE;YAChB,IAAI,EAAE,aAAsB;SAC7B;KACF,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  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\n/** Checks if an address is actively delegated on-chain. */\nexport const isDelegated = 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<boolean> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  return code.toLowerCase() === expectedCode.toLowerCase();\n};\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>> => {\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"]}

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

@@ -20,4 +20,5 @@ type CreateAccountParams = {
  */
 export declare function createAccount(params: CreateAccountParams): Promise<SmartContractAccount>;
 export declare function isModularAccountV2(account: SmartContractAccount): account is ModularAccountV2;
+export declare function prepareInitialOwners(initialOwners: Address[], signerAddress: Address): Address[];
 export {};

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

@@ -1,10 +1,10 @@
-import { createModularAccountV2, } from "@account-kit/smart-contracts";
-import { concatHex, hexToNumber } from "viem";
+import { createLightAccount, createModularAccountV2, createMultiOwnerLightAccount, createMultiOwnerModularAccount, } from "@account-kit/smart-contracts";
+import { concatHex, hexToBigInt, hexToNumber, zeroAddress } from "viem";
 import { parsePermissionsContext } from "./parsePermissionsContext.js";
 import { assertNever } from "../../utils.js";
 import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
-import { InternalError } from "ox/RpcResponse";
 import { PermissionsCapability } from "../../capabilities/permissions/index.js";
+import { InternalError, InvalidRequestError } from "ox/RpcResponse";
 /**
  * Creates a smart account instance from the given parameters.
  * @param params - The parameters for creating a smart account.
@@ -12,30 +12,8 @@ import { PermissionsCapability } from "../../capabilities/permissions/index.js";
  */
 export async function createAccount(params) {
     const { counterfactualInfo: ci, ...accountParams } = params;
-    const mode = params.delegation ? "7702" : "default";
-    if (mode === "default") {
-        if (!ci) {
-            throw new InternalError({
-                message: "Counterfactual info not found",
-            });
-        }
-        if (ci.factoryType !== "MAv2.0.0-sma-b") {
-            throw new InternalError({
-                message: `Factory type ${ci.factoryType} is not currently supported.`,
-            });
-        }
-    }
-    else if (mode === "7702") {
-        const accountType = getAccountTypeForDelegationAddress7702(params.delegation);
-        if (accountType !== "ModularAccountV2") {
-            throw new InternalError({
-                message: "7702 mode currently only supports ModularAccountV2",
-            });
-        }
-    }
-    else {
-        assertNever(mode, "Unexpected mode in createAccount");
-    }
+    // This throws if we pass a permission context and the account is not MA-v2
+    // TODO: test that this edge case is handled correctly
     const parsedContext = parsePermissionsContext(params.permissions, ci, params.delegation);
     const signerEntity = parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
         ? {
@@ -43,16 +21,100 @@ export async function createAccount(params) {
             isGlobalValidation: parsedContext.isGlobalValidation,
         }
         : undefined;
-    // TODO: clean this up to support different account types.
-    return createModularAccountV2({
+    const mode = params.delegation ? "7702" : "default";
+    if (mode === "7702") {
+        const accountType = getAccountTypeForDelegationAddress7702(params.delegation);
+        if (accountType !== "ModularAccountV2") {
+            throw new Error("7702 mode currently only supports ModularAccountV2");
+        }
+        return createModularAccountV2({
+            ...accountParams,
+            signerEntity,
+            deferredAction: parsedContext?.deferredAction,
+            mode,
+        });
+    }
+    if (mode !== "default") {
+        return assertNever(mode, "Unexpected mode in createAccount");
+    }
+    // At this point, we are guaranteed to be in default mode, where ci
+    // (counterfactualInfo) must be defined
+    if (!ci) {
+        throw new InternalError({
+            message: "Counterfactual info not found",
+        });
+    }
+    const factoryType = ci.factoryType;
+    const commonParams = {
         ...accountParams,
-        signerEntity,
-        deferredAction: parsedContext?.deferredAction,
-        initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,
-        mode,
-    });
+        initCode: concatHex([ci.factoryAddress, ci.factoryData]),
+    };
+    // Return the account created based on the factory type
+    switch (factoryType) {
+        case "MAv2.0.0-sma-b":
+            return createModularAccountV2({
+                ...commonParams,
+                signerEntity,
+                deferredAction: parsedContext?.deferredAction,
+                mode,
+            });
+        case "LightAccountV2.0.0":
+            return createLightAccount({
+                ...commonParams,
+                version: "v2.0.0",
+            });
+        case "LightAccountV1.0.1":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.0.1",
+            });
+        case "LightAccountV1.0.2":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.0.2",
+            });
+        case "LightAccountV1.1.0":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.1.0",
+            });
+        case "MAv1.0.0-MultiOwner":
+            return createMultiOwnerModularAccount({
+                ...commonParams,
+            });
+        case "LightAccountV2.0.0-MultiOwner":
+            return createMultiOwnerLightAccount({
+                ...commonParams,
+                version: "v2.0.0",
+            });
+        case "MAv1.0.0-MultiSig":
+        case "MAv2.0.0-ma-ssv":
+        case "MAv2.0.0-ma-webauthn":
+        case "unknown":
+        case undefined:
+            throw new InvalidRequestError({
+                message: `Account type currently unsupported: ${factoryType}`,
+            });
+        default:
+            return assertNever(factoryType, "Unsupported factory type");
+    }
 }
 export function isModularAccountV2(account) {
     return account.source === "ModularAccountV2";
 }
+// Performs basic checks on the initialOwners array and returns a new array with the signer address added if not present.
+// Pulled from MAv1 support in Account Kit.
+export function prepareInitialOwners(initialOwners, signerAddress) {
+    const preparedOwners = Array.from(new Set([...initialOwners, signerAddress])).sort((a, b) => {
+        const bigintA = hexToBigInt(a);
+        const bigintB = hexToBigInt(b);
+        return bigintA < bigintB ? -1 : bigintA > bigintB ? 1 : 0;
+    });
+    if (preparedOwners.some((x) => x === zeroAddress)) {
+        throw new InvalidRequestError({
+            message: "Initial owners cannot contain the zero address",
+        });
+    }
+    return preparedOwners;
+}
 //# sourceMappingURL=createAccount.js.map

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;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"]}
+{"version":3,"file":"createAccount.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createAccount.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  createLightAccount,\n  createModularAccountV2,\n  createMultiOwnerLightAccount,\n  createMultiOwnerModularAccount,\n  type ModularAccountV2,\n} from \"@account-kit/smart-contracts\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport type { Address, Chain, Transport } from \"viem\";\nimport { concatHex, hexToBigInt, hexToNumber, zeroAddress } from \"viem\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { PermissionsCapability } from \"../../capabilities/permissions/index.js\";\nimport { InternalError, InvalidRequestError } 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  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  // This throws if we pass a permission context and the account is not MA-v2\n  // TODO: test that this edge case is handled correctly\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  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"7702\") {\n    const accountType = getAccountTypeForDelegationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new Error(\"7702 mode currently only supports ModularAccountV2\");\n    }\n    return createModularAccountV2({\n      ...accountParams,\n      signerEntity,\n      deferredAction: parsedContext?.deferredAction,\n      mode,\n    });\n  }\n\n  if (mode !== \"default\") {\n    return assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\n  // At this point, we are guaranteed to be in default mode, where ci\n  // (counterfactualInfo) must be defined\n\n  if (!ci) {\n    throw new InternalError({\n      message: \"Counterfactual info not found\",\n    });\n  }\n\n  const factoryType = ci.factoryType;\n  const commonParams = {\n    ...accountParams,\n    initCode: concatHex([ci.factoryAddress, ci.factoryData]),\n  };\n\n  // Return the account created based on the factory type\n  switch (factoryType) {\n    case \"MAv2.0.0-sma-b\":\n      return createModularAccountV2({\n        ...commonParams,\n        signerEntity,\n        deferredAction: parsedContext?.deferredAction,\n        mode,\n      });\n    case \"LightAccountV2.0.0\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v2.0.0\",\n      });\n    case \"LightAccountV1.0.1\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.0.1\",\n      });\n    case \"LightAccountV1.0.2\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.0.2\",\n      });\n    case \"LightAccountV1.1.0\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.1.0\",\n      });\n    case \"MAv1.0.0-MultiOwner\":\n      return createMultiOwnerModularAccount({\n        ...commonParams,\n      });\n    case \"LightAccountV2.0.0-MultiOwner\":\n      return createMultiOwnerLightAccount({\n        ...commonParams,\n        version: \"v2.0.0\",\n      });\n    case \"MAv1.0.0-MultiSig\":\n    case \"MAv2.0.0-ma-ssv\":\n    case \"MAv2.0.0-ma-webauthn\":\n    case \"unknown\":\n    case undefined:\n      throw new InvalidRequestError({\n        message: `Account type currently unsupported: ${factoryType}`,\n      });\n    default:\n      return assertNever(factoryType, \"Unsupported factory type\");\n  }\n}\n\nexport function isModularAccountV2(\n  account: SmartContractAccount,\n): account is ModularAccountV2 {\n  return account.source === \"ModularAccountV2\";\n}\n\n// Performs basic checks on the initialOwners array and returns a new array with the signer address added if not present.\n// Pulled from MAv1 support in Account Kit.\nexport function prepareInitialOwners(\n  initialOwners: Address[],\n  signerAddress: Address,\n): Address[] {\n  const preparedOwners = Array.from(\n    new Set([...initialOwners, signerAddress]),\n  ).sort((a, b) => {\n    const bigintA = hexToBigInt(a);\n    const bigintB = hexToBigInt(b);\n\n    return bigintA < bigintB ? -1 : bigintA > bigintB ? 1 : 0;\n  });\n\n  if (preparedOwners.some((x) => x === zeroAddress)) {\n    throw new InvalidRequestError({\n      message: \"Initial owners cannot contain the zero address\",\n    });\n  }\n\n  return preparedOwners;\n}\n"]}

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

@@ -0,0 +1,4 @@
+import type { StaticDecode } from "@sinclair/typebox";
+import type { TypeSerializedInitcode } from "../../schemas.ts";
+export type Feature = "permissions";
+export declare function supportsFeature(counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>, feature: Feature): boolean;

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

@@ -0,0 +1,21 @@
+const supportedFeatures = {
+    "LightAccountV1.0.1": [],
+    "LightAccountV1.0.2": [],
+    "LightAccountV1.1.0": [],
+    "LightAccountV2.0.0": [],
+    "LightAccountV2.0.0-MultiOwner": [],
+    "MAv1.0.0-MultiOwner": [],
+    "MAv1.0.0-MultiSig": [],
+    "MAv2.0.0-sma-b": ["permissions"],
+    "MAv2.0.0-ma-ssv": ["permissions"],
+    "MAv2.0.0-ma-webauthn": [],
+    unknown: [],
+};
+export function supportsFeature(counterfactualInfo, feature) {
+    const factorySupportedFeatures = supportedFeatures[counterfactualInfo.factoryType];
+    if (factorySupportedFeatures === undefined) {
+        throw new Error("Unsupported FactoryType: " + counterfactualInfo.factoryType);
+    }
+    return factorySupportedFeatures.includes(feature);
+}
+//# sourceMappingURL=supportsFeature.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"supportsFeature.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/supportsFeature.ts"],"names":[],"mappings":"AAOA,MAAM,iBAAiB,GAAmC;IACxD,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,+BAA+B,EAAE,EAAE;IACnC,qBAAqB,EAAE,EAAE;IACzB,mBAAmB,EAAE,EAAE;IACvB,gBAAgB,EAAE,CAAC,aAAa,CAAC;IACjC,iBAAiB,EAAE,CAAC,aAAa,CAAC;IAClC,sBAAsB,EAAE,EAAE;IAC1B,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,UAAU,eAAe,CAC7B,kBAA+D,EAC/D,OAAgB;IAEhB,MAAM,wBAAwB,GAC5B,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,2BAA2B,GAAG,kBAAkB,CAAC,WAAW,CAC7D,CAAC;IACJ,CAAC;IACD,OAAO,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpD,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport type { TypeSerializedInitcode } from \"../../schemas.ts\";\n\nexport type Feature = \"permissions\";\n\ntype FactoryType = StaticDecode<typeof TypeSerializedInitcode>[\"factoryType\"];\n\nconst supportedFeatures: Record<FactoryType, Feature[]> = {\n  \"LightAccountV1.0.1\": [],\n  \"LightAccountV1.0.2\": [],\n  \"LightAccountV1.1.0\": [],\n  \"LightAccountV2.0.0\": [],\n  \"LightAccountV2.0.0-MultiOwner\": [],\n  \"MAv1.0.0-MultiOwner\": [],\n  \"MAv1.0.0-MultiSig\": [],\n  \"MAv2.0.0-sma-b\": [\"permissions\"],\n  \"MAv2.0.0-ma-ssv\": [\"permissions\"],\n  \"MAv2.0.0-ma-webauthn\": [],\n  unknown: [],\n};\n\nexport function supportsFeature(\n  counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>,\n  feature: Feature,\n): boolean {\n  const factorySupportedFeatures =\n    supportedFeatures[counterfactualInfo.factoryType];\n  if (factorySupportedFeatures === undefined) {\n    throw new Error(\n      \"Unsupported FactoryType: \" + counterfactualInfo.factoryType,\n    );\n  }\n  return factorySupportedFeatures.includes(feature);\n}\n"]}