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

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

@@ -1,10 +1,10 @@
-import { createModularAccountV2, } from "@account-kit/smart-contracts";
+import { createLightAccount, createModularAccountV2, } from "@account-kit/smart-contracts";
 import { concatHex, hexToNumber } 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,14 +21,76 @@ 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 "LightAccountV2.0.0-MultiOwner":
+        case "MAv1.0.0-MultiOwner":
+        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";

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  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 { 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 \"LightAccountV2.0.0-MultiOwner\":\n    case \"MAv1.0.0-MultiOwner\":\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"]}

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"]}

package/dist/esm/rpc/request.d.ts

@@ -287,6 +287,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                 data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
                     raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
                 }>]>;
+                rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>, import("@sinclair/typebox").TObject<{
                 type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
                 data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -322,6 +323,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                         [x: string]: unknown;
                     };
                 }>;
+                rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>]>;
         }>, import("@sinclair/typebox").TObject<{
             type: import("@sinclair/typebox").TLiteral<"user-operation-v070">;
@@ -347,6 +349,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                 data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
                     raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
                 }>]>;
+                rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>, import("@sinclair/typebox").TObject<{
                 type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
                 data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -382,6 +385,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                         [x: string]: unknown;
                     };
                 }>;
+                rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>]>;
         }>, import("@sinclair/typebox").TObject<{
             type: import("@sinclair/typebox").TLiteral<"authorization">;
@@ -392,6 +396,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
             chainId: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             signatureRequest: import("@sinclair/typebox").TObject<{
                 type: import("@sinclair/typebox").TLiteral<"eip7702Auth">;
+                rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>;
         }>]>>;
     }>, import("@sinclair/typebox").TObject<{
@@ -414,6 +419,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
             data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
                 raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>]>;
+            rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>, import("@sinclair/typebox").TObject<{
             type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
             data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -449,6 +455,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                     [x: string]: unknown;
                 };
             }>;
+            rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>]>;
     }>, import("@sinclair/typebox").TObject<{
         type: import("@sinclair/typebox").TLiteral<"user-operation-v070">;
@@ -474,6 +481,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
             data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
                 raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             }>]>;
+            rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>, import("@sinclair/typebox").TObject<{
             type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
             data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -509,6 +517,7 @@ export declare const wallet_prepareCalls: import("@sinclair/typebox").TObject<{
                     [x: string]: unknown;
                 };
             }>;
+            rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>]>;
     }>]>;
 }>;
@@ -519,7 +528,7 @@ export declare const wallet_requestAccount: import("@sinclair/typebox").TObject<
             signerAddress: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             creationHint: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
-                accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TLiteral<"sma-b">>;
+                accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"sma-b" | "la-v2" | "la-v1.0.1" | "la-v1.0.2" | "la-v1.1.0">[]>>;
                 salt: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">>;
             }>, import("@sinclair/typebox").TObject<{
                 accountType: import("@sinclair/typebox").TLiteral<"7702">;
@@ -548,7 +557,7 @@ export declare const wallet_createAccount: import("@sinclair/typebox").TObject<{
             signerAddress: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
             id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             creationOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
-                accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TLiteral<"sma-b">>;
+                accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"sma-b" | "la-v2" | "la-v1.0.1" | "la-v1.0.2" | "la-v1.1.0">[]>>;
                 salt: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">>;
             }>, import("@sinclair/typebox").TObject<{
                 accountType: import("@sinclair/typebox").TLiteral<"7702">;
@@ -672,6 +681,7 @@ export declare const wallet_createSession: import("@sinclair/typebox").TObject<{
                     [x: string]: unknown;
                 };
             }>;
+            rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>;
     }>;
 }>;

package/dist/esm/rpc/schema.d.ts

@@ -87,11 +87,13 @@ export declare const WalletServerRpcSchema: {
                         [x: string]: unknown;
                     };
                 };
+                rawPayload: `0x${string}`;
             } | {
                 type: "personal_sign";
                 data: string | {
                     raw: `0x${string}`;
                 };
+                rawPayload: `0x${string}`;
             };
         } | {
             type: "user-operation-v070";
@@ -133,11 +135,13 @@ export declare const WalletServerRpcSchema: {
                         [x: string]: unknown;
                     };
                 };
