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

package/dist/esm/capabilities/index.d.ts

@@ -35,4 +35,7 @@ export declare const Capabilities: import("@sinclair/typebox").TObject<{
         account: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">>;
         delegation: import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TLiteral<"0x69007702764179f14F51cdce752f4f775d74E139"> | import("@sinclair/typebox").TLiteral<"ModularAccountV2">)[]>;
     }>, import("@sinclair/typebox").TLiteral<true>]>>;
+    nonceOverride: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        nonceKey: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
+    }>>;
 }>;

package/dist/esm/capabilities/index.js

@@ -3,10 +3,12 @@ import { GasParamsOverrideCapability } from "./overrides.js";
 import { PaymasterCapability } from "./paymaster.js";
 import { PermissionsCapability } from "./permissions/index.js";
 import { Eip7702AuthCapability } from "./eip7702Auth.js";
+import { MultiDimensionalNonceCapability } from "./multiDimensionalNonce.js";
 export const Capabilities = Type.Object({
     permissions: Type.Optional(PermissionsCapability),
     paymasterService: Type.Optional(PaymasterCapability),
     gasParamsOverride: Type.Optional(GasParamsOverrideCapability),
     eip7702Auth: Type.Optional(Eip7702AuthCapability),
+    nonceOverride: Type.Optional(MultiDimensionalNonceCapability),
 });
 //# sourceMappingURL=index.js.map

package/dist/esm/capabilities/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/capabilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;IACtC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACjD,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IACpD,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;IAC7D,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;CAClD,CAAC,CAAC","sourcesContent":["import { Type } from \"@sinclair/typebox\";\nimport { GasParamsOverrideCapability } from \"./overrides.js\";\nimport { PaymasterCapability } from \"./paymaster.js\";\nimport { PermissionsCapability } from \"./permissions/index.js\";\nimport { Eip7702AuthCapability } from \"./eip7702Auth.js\";\n\nexport const Capabilities = Type.Object({\n  permissions: Type.Optional(PermissionsCapability),\n  paymasterService: Type.Optional(PaymasterCapability),\n  gasParamsOverride: Type.Optional(GasParamsOverrideCapability),\n  eip7702Auth: Type.Optional(Eip7702AuthCapability),\n});\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/capabilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAE7E,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;IACtC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACjD,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IACpD,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;IAC7D,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACjD,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC;CAC9D,CAAC,CAAC","sourcesContent":["import { Type } from \"@sinclair/typebox\";\nimport { GasParamsOverrideCapability } from \"./overrides.js\";\nimport { PaymasterCapability } from \"./paymaster.js\";\nimport { PermissionsCapability } from \"./permissions/index.js\";\nimport { Eip7702AuthCapability } from \"./eip7702Auth.js\";\nimport { MultiDimensionalNonceCapability } from \"./multiDimensionalNonce.js\";\n\nexport const Capabilities = Type.Object({\n  permissions: Type.Optional(PermissionsCapability),\n  paymasterService: Type.Optional(PaymasterCapability),\n  gasParamsOverride: Type.Optional(GasParamsOverrideCapability),\n  eip7702Auth: Type.Optional(Eip7702AuthCapability),\n  nonceOverride: Type.Optional(MultiDimensionalNonceCapability),\n});\n"]}

package/dist/esm/capabilities/multiDimensionalNonce.d.ts

@@ -0,0 +1,3 @@
+export declare const MultiDimensionalNonceCapability: import("@sinclair/typebox").TObject<{
+    nonceKey: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
+}>;

package/dist/esm/capabilities/multiDimensionalNonce.js

@@ -0,0 +1,7 @@
+import { Type } from "@sinclair/typebox";
+import { TypeHex } from "../schemas.js";
+export const MultiDimensionalNonceCapability = Type.Object({
+    // we do not support the optional sequentialNonce param
+    nonceKey: TypeHex({ description: "Override nonce key as hex string" }),
+});
+//# sourceMappingURL=multiDimensionalNonce.js.map

