@zerodev/sdk 4.3.1 → 4.3.3

package/dist/types/kernel-zerodev/validator/session-key-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-key-validator.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/session-key-validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-key-validator.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/validator/session-key-validator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.3.1",
+  "version": "4.3.3",
   "description": "A collection of ERC-4337 compliant smart contract account interfaces",
   "author": "ZeroDev",
   "license": "MIT",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@turnkey/api-key-stamper": "^0.1.1",
-    "@turnkey/http": "^1.2.0",
+    "@turnkey/http": "^2.1.0",
     "@turnkey/viem": "^0.2.4",
     "typescript": "^5.0.4",
     "typescript-template": "*",
@@ -70,6 +70,7 @@
     "@openzeppelin/merkle-tree": "^1.0.5",
     "axios": "^1.4.0",
     "merkletreejs": "^0.3.10",
+    "radash": "^11.0.0",
     "viem": "^1.5.3"
   }
 }

package/src/kernel-zerodev/owner/getCustodialOwner.ts

@@ -1,12 +1,13 @@
 import type { SignTypedDataParams, SmartAccountSigner } from "@alchemy/aa-core";
 import { API_URL } from "../constants.js";
 import axios from "axios";
+import { memo, tryit } from "radash";
 
 /**
  * Params to get a custodial owner
  * Priv / pub key combo or custodial file path should be in different types
  */
