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

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

@@ -2,8 +2,9 @@ import { deepHexlify, default7702GasEstimator, } from "@aa-sdk/core";
 import { ChainNotFoundError, custom, fromHex, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorization, parseDelegation } from "../utils/7702.js";
+import { createAuthorizationRequest, parseDelegation } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import { assertNever } from "../../utils.js";
 import { assertValid7702AccountAddress } from "../utils/7702.js";
 export async function prepareCalls(client, params) {
     if (!client.chain) {
@@ -41,7 +42,7 @@ export async function prepareCalls(client, params) {
     });
     // If using 7702, we need an Authorization (unless it's already authorized).
     const authorizationRequest = delegation
-        ? await createAuthorization(client, {
+        ? await createAuthorizationRequest(client, {
             address: account.address,
             delegation,
         })
@@ -62,27 +63,32 @@ export async function prepareCalls(client, params) {
         overrides: params.capabilities?.gasParamsOverride,
     });
     // The eip7702Auth field should never be included in the UO sig
-    // request. It's handled by the separate authorization request.
+    // request. It's handled by a separate authorization request.
     if ("eip7702Auth" in builtUo) {
         builtUo.eip7702Auth = undefined;
     }
-    const uoRequest = deepHexlify(builtUo);
-    const signatureRequest = {
-        type: "personal_sign",
-        data: {
-            raw: account.getEntryPoint().getUserOperationHash(uoRequest),
-        },
-    };
-    return {
-        type: account.getEntryPoint().version === "0.7.0"
+    const hexlifiedUo = deepHexlify(builtUo);
+    const ep = account.getEntryPoint();
+    const uoRequest = {
+        type: ep.version === "0.7.0"
             ? "user-operation-v070"
-            : "user-operation-v060",
-        data: uoRequest,
+            : ep.version === "0.6.0"
+                ? "user-operation-v060"
+                : assertNever(ep.version, "Unexpected entry point version"),
+        data: hexlifiedUo,
         chainId: toHex(client.chain.id),
         signatureRequest: {
-            ...signatureRequest,
-            ...(authorizationRequest ? { authorizationRequest } : {}),
+            type: "personal_sign",
+            data: {
+                raw: ep.getUserOperationHash(hexlifiedUo),
+            },
         },
     };
+    return authorizationRequest
+        ? {
+            type: "array",
+            data: [authorizationRequest, uoRequest],
+        }
+        : uoRequest;
 }
 //# sourceMappingURL=prepareCalls.js.map

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

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

package/dist/esm/isomorphic/actions/sendPreparedCalls.d.ts

@@ -1,8 +1,8 @@
 import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
-import type { Static, StaticDecode } from "@sinclair/typebox";
 import { type Chain, type Transport } from "viem";
-import type { wallet_sendPreparedCalls } from "../../rpc/request.js";
+import { type wallet_sendPreparedCalls } from "../../rpc/request.js";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
-export type SendPreparedCallsParams = Omit<StaticDecode<(typeof wallet_sendPreparedCalls)["properties"]["Request"]["properties"]["params"]>[0], "chainId">;
+import type { Static } from "@sinclair/typebox";
+export type SendPreparedCallsParams = Static<(typeof wallet_sendPreparedCalls)["properties"]["Request"]["properties"]["params"]>[0];
 export type SendPreparedCallsResult = Static<(typeof wallet_sendPreparedCalls)["properties"]["ReturnType"]>;
 export declare function sendPreparedCalls(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: SendPreparedCallsParams): Promise<SendPreparedCallsResult>;

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

@@ -1,22 +1,18 @@
 import { getEntryPoint, } from "@aa-sdk/core";
 import { Value } from "@sinclair/typebox/value";
-import { BaseError, ChainNotFoundError, concat, concatHex, toHex, } from "viem";
+import { BaseError, ChainNotFoundError, concat, concatHex, numberToHex, parseSignature, toHex, } from "viem";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
+import {} from "../../rpc/request.js";
 import { TypeCallId } from "../../schemas.js";
 import { isSupportedDelegationAddress7702 } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
+import { assertNever } from "../../utils.js";
+import { decodeSignature } from "../utils/decodeSignature.js";
 // TODO: this only supports MAv2 right now, we need to fix this
 export async function sendPreparedCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
-    // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
-    if (params.signedAuthorization &&
-        !isSupportedDelegationAddress7702(params.signedAuthorization.address)) {
-        throw new InvalidRequestError({
-            message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,
-        });
-    }
     const deferredAction = (() => {
         if (!params.capabilities?.permissions) {
             return;
@@ -29,35 +25,79 @@ export async function sendPreparedCalls(client, params) {
         }
         return decodedContext.deferredAction;
     })();
-    const entryPoint = params.type === "user-operation-v060"
-        ? getEntryPoint(client.chain, { version: "0.6.0" })
-        : getEntryPoint(client.chain, { version: "0.7.0" });
-    const hash = await client
-        .sendRawUserOperation({
-        ...params.data,
-        signature: deferredAction != null
-            ? concatHex([
-                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).
-                "0xff",
-                "0x00",
-                params.signature.signature,
-            ])
-            : concat(["0xFF", "0x00", params.signature.signature]),
-        eip7702Auth: params.signedAuthorization,
-    }, entryPoint.address)
-        .catch((err) => {
-        if (err instanceof BaseError &&
-            err.details.endsWith("is not a contract and initCode is empty")) {
-            throw new BaseError(`${err.details} (If using 7702, be sure you include the 'signedAuthorization' field in the request parameters)`);
-        }
-        throw err;
-    });
-    const callId = Value.Encode(TypeCallId, {
-        chainId: toHex(client.chain.id),
-        hash,
-    });
+    const userOps = params.type === "array"
+        ? params.data.filter((it) => {
+            const isUserOp = it.type === "user-operation-v060" ||
+                it.type === "user-operation-v070";
+            if (isUserOp && it.chainId !== toHex(client.chain.id)) {
+                throw new InvalidRequestError({
+                    message: "Multiple chain IDs in a single request are not currently supported.",
+                });
+            }
+            return isUserOp;
+        })
+        : [params];
+    const authorizations = params.type === "array"
+        ? params.data.filter((it) => it.type === "authorization")
+        : [];
+    if (authorizations.length > 1) {
+        throw new InvalidRequestError({
+            message: "Multiple authorizations in a single request are not currently supported",
+        });
+    }
+    const [authorization] = authorizations;
+    // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
+    if (authorization &&
+        !isSupportedDelegationAddress7702(authorization.data.address)) {
+        throw new InvalidRequestError({
+            message: `Unsupported 7702 delegation address: ${authorization.data.address}`,
+        });
+    }
+    const hashes = await Promise.all(userOps.map(async (userOp, idx) => {
+        const ep = userOp.type === "user-operation-v060"
+            ? getEntryPoint(client.chain, { version: "0.6.0" })
+            : userOp.type === "user-operation-v070"
+                ? getEntryPoint(client.chain, { version: "0.7.0" })
+                : assertNever(userOp, "Unexpected user op type");
+        const authSig = authorization
+            ? parseSignature(decodeSignature(authorization.signature).data)
+            : undefined;
+        const uoSigHex = decodeSignature(userOp.signature).data;
+        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]),
+            eip7702Auth: idx === 0 && authorization && authSig
+                ? {
+                    ...authorization.data,
+                    chainId: authorization.chainId,
+                    ...{
+                        ...authSig,
+                        yParity: numberToHex(authSig.yParity),
+                    },
+                }
+                : undefined,
+        }, ep.address)
+            .catch((err) => {
+            if (err instanceof BaseError &&
+                err.details.endsWith("is not a contract and initCode is empty")) {
+                throw new BaseError(`${err.details} (If using 7702, be sure you include the signed authorization in the request parameters)`);
+            }
+            throw err;
+        });
+    }));
     return {
-        preparedCallIds: [callId],
+        preparedCallIds: hashes.map((hash) => Value.Encode(TypeCallId, {
+            chainId: toHex(client.chain.id),
+            hash,
+        })),
     };
 }
 //# sourceMappingURL=sendPreparedCalls.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { isSupportedDelegationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type SendPreparedCallsParams = Omit<\n  StaticDecode<\n    (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    params.signedAuthorization &&\n    !isSupportedDelegationAddress7702(params.signedAuthorization.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,\n    });\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new InvalidRequestError({\n        message:\n          \"Remote mode deferred action not supported in isomorphic client\",\n      });\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const entryPoint =\n    params.type === \"user-operation-v060\"\n      ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n      : getEntryPoint(client.chain, { version: \"0.7.0\" });\n\n  const hash = await client\n    .sendRawUserOperation(\n      {\n        ...params.data,\n        signature:\n          deferredAction != null\n            ? concatHex([\n                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).\n                \"0xff\",\n                \"0x00\",\n                params.signature.signature,\n              ])\n            : concat([\"0xFF\", \"0x00\", params.signature.signature]),\n        eip7702Auth: params.signedAuthorization,\n      },\n      entryPoint.address,\n    )\n    .catch((err) => {\n      if (\n        err instanceof BaseError &&\n        err.details.endsWith(\"is not a contract and initCode is empty\")\n      ) {\n        throw new BaseError(\n          `${err.details} (If using 7702, be sure you include the 'signedAuthorization' field in the request parameters)`,\n        );\n      }\n      throw err;\n    });\n\n  const callId = Value.Encode(TypeCallId, {\n    chainId: toHex(client.chain.id),\n    hash,\n  });\n\n  return {\n    preparedCallIds: [callId],\n  };\n}\n"]}