package/dist/esm/capabilities/multiDimensionalNonce.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiDimensionalNonce.js","sourceRoot":"","sources":["../../../src/capabilities/multiDimensionalNonce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,CAAC,MAAM,CAAC;IACzD,uDAAuD;IACvD,QAAQ,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,kCAAkC,EAAE,CAAC;CACvE,CAAC,CAAC","sourcesContent":["import { Type } from \"@sinclair/typebox\";\nimport { TypeHex } from \"../schemas.js\";\n\nexport const MultiDimensionalNonceCapability = Type.Object({\n  // we do not support the optional sequentialNonce param\n  nonceKey: TypeHex({ description: \"Override nonce key as hex string\" }),\n});\n"]}

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { signSignatureRequest } from "./signSignatureRequest.js";
 import { wallet_sendPreparedCalls } from "../../rpc/request.js";
-import { assertNever } from "../../utils.js";
+import { PreparedCall_Authorization, PreparedCall_UserOpV060, PreparedCall_UserOpV070, } from "../../schemas.js";
 /**
  * Signs prepared calls using the provided signer.
  *
@@ -9,46 +9,35 @@ import { assertNever } from "../../utils.js";
  * @returns {Promise<SignPreparedCallsResult>} A Promise that resolves to the signed calls
  **/
 export async function signPreparedCalls(signer, params) {
-    if (params.type !== "array") {
-        const { signatureRequest, ...call } = params;
+    const signAuthorizationCall = async (call) => {
+        const { signatureRequest: _signatureRequest, ...rest } = call;
+        const signature = await signSignatureRequest(signer, {
+            type: "eip7702Auth",
+            data: {
+                ...rest.data,
+                chainId: call.chainId,
+            },
+        });
+        return {
+            ...rest,
+            signature,
+        };
+    };
+    const signUserOperationCall = async (call) => {
+        const { signatureRequest, ...rest } = call;
         const signature = await signSignatureRequest(signer, signatureRequest);
         return {
-            ...call,
+            ...rest,
             signature,
         };
-    }
-    return {
-        type: "array",
-        data: await Promise.all(params.data.map(async (call) => {
-            switch (call.type) {
-                case "authorization": {
-                    const { signatureRequest: _signatureRequest, ...rest } = call;
-                    const signature = await signSignatureRequest(signer, {
-                        type: "eip7702Auth",
-                        data: {
-                            ...call.data,
-                            chainId: call.chainId,
-                        },
-                    });
-                    return {
-                        ...rest,
-                        signature,
-                    };
-                }
-                case "user-operation-v060":
-                case "user-operation-v070": {
-                    const { signatureRequest, ...rest } = call;
-                    const signature = await signSignatureRequest(signer, signatureRequest);
-                    return {
-                        ...rest,
-                        signature,
-                    };
-                }
-                default: {
-                    return assertNever(call, "Unexpected call type");
-                }
-            }
-        })),
     };
+    return params.type === "array"
+        ? {
+            type: "array",
+            data: await Promise.all(params.data.map((call) => call.type === "authorization"
+                ? signAuthorizationCall(call)
+                : signUserOperationCall(call))),
+        }
+        : signUserOperationCall(params);
 }
 //# sourceMappingURL=signPreparedCalls.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"signPreparedCalls.js","sourceRoot":"","sources":["../../../../src/client/actions/signPreparedCalls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAQ7C;;;;;;IAMI;AACJ,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAA0B,EAC1B,MAA+B;IAE/B,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QACvE,OAAO;YACL,GAAG,IAAI;YACP,SAAS;SACV,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,OAAgB;QACtB,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CACrB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;oBAC9D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE;wBACnD,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE;4BACJ,GAAG,IAAI,CAAC,IAAI;4BACZ,OAAO,EAAE,IAAI,CAAC,OAAO;yBACtB;qBACF,CAAC,CAAC;oBACH,OAAO;wBACL,GAAG,IAAI;wBACP,SAAS;qBACV,CAAC;gBACJ,CAAC;gBACD,KAAK,qBAAqB,CAAC;gBAC3B,KAAK,qBAAqB,CAAC,CAAC,CAAC;oBAC3B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;oBAC3C,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAC1C,MAAM,EACN,gBAAgB,CACjB,CAAC;oBACF,OAAO;wBACL,GAAG,IAAI;wBACP,SAAS;qBACV,CAAC;gBACJ,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,OAAO,WAAW,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { PrepareCallsResult } from \"./prepareCalls.ts\";\nimport type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport { signSignatureRequest } from \"./signSignatureRequest.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport { assertNever } from \"../../utils.js\";\n\nexport type SignPreparedCallsParams = PrepareCallsResult;\n\nexport type SignPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\n/**\n * Signs prepared calls using the provided signer.\n *\n * @param {SmartAccountSigner} signer - The signer to use\n * @param {SignPreparedCallsParams} params - The prepared calls with signature requests\n * @returns {Promise<SignPreparedCallsResult>} A Promise that resolves to the signed calls\n **/\nexport async function signPreparedCalls(\n  signer: SmartAccountSigner,\n  params: SignPreparedCallsParams,\n): Promise<SignPreparedCallsResult> {\n  if (params.type !== \"array\") {\n    const { signatureRequest, ...call } = params;\n    const signature = await signSignatureRequest(signer, signatureRequest);\n    return {\n      ...call,\n      signature,\n    };\n  }\n\n  return {\n    type: \"array\" as const,\n    data: await Promise.all(\n      params.data.map(async (call) => {\n        switch (call.type) {\n          case \"authorization\": {\n            const { signatureRequest: _signatureRequest, ...rest } = call;\n            const signature = await signSignatureRequest(signer, {\n              type: \"eip7702Auth\",\n              data: {\n                ...call.data,\n                chainId: call.chainId,\n              },\n            });\n            return {\n              ...rest,\n              signature,\n            };\n          }\n          case \"user-operation-v060\":\n          case \"user-operation-v070\": {\n            const { signatureRequest, ...rest } = call;\n            const signature = await signSignatureRequest(\n              signer,\n              signatureRequest,\n            );\n            return {\n              ...rest,\n              signature,\n            };\n          }\n          default: {\n            return assertNever(call, \"Unexpected call type\");\n          }\n        }\n      }),\n    ),\n  };\n}\n"]}
+{"version":3,"file":"signPreparedCalls.js","sourceRoot":"","sources":["../../../../src/client/actions/signPreparedCalls.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAQ1B;;;;;;IAMI;AACJ,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAA0B,EAC1B,MAA+B;IAE/B,MAAM,qBAAqB,GAAG,KAAK,EACjC,IAA+C,EAC/C,EAAE;QACF,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE;gBACJ,GAAG,IAAI,CAAC,IAAI;gBACZ,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB;SACF,CAAC,CAAC;QACH,OAAO;YACL,GAAG,IAAI;YACP,SAAS;SACV,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,KAAK,EACjC,IAE0C,EAC1C,EAAE;QACF,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QACvE,OAAO;YACL,GAAG,IAAI;YACP,SAAS;SACV,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,IAAI,KAAK,OAAO;QAC5B,CAAC,CAAC;YACE,IAAI,EAAE,OAAgB;YACtB,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG,CACrB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvB,IAAI,CAAC,IAAI,KAAK,eAAe;gBAC3B,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC;gBAC7B,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAChC,CACF;SACF;QACH,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC","sourcesContent":["import type { PrepareCallsResult } from \"./prepareCalls.ts\";\nimport type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport { signSignatureRequest } from \"./signSignatureRequest.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport {\n  PreparedCall_Authorization,\n  PreparedCall_UserOpV060,\n  PreparedCall_UserOpV070,\n} from \"../../schemas.js\";\n\nexport type SignPreparedCallsParams = PrepareCallsResult;\n\nexport type SignPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\n/**\n * Signs prepared calls using the provided signer.\n *\n * @param {SmartAccountSigner} signer - The signer to use\n * @param {SignPreparedCallsParams} params - The prepared calls with signature requests\n * @returns {Promise<SignPreparedCallsResult>} A Promise that resolves to the signed calls\n **/\nexport async function signPreparedCalls(\n  signer: SmartAccountSigner,\n  params: SignPreparedCallsParams,\n): Promise<SignPreparedCallsResult> {\n  const signAuthorizationCall = async (\n    call: Static<typeof PreparedCall_Authorization>,\n  ) => {\n    const { signatureRequest: _signatureRequest, ...rest } = call;\n    const signature = await signSignatureRequest(signer, {\n      type: \"eip7702Auth\",\n      data: {\n        ...rest.data,\n        chainId: call.chainId,\n      },\n    });\n    return {\n      ...rest,\n      signature,\n    };\n  };\n\n  const signUserOperationCall = async (\n    call:\n      | Static<typeof PreparedCall_UserOpV060>\n      | Static<typeof PreparedCall_UserOpV070>,\n  ) => {\n    const { signatureRequest, ...rest } = call;\n    const signature = await signSignatureRequest(signer, signatureRequest);\n    return {\n      ...rest,\n      signature,\n    };\n  };\n\n  return params.type === \"array\"\n    ? {\n        type: \"array\" as const,\n        data: await Promise.all(\n          params.data.map((call) =>\n            call.type === \"authorization\"\n              ? signAuthorizationCall(call)\n              : signUserOperationCall(call),\n          ),\n        ),\n      }\n    : signUserOperationCall(params);\n}\n"]}

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

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

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

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

package/dist/esm/exports/internal.d.ts

@@ -5,6 +5,7 @@ export * from "../capabilities/permissions/mav2.js";
 export type * from "../isomorphic/client.js";
 export { createIsomorphicClient } from "../isomorphic/client.js";
 export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
+export { prepareInitialOwners } from "../isomorphic/utils/createAccount.js";
 export * from "../rpc/request.js";
 export * as RpcSchemas from "../rpc/request.js";
 export * from "../rpc/schema.js";

package/dist/esm/exports/internal.js

@@ -7,6 +7,7 @@ export * from "../capabilities/permissions/index.js";
 export * from "../capabilities/permissions/mav2.js";
 export { createIsomorphicClient } from "../isomorphic/client.js";
 export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
+export { prepareInitialOwners } from "../isomorphic/utils/createAccount.js";
 export * from "../rpc/request.js";
 export * as RpcSchemas from "../rpc/request.js";
 export * from "../rpc/schema.js";

package/dist/esm/exports/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/exports/internal.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,qFAAqF;AACrF,wBAAwB;AACxB,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,cAAc,mBAAmB,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAE9B,cAAc,aAAa,CAAC","sourcesContent":["// exports from this file are meant to be imported by our packages in the monorepo\n// we will expose this in the package.json as a named export like `this-pkg/internal`\n// TODO: name `this-pkg`\nexport * from \"../capabilities/index.js\";\nexport * from \"../capabilities/paymaster.js\";\nexport * from \"../capabilities/permissions/index.js\";\nexport * from \"../capabilities/permissions/mav2.js\";\nexport type * from \"../isomorphic/client.js\";\nexport { createIsomorphicClient } from \"../isomorphic/client.js\";\nexport { createDummySigner } from \"../isomorphic/utils/createDummySigner.js\";\nexport * from \"../rpc/request.js\";\nexport * as RpcSchemas from \"../rpc/request.js\";\nexport * from \"../rpc/schema.js\";\nexport * from \"../schemas.js\";\nexport type * from \"../types.ts\";\nexport * from \"../utils.js\";\n"]}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/exports/internal.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,qFAAqF;AACrF,wBAAwB;AACxB,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,cAAc,mBAAmB,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAE9B,cAAc,aAAa,CAAC","sourcesContent":["// exports from this file are meant to be imported by our packages in the monorepo\n// we will expose this in the package.json as a named export like `this-pkg/internal`\n// TODO: name `this-pkg`\nexport * from \"../capabilities/index.js\";\nexport * from \"../capabilities/paymaster.js\";\nexport * from \"../capabilities/permissions/index.js\";\nexport * from \"../capabilities/permissions/mav2.js\";\nexport type * from \"../isomorphic/client.js\";\nexport { createIsomorphicClient } from \"../isomorphic/client.js\";\nexport { createDummySigner } from \"../isomorphic/utils/createDummySigner.js\";\nexport { prepareInitialOwners } from \"../isomorphic/utils/createAccount.js\";\nexport * from \"../rpc/request.js\";\nexport * as RpcSchemas from \"../rpc/request.js\";\nexport * from \"../rpc/schema.js\";\nexport * from \"../schemas.js\";\nexport type * from \"../types.ts\";\nexport * from \"../utils.js\";\n"]}

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

@@ -1,12 +1,14 @@
 import { createSmartAccountClient, } from "@aa-sdk/core";
 import { deferralActions, PermissionBuilder, } from "@account-kit/smart-contracts/experimental";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, custom, hexToNumber, toHex, } from "viem";
+import { ChainNotFoundError, custom, hashTypedData, hexToNumber, toHex, } from "viem";
+import { InvalidRequestError } from "ox/RpcResponse";
 import { TypePermission } from "../../capabilities/permissions/index.js";
 import { isGlobalValidation } from "../../capabilities/permissions/mav2.js";
 import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { InvalidRequestError } from "ox/RpcResponse";
+import { supportsFeature } from "../utils/supportsFeature.js";
+import { isDelegated } from "../utils/7702.js";
 export async function createSession(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
@@ -20,16 +22,27 @@ export async function createSession(client, params) {
             },
         ],
     });