-type GetCustodialOwnerParams = {
+type GetCustodialOwnerParams = Readonly<{
   // ZeroDev api url
   apiUrl?: string;
   // Turnkey client (if the client want to reuse it
@@ -19,7 +20,7 @@ type GetCustodialOwnerParams = {
 
   // Or read them from the custodial file path
   custodialFilePath?: string;
-};
+}>;
 
 /**
  * Returns a signer for a custodial wallet via TurnKey
@@ -37,80 +38,40 @@ export async function getCustodialOwner(
 ): Promise<SmartAccountSigner | undefined> {
   // Extract data from the custodial file path if provided
   if (custodialFilePath) {
-    let fsModule;
-    try {
-      fsModule = require.resolve("fs") && require("fs");
-    } catch (error) {
-      console.log("FS module not available. Skipping FS operation...");
-      return;
-    }
-    const data = fsModule.readFileSync(custodialFilePath, "utf8");
-    const values = data.split("\n");
-    // Override the values, if they are provided, to the one from the custodial file
-    [privateKey, publicKey, keyId] = values;
+    [privateKey, publicKey, keyId] = await loadSignDataFromCustodialFile(
+      custodialFilePath
+    );
   }
 
   // Ensure we have the required values
-  if (!privateKey || !publicKey || !keyId) {
-    throw new Error(
-      "Must provide custodialFilePath or privateKey, publicKey, and keyId."
-    );
+  if (!keyId) {
+    throw new Error("You must provide custodialFilePath or a keyId.");
   }
 
   // Get our turnkey client (build it if needed)
-  if (!turnKeyClient) {
-    // Try to fetch turnkey client & api key stamper
-    let TurnkeyClient;
-    let ApiKeyStamper;
-    // TODO: Would be cleaner with something like radash and a tryit function?
-    try {
-      TurnkeyClient =
-        require.resolve("@turnkey/http") &&
-        require("@turnkey/http").TurnkeyClient;
-      ApiKeyStamper =
-        require.resolve("@turnkey/api-key-stamper") &&
-        require("@turnkey/api-key-stamper").ApiKeyStamper;
-    } catch (error) {
-      console.log(
-        "@turnkey/http or @turnkey/api-key-stamper module not available. Skipping FS operation..."
-      );
-      return;
-    }
-
-    // Build the turnkey client
-    turnKeyClient = new TurnkeyClient(
-      {
-        baseUrl: "https://api.turnkey.com",
-      },
-      new ApiKeyStamper({
-        apiPublicKey: publicKey,
-        apiPrivateKey: privateKey,
-      })
+  let ensuredTurnkeyClient = turnKeyClient;
+  if (!ensuredTurnkeyClient && privateKey && publicKey) {
+    ensuredTurnkeyClient = await getDefaultTurnkeyClient({
+      privateKey,
+      publicKey,
+    });
+  } else {
+    throw new Error(
+      "No turnkey client available, if you don't provide one you should provide private and public key or a custodial file path"
     );
   }
 
   // Get the wallet identifier from the API
-  const response = await axios.post<any, { data: { walletId: string } }>(
-    `${apiUrl}/wallets/${identifier}`,
-    {
-      keyId,
-    }
-  );
+  const response = await fetchWallet({ identifier, keyId, apiUrl });
+  if (!response?.data?.walletId) {
+    throw new Error(`No wallet id found for ${identifier}`);
+  }
 
   // Build the turnkey viem account
-  let createAccount;
-  try {
-    createAccount =
-      require.resolve("@turnkey/viem") &&
-      require("@turnkey/viem").createAccount;
-  } catch (error) {
-    console.log("@turnkey/viem module not available. Skipping FS operation...");
-    return;
-  }
-  const turnkeySigner = await createAccount({
-    client: turnKeyClient,
-    organizationId: keyId,
+  const turnkeySigner = await getTurnkeySigner({
+    keyId,
     privateKeyId: response.data.walletId,
+    turnkeyClient: ensuredTurnkeyClient,
   });
 
   // Return an alchemy AA signer from the turnkey signer
@@ -129,3 +90,154 @@ export async function getCustodialOwner(
       turnkeySigner.signTypedData(params),
   };
 }
+
+/**
+ * Try to load sign data from a local custodial file path
+ */
+const loadSignDataFromCustodialFile = memo(
+  async (custodialFilePath: string) => {
+    const [, fsModule] = await tryit(() => import("fs"))();
+    if (!fsModule) {
+      console.error("FS module not available");
+      throw new Error(
+        "FS module not available, you must provide each keys or install this module"
+      );
+    }
+    const data = fsModule.readFileSync(custodialFilePath, "utf8");
+    return data.split("\n");
+  },
+  {
+    // TTL of 1min in the memory cache
+    ttl: 1000 * 60,
+    // The key in the cache
+    key: (custodialFilePath: string) => `${custodialFilePath}`,
+  }
+);
+
+/**
+ * Get our default turnkey client
+ */
+const getDefaultTurnkeyClient = memo(
+  async ({
+    privateKey,
+    publicKey,
+  }: {
+    privateKey: string;
+    publicKey: string;
+  }) => {
+    // Try to fetch turnkey client & api key stamper
+    const [, turnkeyHttp] = await tryit(() => import("@turnkey/http"))();
+    const [, turnkeyApiKeyStamper] = await tryit(
+      () => import("@turnkey/api-key-stamper")
+    )();
+    if (!turnkeyHttp || !turnkeyApiKeyStamper) {
+      console.error(
+        "@turnkey/http or @turnkey/api-key-stamper module not available."
+      );
+      throw new Error(
+        "Turnkey http or api-key-stamper modules not available, you must provide a turnkey client or install this modules"
+      );
+    }
+
+    // Build the turnkey client
+    return new turnkeyHttp.TurnkeyClient(
+      {
+        baseUrl: "https://api.turnkey.com",
+      },
+      new turnkeyApiKeyStamper.ApiKeyStamper({
+        apiPublicKey: publicKey,
+        apiPrivateKey: privateKey,
+      })
+    );
+  },
+  {
+    // TTL of 1min in the memory cache
+    ttl: 1000 * 60,
+    // The key in the cache
+    key: ({
+      privateKey,
+      publicKey,
+    }: {
+      privateKey: string;
+      publicKey: string;
+    }) => `${privateKey}-${publicKey}`,
+  }
+);
+
+/**
+ * Simple function used to fetch the wallet id from the API using an identifier
+ */
+const fetchWallet = memo(
+  ({
+    identifier,
+    keyId,
+    apiUrl,
+  }: {
+    identifier: string;
+    keyId: string;
+    apiUrl: string;
+  }) => {
+    return axios.post<any, { data: { walletId: string } }>(
+      `${apiUrl}/wallets/${identifier}`,
+      {
+        keyId,
+      }
+    );
+  },
+  {
+    // TTL of 1min in the memory cache
+    ttl: 1000 * 60,
+    // The key in the cache
+    key: ({
+      identifier,
+      keyId,
+      apiUrl,
+    }: {
+      identifier: string;
+      keyId: string;
+      apiUrl: string;
+    }) => `${identifier}-${keyId}-${apiUrl}`,
+  }
+);
+
+/**
+ * Get a turnkey signer
+ */
+const getTurnkeySigner = memo(
+  async ({
+    keyId,
+    privateKeyId,
+    turnkeyClient,
+  }: {
+    keyId: string;
+    privateKeyId: string;
+    turnkeyClient: unknown;
+  }) => {
+    // Get the turnkey viem account
+    const [, turnkeyViem] = await tryit(() => import("@turnkey/viem"))();
+    if (!turnkeyViem) {
+      console.error("@turnkey/viem module not available");
+      throw new Error(
+        "Turnkey viem module not available, can't create a turnkey signer for the custodial owner"
+      );
+    }
+    return turnkeyViem.createAccount({
+      client: turnkeyClient as any,
+      organizationId: keyId,
+      privateKeyId,
+    });
+  },
+  {
+    // TTL of 1min in the memory cache
+    ttl: 1000 * 60,
+    // The key in the cache
+    key: ({
+      keyId,
+      privateKeyId,
+    }: {
+      keyId: string;
+      privateKeyId: string;
+      turnkeyClient: unknown;
+    }) => `${keyId}-${privateKeyId}`,
+  }
+);

package/src/kernel-zerodev/owner/passkey/utils.ts

@@ -47,10 +47,10 @@ export const signMessageImplementation = async (
   const signedRequest = await TurnkeyApi.signSignRawPayload(
     {
       body: {
-        type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD",
+        type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
         organizationId: id,
         parameters: {
-          privateKeyId: walletId,
+          signWith: walletId,
           payload: msg,
           encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
           hashFunction: "HASH_FUNCTION_NO_OP",

package/src/kernel-zerodev/validator/base.ts

@@ -60,6 +60,7 @@ export type ValidatorPluginData = Required<
 export abstract class KernelBaseValidator {
   readonly validatorAddress: Hex;
   mode: ValidatorMode;
+  resolvedMode?: ValidatorMode;
   protected projectId: string;
   protected chain?: Chain;
   protected entryPointAddress: Address;
@@ -136,10 +137,9 @@ export abstract class KernelBaseValidator {
   ): Promise<Hex> {
     const dummyECDSASig =
       "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
-    const validatorMode = await this.resolveValidatorMode(
-      kernelAccountAddress,
-      calldata
-    );
+    const validatorMode =
+      this.resolvedMode ??
+      (await this.resolveValidatorMode(kernelAccountAddress, calldata));
     if (validatorMode === ValidatorMode.enable) {
       const enableData = await this.getEnableData(kernelAccountAddress);
       const enableDataLength = enableData.length / 2 - 1;
@@ -286,14 +286,14 @@ export abstract class KernelBaseValidator {
         mode = this.mode;
       }
     }
+    this.resolvedMode = mode;
     return mode;
   }
 
   async getSignature(userOp: UserOperationRequest): Promise<Hex> {
-    const mode = await this.resolveValidatorMode(
-      userOp.sender,
-      userOp.callData
-    );
+    const mode =
+      this.resolvedMode ??
+      (await this.resolveValidatorMode(userOp.sender, userOp.callData));
     if (mode === ValidatorMode.sudo || mode === ValidatorMode.plugin) {
       return concatHex([this.mode, await this.signUserOp(userOp)]);
     } else {

package/src/kernel-zerodev/validator/session-key-validator.ts

@@ -403,8 +403,7 @@ export class SessionKeyValidator extends KernelBaseValidator {
     return permissionPacked && permissionPacked.length !== 0
       ? new MerkleTree(permissionPacked, keccak256, {
           hashLeaves: true,
-          complete: true,
-          sort: true,
+          sortPairs: true,
         })
       : new MerkleTree([pad("0x00", { size: 32 })], keccak256, {
           hashLeaves: false,