+{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,GAGd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,WAAW,EACX,cAAc,EACd,KAAK,GAKN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAiC,MAAM,sBAAsB,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAU9D,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAMC,EACD,MAA+B;IAE/B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,cAAc,GAAoB,CAAC,GAAG,EAAE;QAC5C,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,wBAAwB,CAC7C,MAAM,CAAC,YAAY,CAAC,WAAW,CAChC,CAAC;QAEF,IAAI,cAAc,CAAC,cAAc,KAAK,6BAA6B,EAAE,CAAC;YACpE,MAAM,IAAI,mBAAmB,CAAC;gBAC5B,OAAO,EACL,gEAAgE;aACnE,CAAC,CAAC;QACL,CAAC;QAED,OAAO,cAAc,CAAC,cAAc,CAAC;IACvC,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,OAAO,GACX,MAAM,CAAC,IAAI,KAAK,OAAO;QACrB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YACxB,MAAM,QAAQ,GACZ,EAAE,CAAC,IAAI,KAAK,qBAAqB;gBACjC,EAAE,CAAC,IAAI,KAAK,qBAAqB,CAAC;YACpC,IAAI,QAAQ,IAAI,EAAE,CAAC,OAAO,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtD,MAAM,IAAI,mBAAmB,CAAC;oBAC5B,OAAO,EACL,qEAAqE;iBACxE,CAAC,CAAC;YACL,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAEf,MAAM,cAAc,GAClB,MAAM,CAAC,IAAI,KAAK,OAAO;QACrB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EACL,yEAAyE;SAC5E,CAAC,CAAC;IACL,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;IAEvC,6GAA6G;IAC7G,IACE,aAAa;QACb,CAAC,gCAAgC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAC7D,CAAC;QACD,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,wCAAwC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE;SAC9E,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAChC,MAAM,EAAE,GACN,MAAM,CAAC,IAAI,KAAK,qBAAqB;YACnC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;YACnD,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB;gBACrC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;gBACnD,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,aAAa;YAC3B,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;QACxD,OAAO,MAAM;aACV,oBAAoB,CACnB;YACE,GAAG,MAAM,CAAC,IAAI;YACd,SAAS,EACP,cAAc,IAAI,IAAI;gBACpB,CAAC,CAAC,SAAS,CAAC;oBACR,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,+EAA+E;oBAChH,MAAM;oBACN,MAAM;oBACN,QAAQ;iBACT,CAAC;gBACJ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxC,WAAW,EACT,GAAG,KAAK,CAAC,IAAI,aAAa,IAAI,OAAO;gBACnC,CAAC,CAAC;oBACE,GAAG,aAAa,CAAC,IAAI;oBACrB,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,GAAG;wBACD,GAAG,OAAO;wBACV,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;qBACtC;iBACF;gBACH,CAAC,CAAC,SAAS;SAChB,EACD,EAAE,CAAC,OAAO,CACX;aACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IACE,GAAG,YAAY,SAAS;gBACxB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,yCAAyC,CAAC,EAC/D,CAAC;gBACD,MAAM,IAAI,SAAS,CACjB,GAAG,GAAG,CAAC,OAAO,0FAA0F,CACzG,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACH,CAAC;IAEF,OAAO;QACL,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;YACvB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI;SACL,CAAC,CACH;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  numberToHex,\n  parseSignature,\n  toHex,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport { type wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { isSupportedDelegationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { decodeSignature } from \"../utils/decodeSignature.js\";\n\nexport type SendPreparedCallsParams = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new InvalidRequestError({\n        message:\n          \"Remote mode deferred action not supported in isomorphic client\",\n      });\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const userOps =\n    params.type === \"array\"\n      ? params.data.filter((it) => {\n          const isUserOp =\n            it.type === \"user-operation-v060\" ||\n            it.type === \"user-operation-v070\";\n          if (isUserOp && it.chainId !== toHex(client.chain.id)) {\n            throw new InvalidRequestError({\n              message:\n                \"Multiple chain IDs in a single request are not currently supported.\",\n            });\n          }\n          return isUserOp;\n        })\n      : [params];\n\n  const authorizations =\n    params.type === \"array\"\n      ? params.data.filter((it) => it.type === \"authorization\")\n      : [];\n\n  if (authorizations.length > 1) {\n    throw new InvalidRequestError({\n      message:\n        \"Multiple authorizations in a single request are not currently supported\",\n    });\n  }\n  const [authorization] = authorizations;\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    authorization &&\n    !isSupportedDelegationAddress7702(authorization.data.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${authorization.data.address}`,\n    });\n  }\n\n  const hashes = await Promise.all(\n    userOps.map(async (userOp, idx) => {\n      const ep: { address: Address } =\n        userOp.type === \"user-operation-v060\"\n          ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n          : userOp.type === \"user-operation-v070\"\n            ? getEntryPoint(client.chain, { version: \"0.7.0\" })\n            : assertNever(userOp, \"Unexpected user op type\");\n      const authSig = authorization\n        ? parseSignature(decodeSignature(authorization.signature).data)\n        : undefined;\n      const uoSigHex = decodeSignature(userOp.signature).data;\n      return client\n        .sendRawUserOperation(\n          {\n            ...userOp.data,\n            signature:\n              deferredAction != null\n                ? concatHex([\n                    `0x${deferredAction.slice(68)}`, // Cuts off stuff prepended to the digest (nonce, etc. that we had previously).\n                    \"0xff\",\n                    \"0x00\",\n                    uoSigHex,\n                  ])\n                : concat([\"0xFF\", \"0x00\", uoSigHex]),\n            eip7702Auth:\n              idx === 0 && authorization && authSig\n                ? {\n                    ...authorization.data,\n                    chainId: authorization.chainId,\n                    ...{\n                      ...authSig,\n                      yParity: numberToHex(authSig.yParity),\n                    },\n                  }\n                : undefined,\n          },\n          ep.address,\n        )\n        .catch((err) => {\n          if (\n            err instanceof BaseError &&\n            err.details.endsWith(\"is not a contract and initCode is empty\")\n          ) {\n            throw new BaseError(\n              `${err.details} (If using 7702, be sure you include the signed authorization in the request parameters)`,\n            );\n          }\n          throw err;\n        });\n    }),\n  );\n\n  return {\n    preparedCallIds: hashes.map((hash) =>\n      Value.Encode(TypeCallId, {\n        chainId: toHex(client.chain.id),\n        hash,\n      }),\n    ),\n  };\n}\n"]}

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

@@ -13,7 +13,108 @@ type ClientParams = {
 };
 export declare function isomorphicClientActions(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>): {
     prepareCalls: (params: PrepareCallsParams) => Promise<{
-        type: "user-operation-v060" | "user-operation-v070";
+        type: "array";
+        data: ({
+            type: "user-operation-v060";
+            chainId: `0x${string}`;
+            data: {
+                sender: `0x${string}`;
+                nonce: `0x${string}`;
+                initCode: `0x${string}`;
+                callData: `0x${string}`;
+                callGasLimit: `0x${string}`;
+                verificationGasLimit: `0x${string}`;
+                preVerificationGas: `0x${string}`;
+                maxFeePerGas: `0x${string}`;
+                maxPriorityFeePerGas: `0x${string}`;
+                paymasterAndData: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eth_signTypedData_v4";
+                data: {
+                    domain?: {
+                        chainId?: number | undefined;
+                        salt?: `0x${string}` | undefined;
+                        name?: string | undefined;
+                        verifyingContract?: `0x${string}` | undefined;
+                        version?: string | undefined;
+                    } | undefined;
+                    types: {
+                        [x: string]: {
+                            type: string;
+                            name: string;
+                        }[];
+                    };
+                    primaryType: string;
+                    message: {
+                        [x: string]: unknown;
+                    };
+                };
+            } | {
+                type: "personal_sign";
+                data: string | {
+                    raw: `0x${string}`;
+                };
+            };
+        } | {
+            type: "user-operation-v070";
+            chainId: `0x${string}`;
+            data: {
+                factory?: `0x${string}` | undefined;
+                factoryData?: `0x${string}` | undefined;
+                paymaster?: `0x${string}` | undefined;
+                paymasterData?: `0x${string}` | undefined;
+                paymasterVerificationGasLimit?: `0x${string}` | undefined;
+                paymasterPostOpGasLimit?: `0x${string}` | undefined;
+                sender: `0x${string}`;
+                nonce: `0x${string}`;
+                callData: `0x${string}`;
+                callGasLimit: `0x${string}`;
+                verificationGasLimit: `0x${string}`;
+                preVerificationGas: `0x${string}`;
+                maxFeePerGas: `0x${string}`;
+                maxPriorityFeePerGas: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eth_signTypedData_v4";
+                data: {
+                    domain?: {
+                        chainId?: number | undefined;
+                        salt?: `0x${string}` | undefined;
+                        name?: string | undefined;
+                        verifyingContract?: `0x${string}` | undefined;
+                        version?: string | undefined;
+                    } | undefined;
+                    types: {
+                        [x: string]: {
+                            type: string;
+                            name: string;
+                        }[];
+                    };
+                    primaryType: string;
+                    message: {
+                        [x: string]: unknown;
+                    };
+                };
+            } | {
+                type: "personal_sign";
+                data: string | {
+                    raw: `0x${string}`;
+                };
+            };
+        } | {
+            type: "authorization";
+            chainId: `0x${string}`;
+            data: {
+                nonce: `0x${string}`;
+                address: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eip7702Auth";
+            };
+        })[];
+    } | {
+        type: "user-operation-v060";
         chainId: `0x${string}`;
         data: {
             sender: `0x${string}`;
@@ -26,7 +127,38 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             maxFeePerGas: `0x${string}`;
             maxPriorityFeePerGas: `0x${string}`;
             paymasterAndData: `0x${string}`;
+        };
+        signatureRequest: {
+            type: "eth_signTypedData_v4";
+            data: {
+                domain?: {
+                    chainId?: number | undefined;
+                    salt?: `0x${string}` | undefined;
+                    name?: string | undefined;
+                    verifyingContract?: `0x${string}` | undefined;
+                    version?: string | undefined;
+                } | undefined;
+                types: {
+                    [x: string]: {
+                        type: string;
+                        name: string;
+                    }[];
+                };
+                primaryType: string;
+                message: {
+                    [x: string]: unknown;
+                };
+            };
         } | {
+            type: "personal_sign";
+            data: string | {
+                raw: `0x${string}`;
+            };
+        };
+    } | {
+        type: "user-operation-v070";
+        chainId: `0x${string}`;
+        data: {
             factory?: `0x${string}` | undefined;
             factoryData?: `0x${string}` | undefined;
             paymaster?: `0x${string}` | undefined;
@@ -42,12 +174,7 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             maxFeePerGas: `0x${string}`;
             maxPriorityFeePerGas: `0x${string}`;
         };
-        signatureRequest: ({
-            type: "personal_sign";
-            data: string | {
-                raw: `0x${string}`;
-            };
-        } | {
+        signatureRequest: {
             type: "eth_signTypedData_v4";
             data: {
                 domain?: {
@@ -68,12 +195,11 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                     [x: string]: unknown;
                 };
             };
-        }) & {
-            authorizationRequest?: {
-                nonce: number;
-                chainId: number;
-                address: `0x${string}`;
-            } | undefined;
+        } | {
+            type: "personal_sign";
+            data: string | {
+                raw: `0x${string}`;
+            };
         };
     }>;
     sendPreparedCalls: (params: SendPreparedCallsParams) => Promise<{

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

@@ -1,12 +1,13 @@
 import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
-import { type Authorization, type Address, type Chain, type Transport } from "viem";
+import { type Address, type Chain, type Transport } from "viem";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { PreparedCall_Authorization } from "../../schemas.js";
 import type { Eip7702AuthCapability } from "../../capabilities/eip7702Auth.ts";
 import type { Static } from "@sinclair/typebox";
-export declare const createAuthorization: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
+export declare const createAuthorizationRequest: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
     address: Address;
     delegation: Address;
-}) => Promise<Authorization<number, false> | undefined>;
+}) => Promise<Static<typeof PreparedCall_Authorization> | undefined>;
 export declare const EIP_7702_ACCOUNT_TYPE: readonly ["ModularAccountV2"];
 type Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];
 export declare const SUPPORTED_DELEGATION_ADDRESSES: "0x69007702764179f14F51cdce752f4f775d74E139"[];

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