+                rawPayload: `0x${string}`;
             } | {
                 type: "personal_sign";
                 data: string | {
                     raw: `0x${string}`;
                 };
+                rawPayload: `0x${string}`;
             };
         } | {
             type: "authorization";
@@ -148,6 +152,7 @@ export declare const WalletServerRpcSchema: {
             };
             signatureRequest: {
                 type: "eip7702Auth";
+                rawPayload: `0x${string}`;
             };
         })[];
     } | {
@@ -186,11 +191,13 @@ export declare const WalletServerRpcSchema: {
                     [x: string]: unknown;
                 };
             };
+            rawPayload: `0x${string}`;
         } | {
             type: "personal_sign";
             data: string | {
                 raw: `0x${string}`;
             };
+            rawPayload: `0x${string}`;
         };
     } | {
         type: "user-operation-v070";
@@ -232,11 +239,13 @@ export declare const WalletServerRpcSchema: {
                     [x: string]: unknown;
                 };
             };
+            rawPayload: `0x${string}`;
         } | {
             type: "personal_sign";
             data: string | {
                 raw: `0x${string}`;
             };
+            rawPayload: `0x${string}`;
         };
     };
 } | {
@@ -460,7 +469,7 @@ export declare const WalletServerRpcSchema: {
             id?: string | undefined;
             creationOptions?: {
                 salt?: `0x${string}` | undefined;
-                accountType?: "sma-b" | undefined;
+                accountType?: "sma-b" | "la-v2" | "la-v1.0.1" | "la-v1.0.2" | "la-v1.1.0" | undefined;
             } | {
                 accountType: "7702";
             } | undefined;
@@ -478,7 +487,7 @@ export declare const WalletServerRpcSchema: {
             id?: string | undefined;
             creationHint?: {
                 salt?: `0x${string}` | undefined;
-                accountType?: "sma-b" | undefined;
+                accountType?: "sma-b" | "la-v2" | "la-v1.0.1" | "la-v1.0.2" | "la-v1.1.0" | undefined;
             } | {
                 accountType: "7702";
             } | undefined;
@@ -596,6 +605,7 @@ export declare const WalletServerRpcSchema: {
                     [x: string]: unknown;
                 };
             };
+            rawPayload: `0x${string}`;
         };
         sessionId: `0x${string}`;
     };

package/dist/esm/schemas.d.ts

@@ -1,4 +1,8 @@
 import { type SchemaOptions, type Static } from "@sinclair/typebox";
+export declare const baseAccountTypes: readonly ["sma-b", "la-v2", "la-v1.0.1", "la-v1.0.2", "la-v1.1.0"];
+export type BaseAccountType = (typeof baseAccountTypes)[number];
+export declare const accountTypes: readonly ["sma-b", "la-v2", "la-v1.0.1", "la-v1.0.2", "la-v1.1.0", "7702"];
+export type AccountType = (typeof accountTypes)[number];
 export declare const TypeHex: (options?: SchemaOptions) => import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 export declare const TypeAddress: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 export declare const TypeUuid: import("@sinclair/typebox").TString;
@@ -141,7 +145,7 @@ export declare const TypeCounterfactualInfo: import("@sinclair/typebox").TInters
 }>]>]>;
 export type TypeCounterfactualInfo = Static<typeof TypeCounterfactualInfo>;
 export declare const TypeCreationOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
-    accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TLiteral<"sma-b">>;
+    accountType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"sma-b" | "la-v2" | "la-v1.0.1" | "la-v1.0.2" | "la-v1.1.0">[]>>;
     salt: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">>;
 }>, import("@sinclair/typebox").TObject<{
     accountType: import("@sinclair/typebox").TLiteral<"7702">;
@@ -193,6 +197,7 @@ export declare const TypePersonalSignSignatureRequest: import("@sinclair/typebox
     data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
         raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>]>;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>;
 export declare const TypeTypedDataSignatureRequest: import("@sinclair/typebox").TObject<{
     type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
@@ -229,15 +234,18 @@ export declare const TypeTypedDataSignatureRequest: import("@sinclair/typebox").
             [x: string]: unknown;
         };
     }>;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>;
 export declare const TypeAuthorizationSignatureRequest: import("@sinclair/typebox").TObject<{
     type: import("@sinclair/typebox").TLiteral<"eip7702Auth">;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>;
 export declare const TypeSignatureRequest: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
     type: import("@sinclair/typebox").TLiteral<"personal_sign">;
     data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
         raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>]>;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>, import("@sinclair/typebox").TObject<{
     type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
     data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -273,8 +281,10 @@ export declare const TypeSignatureRequest: import("@sinclair/typebox").TUnion<[i
             [x: string]: unknown;
         };
     }>;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>, import("@sinclair/typebox").TObject<{
     type: import("@sinclair/typebox").TLiteral<"eip7702Auth">;
+    rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>]>;
 export declare const TypeCallId: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, {
     chainId: `0x${string}`;
@@ -300,6 +310,7 @@ export declare const PreparedCall_UserOpV060: import("@sinclair/typebox").TObjec
         data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
             raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>]>;