-    if (delegation) {
+    if (delegation &&
+        !(await isDelegated(client, {
+            address: params.account,
+            delegation,
+        }))) {
         throw new InvalidRequestError({
-            message: "'wallet_createSession' does not currently support 7702 accounts.",
+            message: "7702 account must be delegated before calling `wallet_createSession`",
         });
     }
-    if (!counterfactualInfo) {
+    if (!delegation && !counterfactualInfo) {
         throw new InvalidRequestError({
             message: "No counterfactual info found.",
         });
     }
+    if (counterfactualInfo &&
+        !supportsFeature(counterfactualInfo, "permissions")) {
+        throw new InvalidRequestError({
+            message: "Account type does not support createSession",
+        });
+    }
+    // At this point we know the account supports the permission feature
     const account = await createAccount({
         chain: client.chain,
         transport: custom(client.transport),
@@ -69,10 +82,12 @@ export async function createSession(client, params) {
         .compileDeferred();
     return {
         sessionId: null, // In remote mode, the server will set this later.
+        chainId: toHex(client.chain.id),
         entityId: toHex(entityId),
         signatureRequest: {
             type: "eth_signTypedData_v4",
             data: typedData,
+            rawPayload: hashTypedData(typedData),
         },
         fullPreSignatureDeferredActionDigest,
     };

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

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

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

@@ -1,8 +1,8 @@
 import { deepHexlify, default7702GasEstimator, } from "@aa-sdk/core";
-import { ChainNotFoundError, custom, fromHex, toHex, } from "viem";
+import { ChainNotFoundError, custom, fromHex, hashMessage, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorizationRequest, parseDelegation } from "../utils/7702.js";
+import { createAuthorizationRequest, isDelegated } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
 import { assertNever } from "../../utils.js";
 import { assertValid7702AccountAddress } from "../utils/7702.js";
@@ -12,20 +12,23 @@ export async function prepareCalls(client, params) {
     }
     assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);
     // in local mode, we probably want some kind of caching for this
-    const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth
-        ? {
-            counterfactualInfo: undefined,
-            delegation: parseDelegation(params.capabilities.eip7702Auth),
-        }
-        : await client.request({
-            method: "wallet_requestAccount",
-            params: [
-                {
+    const { counterfactualInfo, delegation } = await client.request({
+        method: "wallet_requestAccount",
+        params: [
+            params.capabilities?.eip7702Auth
+                ? {
+                    signerAddress: params.from,
+                    creationHint: {
+                        accountType: "7702",
+                    },
+                    includeCounterfactualInfo: true,
+                }
+                : {
                     accountAddress: params.from,
                     includeCounterfactualInfo: true,
                 },
-            ],
-        });
+        ],
+    });
     if (!counterfactualInfo && !delegation) {
         throw new InvalidRequestError({
             message: "No counterfactual info or delegated implementation address found.",
@@ -40,13 +43,23 @@ export async function prepareCalls(client, params) {
         permissions: params.capabilities?.permissions,
         delegation,
     });
-    // If using 7702, we need an Authorization (unless it's already authorized).
-    const authorizationRequest = delegation
+    const authorizationRequest = delegation &&
+        !(await isDelegated(client, {
+            address: account.address,
+            delegation,
+        }))
         ? await createAuthorizationRequest(client, {
             address: account.address,
             delegation,
         })
         : undefined;
+    if (params.capabilities?.permissions && authorizationRequest) {
+        // The user shouldn't see this in most cases since we require
+        // the account to be delegated before creating the session.
+        throw new InvalidRequestError({
+            message: "When using a 7702 account with a session key, the account must be delegated before preparing calls.",
+        });
+    }
     if (authorizationRequest) {
         // @ts-expect-error - this is available but not typed as public
         client.middleware.gasEstimator = default7702GasEstimator();
@@ -60,7 +73,12 @@ export async function prepareCalls(client, params) {
             value: x.value ? fromHex(x.value, "bigint") : undefined,
         })),
         account,
-        overrides: params.capabilities?.gasParamsOverride,
+        overrides: {
+            ...params.capabilities?.gasParamsOverride,
+            nonceKey: params.capabilities?.nonceOverride?.nonceKey
+                ? fromHex(params.capabilities.nonceOverride.nonceKey, "bigint")
+                : undefined,
+        },
     });
     // The eip7702Auth field should never be included in the UO sig
     // request. It's handled by a separate authorization request.
@@ -69,6 +87,7 @@ export async function prepareCalls(client, params) {
     }
     const hexlifiedUo = deepHexlify(builtUo);
     const ep = account.getEntryPoint();
+    const uoHash = ep.getUserOperationHash(hexlifiedUo);
     const uoRequest = {
         type: ep.version === "0.7.0"
             ? "user-operation-v070"
@@ -80,8 +99,11 @@ export async function prepareCalls(client, params) {
         signatureRequest: {
             type: "personal_sign",
             data: {
-                raw: ep.getUserOperationHash(hexlifiedUo),
+                raw: uoHash,
             },
+            rawPayload: hashMessage({
+                raw: uoHash,
+            }),
         },
     };
     return authorizationRequest

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

@@ -1 +1 @@
-{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  deepHexlify,\n  default7702GasEstimator,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorizationRequest, parseDelegation } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport { assertValid7702AccountAddress } from \"../utils/7702.js\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo, delegation } = params.capabilities?.eip7702Auth\n    ? {\n        counterfactualInfo: undefined,\n        delegation: parseDelegation(params.capabilities.eip7702Auth),\n      }\n    : await client.request({\n        method: \"wallet_requestAccount\",\n        params: [\n          {\n            accountAddress: params.from,\n            includeCounterfactualInfo: true,\n          },\n        ],\n      });\n\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorizationRequest(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  if (authorizationRequest) {\n    // @ts-expect-error - this is available but not typed as public\n    client.middleware.gasEstimator = default7702GasEstimator();\n  }\n\n  // TODO: oops we don't actually support setting the policyId as an override here\n  // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly\n  const builtUo = await client.buildUserOperation({\n    uo: params.calls.map((x) => ({\n      target: x.to,\n      data: x.data ?? \"0x\",\n      value: x.value ? fromHex(x.value, \"bigint\") : undefined,\n    })),\n    account,\n    overrides: params.capabilities?.gasParamsOverride,\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by a separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n\n  const hexlifiedUo = deepHexlify(builtUo);\n\n  const ep = account.getEntryPoint();\n\n  const uoRequest = {\n    type:\n      ep.version === \"0.7.0\"\n        ? (\"user-operation-v070\" as const)\n        : ep.version === \"0.6.0\"\n          ? (\"user-operation-v060\" as const)\n          : assertNever(ep.version, \"Unexpected entry point version\"),\n    data: hexlifiedUo,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\" as const,\n      data: {\n        raw: ep.getUserOperationHash(hexlifiedUo),\n      },\n    },\n  };\n\n  return authorizationRequest\n    ? {\n        type: \"array\" as const,\n        data: [authorizationRequest, uoRequest],\n      }\n    : uoRequest;\n}\n"]}
+{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,uBAAuB,GAGxB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,OAAO,EACP,WAAW,EACX,KAAK,GAGN,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAajE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAMC,EACD,MAA0B;IAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,6BAA6B,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAE7E,gEAAgE;IAChE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC9D,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE;YACN,MAAM,CAAC,YAAY,EAAE,WAAW;gBAC9B,CAAC,CAAC;oBACE,aAAa,EAAE,MAAM,CAAC,IAAI;oBAC1B,YAAY,EAAE;wBACZ,WAAW,EAAE,MAAM;qBACpB;oBACD,yBAAyB,EAAE,IAAI;iBAChC;gBACH,CAAC,CAAC;oBACE,cAAc,EAAE,MAAM,CAAC,IAAI;oBAC3B,yBAAyB,EAAE,IAAI;iBAChC;SACN;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EACL,mEAAmE;SACtE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;QAClC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;QACnC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;QACtC,cAAc,EAAE,MAAM,CAAC,IAAI;QAC3B,kBAAkB;QAClB,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW;QAC7C,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,oBAAoB,GACxB,UAAU;QACV,CAAC,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU;SACX,CAAC,CAAC;QACD,CAAC,CAAC,MAAM,0BAA0B,CAAC,MAAM,EAAE;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU;SACX,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,MAAM,CAAC,YAAY,EAAE,WAAW,IAAI,oBAAoB,EAAE,CAAC;QAC7D,6DAA6D;QAC7D,2DAA2D;QAC3D,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EACL,qGAAqG;SACxG,CAAC,CAAC;IACL,CAAC;IAED,IAAI,oBAAoB,EAAE,CAAC;QACzB,+DAA+D;QAC/D,MAAM,CAAC,UAAU,CAAC,YAAY,GAAG,uBAAuB,EAAE,CAAC;IAC7D,CAAC;IAED,gFAAgF;IAChF,iIAAiI;IACjI,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC;QAC9C,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,CAAC,EAAE;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;YACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC,CAAC;QACH,OAAO;QACP,SAAS,EAAE;YACT,GAAG,MAAM,CAAC,YAAY,EAAE,iBAAiB;YACzC,QAAQ,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,QAAQ;gBACpD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAC/D,CAAC,CAAC,SAAS;SACd;KACF,CAAC,CAAC;IAEH,+DAA+D;IAC/D,6DAA6D;IAC7D,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;QAC7B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAClC,CAAC;IAED,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEzC,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAEnC,MAAM,MAAM,GAAG,EAAE,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG;QAChB,IAAI,EACF,EAAE,CAAC,OAAO,KAAK,OAAO;YACpB,CAAC,CAAE,qBAA+B;YAClC,CAAC,CAAC,EAAE,CAAC,OAAO,KAAK,OAAO;gBACtB,CAAC,CAAE,qBAA+B;gBAClC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,gCAAgC,CAAC;QACjE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,gBAAgB,EAAE;YAChB,IAAI,EAAE,eAAwB;YAC9B,IAAI,EAAE;gBACJ,GAAG,EAAE,MAAM;aACZ;YACD,UAAU,EAAE,WAAW,CAAC;gBACtB,GAAG,EAAE,MAAM;aACZ,CAAC;SACH;KACF,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC;YACE,IAAI,EAAE,OAAgB;YACtB,IAAI,EAAE,CAAC,oBAAoB,EAAE,SAAS,CAAC;SACxC;QACH,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC","sourcesContent":["import {\n  deepHexlify,\n  default7702GasEstimator,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  hashMessage,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorizationRequest, isDelegated } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport { assertValid7702AccountAddress } from \"../utils/7702.js\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      params.capabilities?.eip7702Auth\n        ? {\n            signerAddress: params.from,\n            creationHint: {\n              accountType: \"7702\",\n            },\n            includeCounterfactualInfo: true,\n          }\n        : {\n            accountAddress: params.from,\n            includeCounterfactualInfo: true,\n          },\n    ],\n  });\n\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  const authorizationRequest =\n    delegation &&\n    !(await isDelegated(client, {\n      address: account.address,\n      delegation,\n    }))\n      ? await createAuthorizationRequest(client, {\n          address: account.address,\n          delegation,\n        })\n      : undefined;\n\n  if (params.capabilities?.permissions && authorizationRequest) {\n    // The user shouldn't see this in most cases since we require\n    // the account to be delegated before creating the session.\n    throw new InvalidRequestError({\n      message:\n        \"When using a 7702 account with a session key, the account must be delegated before preparing calls.\",\n    });\n  }\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: {\n      ...params.capabilities?.gasParamsOverride,\n      nonceKey: params.capabilities?.nonceOverride?.nonceKey\n        ? fromHex(params.capabilities.nonceOverride.nonceKey, \"bigint\")\n        : undefined,\n    },\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by a separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n\n  const hexlifiedUo = deepHexlify(builtUo);\n\n  const ep = account.getEntryPoint();\n\n  const uoHash = ep.getUserOperationHash(hexlifiedUo);\n\n  const uoRequest = {\n    type:\n      ep.version === \"0.7.0\"\n        ? (\"user-operation-v070\" as const)\n        : ep.version === \"0.6.0\"\n          ? (\"user-operation-v060\" as const)\n          : assertNever(ep.version, \"Unexpected entry point version\"),\n    data: hexlifiedUo,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\" as const,\n      data: {\n        raw: uoHash,\n      },\n      rawPayload: hashMessage({\n        raw: uoHash,\n      }),\n    },\n  };\n\n  return authorizationRequest\n    ? {\n        type: \"array\" as const,\n        data: [authorizationRequest, uoRequest],\n      }\n    : uoRequest;\n}\n"]}

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

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