@@ -1,17 +1,25 @@
-import { concatHex, isAddress, } from "viem";
+import { concatHex, numberToHex, isAddress, } from "viem";
+import { PreparedCall_Authorization } from "../../schemas.js";
 import { InvalidRequestError } from "ox/RpcResponse";
-export const createAuthorization = async (client, params) => {
+export const createAuthorizationRequest = async (client, params) => {
     const expectedCode = concatHex(["0xef0100", params.delegation]);
     const code = (await client.getCode({ address: params.address })) ?? "0x";
     if (code.toLowerCase() === expectedCode.toLowerCase()) {
         return undefined; // Already authorized.
     }
-    return {
-        chainId: client.chain.id,
+    const data = {
         address: params.delegation,
-        nonce: await client.getTransactionCount({
+        nonce: numberToHex(await client.getTransactionCount({
             address: params.address,
-        }),
+        })),
+    };
+    return {
+        type: "authorization",
+        data,
+        chainId: numberToHex(client.chain.id),
+        signatureRequest: {
+            type: "eip7702Auth",
+        },
     };
 };
 export const EIP_7702_ACCOUNT_TYPE = ["ModularAccountV2"];

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

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

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

@@ -0,0 +1,3 @@
+import type { Static, StaticDecode } from "@sinclair/typebox";
+import { TypeEcdsaSig } from "../../schemas.js";
+export declare const decodeSignature: (signature: Static<typeof TypeEcdsaSig>["signature"]) => StaticDecode<typeof TypeEcdsaSig>["signature"];

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

@@ -0,0 +1,13 @@
+import { Value } from "@sinclair/typebox/value";
+import { TypeEcdsaSig } from "../../schemas.js";
+import { assertNever } from "../../utils.js";
+export const decodeSignature = (signature) => {
+    switch (signature.type) {
+        case "ecdsa":
+        case "secp256k1":
+            return Value.Decode(TypeEcdsaSig, { signature }).signature;
+        default:
+            return assertNever(signature, "Unexpected signature type");
+    }
+};
+//# sourceMappingURL=decodeSignature.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"decodeSignature.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/decodeSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAmD,EACH,EAAE;IAClD,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW;YACd,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,EAE5C,CAAC,CAAC,SAAS,CAAC;QACf;YACE,OAAO,WAAW,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { Value } from \"@sinclair/typebox/value\";\nimport type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { TypeEcdsaSig } from \"../../schemas.js\";\nimport { assertNever } from \"../../utils.js\";\n\nexport const decodeSignature = (\n  signature: Static<typeof TypeEcdsaSig>[\"signature\"],\n): StaticDecode<typeof TypeEcdsaSig>[\"signature\"] => {\n  switch (signature.type) {\n    case \"ecdsa\":\n    case \"secp256k1\":\n      return Value.Decode(TypeEcdsaSig, { signature } satisfies Static<\n        typeof TypeEcdsaSig\n      >).signature;\n    default:\n      return assertNever(signature, \"Unexpected signature type\");\n  }\n};\n"]}

package/dist/esm/local/client.js

@@ -81,16 +81,15 @@ const innerClientActions = (isomorphicClient) => {
     return {
         grantPermissions: async (signer, params) => {
             const { signatureRequest, fullPreSignatureDeferredActionDigest } = await isomorphicClient.createSession(params);
-            const { signedAuthorization, signature } = await signSignatureRequest(signer, signatureRequest);
+            const signature = await signSignatureRequest(signer, signatureRequest);
             return {
                 context: encodePermissionsContext({
                     contextVersion: "LOCAL_MODE_DEFERRED_ACTION",
                     deferredAction: buildDeferredActionDigest({
                         fullPreSignatureDeferredActionDigest,
-                        sig: prefixSignatureKeyType(signature, "secp256k1"),
+                        sig: prefixSignatureKeyType(signature.data, signature.type),
                     }),
                 }),
-                signedAuthorization,
             };
         },
     };