+        rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>, import("@sinclair/typebox").TObject<{
         type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
         data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -335,6 +346,7 @@ export declare const PreparedCall_UserOpV060: import("@sinclair/typebox").TObjec
                 [x: string]: unknown;
             };
         }>;
+        rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>]>;
 }>;
 export declare const PreparedCall_UserOpV070: import("@sinclair/typebox").TObject<{
@@ -361,6 +373,7 @@ export declare const PreparedCall_UserOpV070: import("@sinclair/typebox").TObjec
         data: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
             raw: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
         }>]>;
+        rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>, import("@sinclair/typebox").TObject<{
         type: import("@sinclair/typebox").TLiteral<"eth_signTypedData_v4">;
         data: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{
@@ -396,6 +409,7 @@ export declare const PreparedCall_UserOpV070: import("@sinclair/typebox").TObjec
                 [x: string]: unknown;
             };
         }>;
+        rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>]>;
 }>;
 export declare const PreparedCall_Authorization: import("@sinclair/typebox").TObject<{
@@ -407,6 +421,7 @@ export declare const PreparedCall_Authorization: import("@sinclair/typebox").TOb
     chainId: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     signatureRequest: import("@sinclair/typebox").TObject<{
         type: import("@sinclair/typebox").TLiteral<"eip7702Auth">;
+        rawPayload: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
     }>;
 }>;
 export declare const TypeEdcsaSigData: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TObject<{

package/dist/esm/schemas.js

@@ -5,6 +5,14 @@ const UUID_V4_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[
 FormatRegistry.Set("uuid", (value) => UUID_V4_REGEX.test(value));
 const BASE_64_URL_REGEX = /^[A-Za-z0-9_-]+$/; // Matches base64url encoded strings (without padding)
 FormatRegistry.Set("base64url", (value) => BASE_64_URL_REGEX.test(value));
+export const baseAccountTypes = [
+    "sma-b",
+    "la-v2",
+    "la-v1.0.1",
+    "la-v1.0.2",
+    "la-v1.1.0",
+];
+export const accountTypes = [...baseAccountTypes, "7702"];
 export const TypeHex = (options) => Type.TemplateLiteral("0x${string}", {
     ...options,
 });
@@ -207,7 +215,7 @@ export const TypeCounterfactualInfo = Type.Intersect([
 export const TypeCreationOptions = Type.Optional(Type.Union([
     Type.Object({
         // Optional b/c `sma-b` is the default if no accountType is specified.
-        accountType: Type.Optional(Type.Literal("sma-b")),
+        accountType: Type.Optional(Type.Union(baseAccountTypes.map((lit) => Type.Literal(lit)))),
         salt: Type.Optional(TypeHex()),
     }, {
         description: "SMA-B account type",
@@ -271,15 +279,18 @@ export const TypePersonalSignSignatureRequest = Type.Object({
             raw: TypeHex(),
         }, { description: "Raw message" }),
     ]),
+    rawPayload: TypeHex(),
 }, { description: "Personal sign" });
 export const TypeTypedDataSignatureRequest = Type.Object({
     type: Type.Literal("eth_signTypedData_v4"),
     data: TTypedDataDefinition,
+    rawPayload: TypeHex(),
 }, {
     description: "Typed data",
 });
 export const TypeAuthorizationSignatureRequest = Type.Object({
     type: Type.Literal("eip7702Auth"),
+    rawPayload: TypeHex(),
 });
 export const TypeSignatureRequest = Type.Union([
     TypePersonalSignSignatureRequest,