@zerodev/sdk 4.3.2 → 4.3.3

package/dist/cjs/kernel-zerodev/owner/getCustodialOwner.d.ts

@@ -1,11 +1,11 @@
 import type { SmartAccountSigner } from "@alchemy/aa-core";
-type GetCustodialOwnerParams = {
+type GetCustodialOwnerParams = Readonly<{
     apiUrl?: string;
     turnKeyClient?: unknown;
     privateKey?: string;
     publicKey?: string;
     keyId?: string;
     custodialFilePath?: string;
-};
+}>;
 export declare function getCustodialOwner(identifier: string, { custodialFilePath, privateKey, publicKey, keyId, apiUrl, turnKeyClient, }: GetCustodialOwnerParams): Promise<SmartAccountSigner | undefined>;
 export {};

package/dist/cjs/kernel-zerodev/owner/getCustodialOwner.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,62 +29,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustodialOwner = void 0;
 const constants_js_1 = require("../constants.js");
 const axios_1 = __importDefault(require("axios"));
+const radash_1 = require("radash");
 async function getCustodialOwner(identifier, { custodialFilePath, privateKey, publicKey, keyId, apiUrl = constants_js_1.API_URL, turnKeyClient, }) {
     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");
-        [privateKey, publicKey, keyId] = values;
+        [privateKey, publicKey, keyId] = await loadSignDataFromCustodialFile(custodialFilePath);
     }
-    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.");
     }
-    if (!turnKeyClient) {
-        let TurnkeyClient;
-        let ApiKeyStamper;
-        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;
-        }
-        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,
+        });
     }
-    const response = await axios_1.default.post(`${apiUrl}/wallets/${identifier}`, {
-        keyId,
-    });
-    let createAccount;
-    try {
-        createAccount =
-            require.resolve("@turnkey/viem") &&
-                require("@turnkey/viem").createAccount;
+    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");
     }
-    catch (error) {
-        console.log("@turnkey/viem module not available. Skipping FS operation...");
-        return;
+    const response = await fetchWallet({ identifier, keyId, apiUrl });
+    if (!response?.data?.walletId) {
+        throw new Error(`No wallet id found for ${identifier}`);
     }
-    const turnkeySigner = await createAccount({
-        client: turnKeyClient,
-        organizationId: keyId,
+    const turnkeySigner = await getTurnkeySigner({
+        keyId,
         privateKeyId: response.data.walletId,
+        turnkeyClient: ensuredTurnkeyClient,
     });
     return {
         getAddress: async () => turnkeySigner.address,
@@ -77,4 +70,56 @@ async function getCustodialOwner(identifier, { custodialFilePath, privateKey, pu
     };
 }
 exports.getCustodialOwner = getCustodialOwner;
+const loadSignDataFromCustodialFile = (0, radash_1.memo)(async (custodialFilePath) => {
+    const [, fsModule] = await (0, radash_1.tryit)(() => Promise.resolve().then(() => __importStar(require("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: 1000 * 60,
+    key: (custodialFilePath) => `${custodialFilePath}`,
+});
+const getDefaultTurnkeyClient = (0, radash_1.memo)(async ({ privateKey, publicKey, }) => {
+    const [, turnkeyHttp] = await (0, radash_1.tryit)(() => Promise.resolve().then(() => __importStar(require("@turnkey/http"))))();
+    const [, turnkeyApiKeyStamper] = await (0, radash_1.tryit)(() => Promise.resolve().then(() => __importStar(require("@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");
+    }
+    return new turnkeyHttp.TurnkeyClient({
+        baseUrl: "https://api.turnkey.com",
+    }, new turnkeyApiKeyStamper.ApiKeyStamper({
+        apiPublicKey: publicKey,
+        apiPrivateKey: privateKey,
+    }));
+}, {
+    ttl: 1000 * 60,
+    key: ({ privateKey, publicKey, }) => `${privateKey}-${publicKey}`,
+});
+const fetchWallet = (0, radash_1.memo)(({ identifier, keyId, apiUrl, }) => {
+    return axios_1.default.post(`${apiUrl}/wallets/${identifier}`, {
+        keyId,
+    });
+}, {
+    ttl: 1000 * 60,
+    key: ({ identifier, keyId, apiUrl, }) => `${identifier}-${keyId}-${apiUrl}`,
+});
+const getTurnkeySigner = (0, radash_1.memo)(async ({ keyId, privateKeyId, turnkeyClient, }) => {
+    const [, turnkeyViem] = await (0, radash_1.tryit)(() => Promise.resolve().then(() => __importStar(require("@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,
+        organizationId: keyId,
+        privateKeyId,
+    });
+}, {
+    ttl: 1000 * 60,
+    key: ({ keyId, privateKeyId, }) => `${keyId}-${privateKeyId}`,
+});
 //# sourceMappingURL=getCustodialOwner.js.map

package/dist/cjs/kernel-zerodev/owner/getCustodialOwner.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCustodialOwner.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/owner/getCustodialOwner.ts"],"names":[],"mappings":";;;;;;AACA,kDAA0C;AAC1C,kDAA0B;AAwBnB,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,EACE,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,KAAK,EACL,MAAM,GAAG,sBAAO,EAChB,aAAa,GACW;IAG1B,IAAI,iBAAiB,EAAE;QACrB,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO;SACR;QACD,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC;KACzC;IAGD,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;KACH;IAGD,IAAI,CAAC,aAAa,EAAE;QAElB,IAAI,aAAa,CAAC;QAClB,IAAI,aAAa,CAAC;QAElB,IAAI;YACF,aAAa;gBACX,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;oBAChC,OAAO,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC;YACzC,aAAa;gBACX,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC;oBAC3C,OAAO,CAAC,0BAA0B,CAAC,CAAC,aAAa,CAAC;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CACT,0FAA0F,CAC3F,CAAC;YACF,OAAO;SACR;QAGD,aAAa,GAAG,IAAI,aAAa,CAC/B;YACE,OAAO,EAAE,yBAAyB;SACnC,EACD,IAAI,aAAa,CAAC;YAChB,YAAY,EAAE,SAAS;YACvB,aAAa,EAAE,UAAU;SAC1B,CAAC,CACH,CAAC;KACH;IAGD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAC/B,GAAG,MAAM,YAAY,UAAU,EAAE,EACjC;QACE,KAAK;KACN,CACF,CAAC;IAGF,IAAI,aAAa,CAAC;IAClB,IAAI;QACF,aAAa;YACX,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;gBAChC,OAAO,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAC5E,OAAO;KACR;IACD,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;QACxC,MAAM,EAAE,aAAa;QACrB,cAAc,EAAE,KAAK;QACrB,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;KACrC,CAAC,CAAC;IAGH,OAAO;QACL,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,aAAa,CAAC,OAAO;QAC7C,WAAW,EAAE,KAAK,EAAE,GAAwB,EAAE,EAAE;YAC9C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAE3B,OAAO,aAAa,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;aACpD;iBAAM;gBAEL,OAAO,aAAa,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;aAC7D;QACH,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,MAA2B,EAAE,EAAE,CACnD,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC;KACtC,CAAC;AACJ,CAAC;AAxGD,8CAwGC","sourcesContent":["import type { SignTypedDataParams, SmartAccountSigner } from \"@alchemy/aa-core\";\nimport { API_URL } from \"../constants.js\";\nimport axios from \"axios\";\n\n/**\n * Params to get a custodial owner\n * Priv / pub key combo or custodial file path should be in different types\n */\ntype GetCustodialOwnerParams = {\n  // ZeroDev api url\n  apiUrl?: string;\n  // Turnkey client (if the client want to reuse it\n  turnKeyClient?: unknown;\n\n  // Direct access to priv / pub key\n  privateKey?: string;\n  publicKey?: string;\n  keyId?: string;\n\n  // Or read them from the custodial file path\n  custodialFilePath?: string;\n};\n\n/**\n * Returns a signer for a custodial wallet via TurnKey\n */\nexport async function getCustodialOwner(\n  identifier: string,\n  {\n    custodialFilePath,\n    privateKey,\n    publicKey,\n    keyId,\n    apiUrl = API_URL,\n    turnKeyClient,\n  }: GetCustodialOwnerParams\n): Promise<SmartAccountSigner | undefined> {\n  // Extract data from the custodial file path if provided\n  if (custodialFilePath) {\n    let fsModule;\n    try {\n      fsModule = require.resolve(\"fs\") && require(\"fs\");\n    } catch (error) {\n      console.log(\"FS module not available. Skipping FS operation...\");\n      return;\n    }\n    const data = fsModule.readFileSync(custodialFilePath, \"utf8\");\n    const values = data.split(\"\\n\");\n    // Override the values, if they are provided, to the one from the custodial file\n    [privateKey, publicKey, keyId] = values;\n  }\n\n  // Ensure we have the required values\n  if (!privateKey || !publicKey || !keyId) {\n    throw new Error(\n      \"Must provide custodialFilePath or privateKey, publicKey, and keyId.\"\n    );\n  }\n\n  // Get our turnkey client (build it if needed)\n  if (!turnKeyClient) {\n    // Try to fetch turnkey client & api key stamper\n    let TurnkeyClient;\n    let ApiKeyStamper;\n    // TODO: Would be cleaner with something like radash and a tryit function?\n    try {\n      TurnkeyClient =\n        require.resolve(\"@turnkey/http\") &&\n        require(\"@turnkey/http\").TurnkeyClient;\n      ApiKeyStamper =\n        require.resolve(\"@turnkey/api-key-stamper\") &&\n        require(\"@turnkey/api-key-stamper\").ApiKeyStamper;\n    } catch (error) {\n      console.log(\n        \"@turnkey/http or @turnkey/api-key-stamper module not available. Skipping FS operation...\"\n      );\n      return;\n    }\n\n    // Build the turnkey client\n    turnKeyClient = new TurnkeyClient(\n      {\n        baseUrl: \"https://api.turnkey.com\",\n      },\n      new ApiKeyStamper({\n        apiPublicKey: publicKey,\n        apiPrivateKey: privateKey,\n      })\n    );\n  }\n\n  // Get the wallet identifier from the API\n  const response = await axios.post<any, { data: { walletId: string } }>(\n    `${apiUrl}/wallets/${identifier}`,\n    {\n      keyId,\n    }\n  );\n\n  // Build the turnkey viem account\n  let createAccount;\n  try {\n    createAccount =\n      require.resolve(\"@turnkey/viem\") &&\n      require(\"@turnkey/viem\").createAccount;\n  } catch (error) {\n    console.log(\"@turnkey/viem module not available. Skipping FS operation...\");\n    return;\n  }\n  const turnkeySigner = await createAccount({\n    client: turnKeyClient,\n    organizationId: keyId,\n    privateKeyId: response.data.walletId,\n  });\n\n  // Return an alchemy AA signer from the turnkey signer\n  return {\n    getAddress: async () => turnkeySigner.address,\n    signMessage: async (msg: Uint8Array | string) => {\n      if (typeof msg === \"string\") {\n        // If the msg is a string, sign it directly\n        return turnkeySigner.signMessage({ message: msg });\n      } else {\n        // Otherwise, sign the raw data\n        return turnkeySigner.signMessage({ message: { raw: msg } });\n      }\n    },\n    signTypedData: async (params: SignTypedDataParams) =>\n      turnkeySigner.signTypedData(params),\n  };\n}\n"]}
+{"version":3,"file":"getCustodialOwner.js","sourceRoot":"","sources":["../../../../src/kernel-zerodev/owner/getCustodialOwner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SignTypedDataParams, SmartAccountSigner } from \"@alchemy/aa-core\";\nimport { API_URL } from \"../constants.js\";\nimport axios from \"axios\";\nimport { memo, tryit } from \"radash\";\n\n/**\n * Params to get a custodial owner\n * Priv / pub key combo or custodial file path should be in different types\n */\ntype GetCustodialOwnerParams = Readonly<{\n  // ZeroDev api url\n  apiUrl?: string;\n  // Turnkey client (if the client want to reuse it\n  turnKeyClient?: unknown;\n\n  // Direct access to priv / pub key\n  privateKey?: string;\n  publicKey?: string;\n  keyId?: string;\n\n  // Or read them from the custodial file path\n  custodialFilePath?: string;\n}>;\n\n/**\n * Returns a signer for a custodial wallet via TurnKey\n */\nexport async function getCustodialOwner(\n  identifier: string,\n  {\n    custodialFilePath,\n    privateKey,\n    publicKey,\n    keyId,\n    apiUrl = API_URL,\n    turnKeyClient,\n  }: GetCustodialOwnerParams\n): Promise<SmartAccountSigner | undefined> {\n  // Extract data from the custodial file path if provided\n  if (custodialFilePath) {\n    [privateKey, publicKey, keyId] = await loadSignDataFromCustodialFile(\n      custodialFilePath\n    );\n  }\n\n  // Ensure we have the required values\n  if (!keyId) {\n    throw new Error(\"You must provide custodialFilePath or a keyId.\");\n  }\n\n  // Get our turnkey client (build it if needed)\n  let ensuredTurnkeyClient = turnKeyClient;\n  if (!ensuredTurnkeyClient && privateKey && publicKey) {\n    ensuredTurnkeyClient = await getDefaultTurnkeyClient({\n      privateKey,\n      publicKey,\n    });\n  } else {\n    throw new Error(\n      \"No turnkey client available, if you don't provide one you should provide private and public key or a custodial file path\"\n    );\n  }\n\n  // Get the wallet identifier from the API\n  const response = await fetchWallet({ identifier, keyId, apiUrl });\n  if (!response?.data?.walletId) {\n    throw new Error(`No wallet id found for ${identifier}`);\n  }\n\n  // Build the turnkey viem account\n  const turnkeySigner = await getTurnkeySigner({\n    keyId,\n    privateKeyId: response.data.walletId,\n    turnkeyClient: ensuredTurnkeyClient,\n  });\n\n  // Return an alchemy AA signer from the turnkey signer\n  return {\n    getAddress: async () => turnkeySigner.address,\n    signMessage: async (msg: Uint8Array | string) => {\n      if (typeof msg === \"string\") {\n        // If the msg is a string, sign it directly\n        return turnkeySigner.signMessage({ message: msg });\n      } else {\n        // Otherwise, sign the raw data\n        return turnkeySigner.signMessage({ message: { raw: msg } });\n      }\n    },\n    signTypedData: async (params: SignTypedDataParams) =>\n      turnkeySigner.signTypedData(params),\n  };\n}\n\n/**\n * Try to load sign data from a local custodial file path\n */\nconst loadSignDataFromCustodialFile = memo(\n  async (custodialFilePath: string) => {\n    const [, fsModule] = await tryit(() => import(\"fs\"))();\n    if (!fsModule) {\n      console.error(\"FS module not available\");\n      throw new Error(\n        \"FS module not available, you must provide each keys or install this module\"\n      );\n    }\n    const data = fsModule.readFileSync(custodialFilePath, \"utf8\");\n    return data.split(\"\\n\");\n  },\n  {\n    // TTL of 1min in the memory cache\n    ttl: 1000 * 60,\n    // The key in the cache\n    key: (custodialFilePath: string) => `${custodialFilePath}`,\n  }\n);\n\n/**\n * Get our default turnkey client\n */\nconst getDefaultTurnkeyClient = memo(\n  async ({\n    privateKey,\n    publicKey,\n  }: {\n    privateKey: string;\n    publicKey: string;\n  }) => {\n    // Try to fetch turnkey client & api key stamper\n    const [, turnkeyHttp] = await tryit(() => import(\"@turnkey/http\"))();\n    const [, turnkeyApiKeyStamper] = await tryit(\n      () => import(\"@turnkey/api-key-stamper\")\n    )();\n    if (!turnkeyHttp || !turnkeyApiKeyStamper) {\n      console.error(\n        \"@turnkey/http or @turnkey/api-key-stamper module not available.\"\n      );\n      throw new Error(\n        \"Turnkey http or api-key-stamper modules not available, you must provide a turnkey client or install this modules\"\n      );\n    }\n\n    // Build the turnkey client\n    return new turnkeyHttp.TurnkeyClient(\n      {\n        baseUrl: \"https://api.turnkey.com\",\n      },\n      new turnkeyApiKeyStamper.ApiKeyStamper({\n        apiPublicKey: publicKey,\n        apiPrivateKey: privateKey,\n      })\n    );\n  },\n  {\n    // TTL of 1min in the memory cache\n    ttl: 1000 * 60,\n    // The key in the cache\n    key: ({\n      privateKey,\n      publicKey,\n    }: {\n      privateKey: string;\n      publicKey: string;\n    }) => `${privateKey}-${publicKey}`,\n  }\n);\n\n/**\n * Simple function used to fetch the wallet id from the API using an identifier\n */\nconst fetchWallet = memo(\n  ({\n    identifier,\n    keyId,\n    apiUrl,\n  }: {\n    identifier: string;\n    keyId: string;\n    apiUrl: string;\n  }) => {\n    return axios.post<any, { data: { walletId: string } }>(\n      `${apiUrl}/wallets/${identifier}`,\n      {\n        keyId,\n      }\n    );\n  },\n  {\n    // TTL of 1min in the memory cache\n    ttl: 1000 * 60,\n    // The key in the cache\n    key: ({\n      identifier,\n      keyId,\n      apiUrl,\n    }: {\n      identifier: string;\n      keyId: string;\n      apiUrl: string;\n    }) => `${identifier}-${keyId}-${apiUrl}`,\n  }\n);\n\n/**\n * Get a turnkey signer\n */\nconst getTurnkeySigner = memo(\n  async ({\n    keyId,\n    privateKeyId,\n    turnkeyClient,\n  }: {\n    keyId: string;\n    privateKeyId: string;\n    turnkeyClient: unknown;\n  }) => {\n    // Get the turnkey viem account\n    const [, turnkeyViem] = await tryit(() => import(\"@turnkey/viem\"))();\n    if (!turnkeyViem) {\n      console.error(\"@turnkey/viem module not available\");\n      throw new Error(\n        \"Turnkey viem module not available, can't create a turnkey signer for the custodial owner\"\n      );\n    }\n    return turnkeyViem.createAccount({\n      client: turnkeyClient as any,\n      organizationId: keyId,\n      privateKeyId,\n    });\n  },\n  {\n    // TTL of 1min in the memory cache\n    ttl: 1000 * 60,\n    // The key in the cache\n    key: ({\n      keyId,\n      privateKeyId,\n    }: {\n      keyId: string;\n      privateKeyId: string;\n      turnkeyClient: unknown;\n    }) => `${keyId}-${privateKeyId}`,\n  }\n);\n"]}

package/dist/cjs/kernel-zerodev/owner/passkey/utils.js

@@ -39,10 +39,10 @@ const signMessageImplementation = async (msg, id, walletId, projectId, credentia
     abortWebauthn();
     const signedRequest = await http_1.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/dist/cjs/kernel-zerodev/owner/passkey/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/kernel-zerodev/owner/passkey/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { browserInit, TurnkeyApi } from \"@turnkey/http\";\nimport axios from \"axios\";\nimport { API_URL } from \"../../constants.js\";\nimport type { SignTypedDataParams } from \"@alchemy/aa-core\";\nimport { hashTypedData, signatureToHex, hashMessage } from \"viem\";\n\nbrowserInit({\n  baseUrl: \"https://api.turnkey.com\",\n});\n\nexport const abortController = {\n  controller: new AbortController(),\n};\n\nexport function abortWebauthn() {\n  abortController.controller.abort(\"ZeroDev: Reset previous Webauthn request\");\n  abortController.controller = new AbortController();\n}\n\nexport const publicKey = \"public-key\";\n\nexport const es256 = -7;\n\nexport const generateRandomBuffer = (): ArrayBuffer => {\n  const arr = new Uint8Array(32);\n  crypto.getRandomValues(arr);\n  return arr.buffer;\n};\n\nexport const base64UrlEncode = (challenge: ArrayBuffer): string => {\n  return Buffer.from(challenge)\n    .toString(\"base64\")\n    .replace(/\\+/g, \"-\")\n    .replace(/\\//g, \"_\")\n    .replace(/=/g, \"\");\n};\n\nexport const signMessageImplementation = async (\n  msg: string,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  abortWebauthn();\n  const signedRequest = await TurnkeyApi.signSignRawPayload(\n    {\n      body: {\n        type: \"ACTIVITY_TYPE_SIGN_RAW_PAYLOAD\",\n        organizationId: id,\n        parameters: {\n          privateKeyId: walletId,\n          payload: msg,\n          encoding: \"PAYLOAD_ENCODING_HEXADECIMAL\",\n          hashFunction: \"HASH_FUNCTION_NO_OP\",\n        },\n        timestampMs: String(Date.now()),\n      },\n    },\n    {\n      publicKey: {\n        allowCredentials: [\n          {\n            id: base64URLStringToBuffer(credentialId),\n            type: publicKey,\n          },\n        ],\n      },\n    }\n  );\n  const proxyResponse = await axios.post(\n    `${apiUrl}/projects/${projectId}/wallets/proxy`,\n    {\n      signedRequest,\n    }\n  );\n  const { activity } = await proxyResponse.data;\n  if (activity.status === \"ACTIVITY_STATUS_COMPLETED\") {\n    let result = activity?.result?.signRawPayloadResult;\n\n    if (result) {\n      const signatureHex = signatureToHex({\n        r: `0x${result.r}`,\n        s: `0x${result.s}`,\n        v: result.v === \"00\" ? 27n : 28n,\n      });\n      if (signatureHex) {\n        return signatureHex;\n      }\n    }\n  }\n  return \"0x\";\n};\n\nexport const signMessage = async (\n  msg: string | Uint8Array,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  return await signMessageImplementation(\n    hashMessage(typeof msg === \"string\" ? msg : { raw: msg }),\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const signTypedData = async (\n  params: SignTypedDataParams,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  const hashToSign = hashTypedData(params);\n  return await signMessageImplementation(\n    hashToSign,\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const getCredentials = async (\n  projectId: string,\n  name?: string,\n  apiUrl = API_URL\n) => {\n  const url =\n    `${apiUrl}/projects/${projectId}/wallets` + (name ? `/${name}` : \"\");\n  const response = await axios.get(url);\n  const credentials = response.data;\n  return credentials.map((credential: string) => ({\n    id: base64URLStringToBuffer(credential),\n    type: \"public-key\",\n  }));\n};\n\n// https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/browser/src/helpers/base64URLStringToBuffer.ts#L8\nexport function base64URLStringToBuffer(base64URLString: string): ArrayBuffer {\n  // Convert from Base64URL to Base64\n  const base64 = base64URLString.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  /**\n   * Pad with '=' until it's a multiple of four\n   * (4 - (85 % 4 = 1) = 3) % 4 = 3 padding\n   * (4 - (86 % 4 = 2) = 2) % 4 = 2 padding\n   * (4 - (87 % 4 = 3) = 1) % 4 = 1 padding\n   * (4 - (88 % 4 = 0) = 4) % 4 = 0 padding\n   */\n  const padLength = (4 - (base64.length % 4)) % 4;\n  const padded = base64.padEnd(base64.length + padLength, \"=\");\n\n  // Convert to a binary string\n  const binary = atob(padded);\n\n  // Convert binary string to buffer\n  const buffer = new ArrayBuffer(binary.length);\n  const bytes = new Uint8Array(buffer);\n\n  for (let i = 0; i < binary.length; i++) {\n    bytes[i] = binary.charCodeAt(i);\n  }\n\n  return buffer;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/kernel-zerodev/owner/passkey/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { browserInit, TurnkeyApi } from \"@turnkey/http\";\nimport axios from \"axios\";\nimport { API_URL } from \"../../constants.js\";\nimport type { SignTypedDataParams } from \"@alchemy/aa-core\";\nimport { hashTypedData, signatureToHex, hashMessage } from \"viem\";\n\nbrowserInit({\n  baseUrl: \"https://api.turnkey.com\",\n});\n\nexport const abortController = {\n  controller: new AbortController(),\n};\n\nexport function abortWebauthn() {\n  abortController.controller.abort(\"ZeroDev: Reset previous Webauthn request\");\n  abortController.controller = new AbortController();\n}\n\nexport const publicKey = \"public-key\";\n\nexport const es256 = -7;\n\nexport const generateRandomBuffer = (): ArrayBuffer => {\n  const arr = new Uint8Array(32);\n  crypto.getRandomValues(arr);\n  return arr.buffer;\n};\n\nexport const base64UrlEncode = (challenge: ArrayBuffer): string => {\n  return Buffer.from(challenge)\n    .toString(\"base64\")\n    .replace(/\\+/g, \"-\")\n    .replace(/\\//g, \"_\")\n    .replace(/=/g, \"\");\n};\n\nexport const signMessageImplementation = async (\n  msg: string,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  abortWebauthn();\n  const signedRequest = await TurnkeyApi.signSignRawPayload(\n    {\n      body: {\n        type: \"ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2\",\n        organizationId: id,\n        parameters: {\n          signWith: walletId,\n          payload: msg,\n          encoding: \"PAYLOAD_ENCODING_HEXADECIMAL\",\n          hashFunction: \"HASH_FUNCTION_NO_OP\",\n        },\n        timestampMs: String(Date.now()),\n      },\n    },\n    {\n      publicKey: {\n        allowCredentials: [\n          {\n            id: base64URLStringToBuffer(credentialId),\n            type: publicKey,\n          },\n        ],\n      },\n    }\n  );\n  const proxyResponse = await axios.post(\n    `${apiUrl}/projects/${projectId}/wallets/proxy`,\n    {\n      signedRequest,\n    }\n  );\n  const { activity } = await proxyResponse.data;\n  if (activity.status === \"ACTIVITY_STATUS_COMPLETED\") {\n    let result = activity?.result?.signRawPayloadResult;\n\n    if (result) {\n      const signatureHex = signatureToHex({\n        r: `0x${result.r}`,\n        s: `0x${result.s}`,\n        v: result.v === \"00\" ? 27n : 28n,\n      });\n      if (signatureHex) {\n        return signatureHex;\n      }\n    }\n  }\n  return \"0x\";\n};\n\nexport const signMessage = async (\n  msg: string | Uint8Array,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  return await signMessageImplementation(\n    hashMessage(typeof msg === \"string\" ? msg : { raw: msg }),\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const signTypedData = async (\n  params: SignTypedDataParams,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  const hashToSign = hashTypedData(params);\n  return await signMessageImplementation(\n    hashToSign,\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const getCredentials = async (\n  projectId: string,\n  name?: string,\n  apiUrl = API_URL\n) => {\n  const url =\n    `${apiUrl}/projects/${projectId}/wallets` + (name ? `/${name}` : \"\");\n  const response = await axios.get(url);\n  const credentials = response.data;\n  return credentials.map((credential: string) => ({\n    id: base64URLStringToBuffer(credential),\n    type: \"public-key\",\n  }));\n};\n\n// https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/browser/src/helpers/base64URLStringToBuffer.ts#L8\nexport function base64URLStringToBuffer(base64URLString: string): ArrayBuffer {\n  // Convert from Base64URL to Base64\n  const base64 = base64URLString.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  /**\n   * Pad with '=' until it's a multiple of four\n   * (4 - (85 % 4 = 1) = 3) % 4 = 3 padding\n   * (4 - (86 % 4 = 2) = 2) % 4 = 2 padding\n   * (4 - (87 % 4 = 3) = 1) % 4 = 1 padding\n   * (4 - (88 % 4 = 0) = 4) % 4 = 0 padding\n   */\n  const padLength = (4 - (base64.length % 4)) % 4;\n  const padded = base64.padEnd(base64.length + padLength, \"=\");\n\n  // Convert to a binary string\n  const binary = atob(padded);\n\n  // Convert binary string to buffer\n  const buffer = new ArrayBuffer(binary.length);\n  const bytes = new Uint8Array(buffer);\n\n  for (let i = 0; i < binary.length; i++) {\n    bytes[i] = binary.charCodeAt(i);\n  }\n\n  return buffer;\n}\n"]}

package/dist/esm/kernel-zerodev/owner/getCustodialOwner.d.ts

@@ -1,11 +1,11 @@
 import type { SmartAccountSigner } from "@alchemy/aa-core";
-type GetCustodialOwnerParams = {
+type GetCustodialOwnerParams = Readonly<{
     apiUrl?: string;
     turnKeyClient?: unknown;
     privateKey?: string;
     publicKey?: string;
     keyId?: string;
     custodialFilePath?: string;
-};
+}>;
 export declare function getCustodialOwner(identifier: string, { custodialFilePath, privateKey, publicKey, keyId, apiUrl, turnKeyClient, }: GetCustodialOwnerParams): Promise<SmartAccountSigner | undefined>;
 export {};

package/dist/esm/kernel-zerodev/owner/getCustodialOwner.js

@@ -1,61 +1,31 @@
 import { API_URL } from "../constants.js";
 import axios from "axios";
+import { memo, tryit } from "radash";
 export async function getCustodialOwner(identifier, { custodialFilePath, privateKey, publicKey, keyId, apiUrl = API_URL, turnKeyClient, }) {
     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");
-        [privateKey, publicKey, keyId] = values;
+        [privateKey, publicKey, keyId] = await loadSignDataFromCustodialFile(custodialFilePath);
     }
-    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.");
     }
-    if (!turnKeyClient) {
-        let TurnkeyClient;
-        let ApiKeyStamper;
-        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;
-        }
-        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,
+        });
     }
-    const response = await axios.post(`${apiUrl}/wallets/${identifier}`, {
-        keyId,
-    });
-    let createAccount;
-    try {
-        createAccount =
-            require.resolve("@turnkey/viem") &&
-                require("@turnkey/viem").createAccount;
+    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");
     }
-    catch (error) {
-        console.log("@turnkey/viem module not available. Skipping FS operation...");
-        return;
+    const response = await fetchWallet({ identifier, keyId, apiUrl });
+    if (!response?.data?.walletId) {
+        throw new Error(`No wallet id found for ${identifier}`);
     }
-    const turnkeySigner = await createAccount({
-        client: turnKeyClient,
-        organizationId: keyId,
+    const turnkeySigner = await getTurnkeySigner({
+        keyId,
         privateKeyId: response.data.walletId,
+        turnkeyClient: ensuredTurnkeyClient,
     });
     return {
         getAddress: async () => turnkeySigner.address,
@@ -70,4 +40,56 @@ export async function getCustodialOwner(identifier, { custodialFilePath, private
         signTypedData: async (params) => turnkeySigner.signTypedData(params),
     };
 }
+const loadSignDataFromCustodialFile = memo(async (custodialFilePath) => {
+    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: 1000 * 60,
+    key: (custodialFilePath) => `${custodialFilePath}`,
+});
+const getDefaultTurnkeyClient = memo(async ({ privateKey, publicKey, }) => {
+    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");
+    }
+    return new turnkeyHttp.TurnkeyClient({
+        baseUrl: "https://api.turnkey.com",
+    }, new turnkeyApiKeyStamper.ApiKeyStamper({
+        apiPublicKey: publicKey,
+        apiPrivateKey: privateKey,
+    }));
+}, {
+    ttl: 1000 * 60,
+    key: ({ privateKey, publicKey, }) => `${privateKey}-${publicKey}`,
+});
+const fetchWallet = memo(({ identifier, keyId, apiUrl, }) => {
+    return axios.post(`${apiUrl}/wallets/${identifier}`, {
+        keyId,
+    });
+}, {
+    ttl: 1000 * 60,
+    key: ({ identifier, keyId, apiUrl, }) => `${identifier}-${keyId}-${apiUrl}`,
+});
+const getTurnkeySigner = memo(async ({ keyId, privateKeyId, turnkeyClient, }) => {
+    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,
+        organizationId: keyId,
+        privateKeyId,
+    });
+}, {
+    ttl: 1000 * 60,
+    key: ({ keyId, privateKeyId, }) => `${keyId}-${privateKeyId}`,
+});
 //# sourceMappingURL=getCustodialOwner.js.map

package/dist/esm/kernel-zerodev/owner/getCustodialOwner.js.map

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

package/dist/esm/kernel-zerodev/owner/passkey/utils.js

@@ -30,10 +30,10 @@ export const signMessageImplementation = async (msg, id, walletId, projectId, cr
     abortWebauthn();
     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/dist/esm/kernel-zerodev/owner/passkey/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/kernel-zerodev/owner/passkey/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { browserInit, TurnkeyApi } from \"@turnkey/http\";\nimport axios from \"axios\";\nimport { API_URL } from \"../../constants.js\";\nimport type { SignTypedDataParams } from \"@alchemy/aa-core\";\nimport { hashTypedData, signatureToHex, hashMessage } from \"viem\";\n\nbrowserInit({\n  baseUrl: \"https://api.turnkey.com\",\n});\n\nexport const abortController = {\n  controller: new AbortController(),\n};\n\nexport function abortWebauthn() {\n  abortController.controller.abort(\"ZeroDev: Reset previous Webauthn request\");\n  abortController.controller = new AbortController();\n}\n\nexport const publicKey = \"public-key\";\n\nexport const es256 = -7;\n\nexport const generateRandomBuffer = (): ArrayBuffer => {\n  const arr = new Uint8Array(32);\n  crypto.getRandomValues(arr);\n  return arr.buffer;\n};\n\nexport const base64UrlEncode = (challenge: ArrayBuffer): string => {\n  return Buffer.from(challenge)\n    .toString(\"base64\")\n    .replace(/\\+/g, \"-\")\n    .replace(/\\//g, \"_\")\n    .replace(/=/g, \"\");\n};\n\nexport const signMessageImplementation = async (\n  msg: string,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  abortWebauthn();\n  const signedRequest = await TurnkeyApi.signSignRawPayload(\n    {\n      body: {\n        type: \"ACTIVITY_TYPE_SIGN_RAW_PAYLOAD\",\n        organizationId: id,\n        parameters: {\n          privateKeyId: walletId,\n          payload: msg,\n          encoding: \"PAYLOAD_ENCODING_HEXADECIMAL\",\n          hashFunction: \"HASH_FUNCTION_NO_OP\",\n        },\n        timestampMs: String(Date.now()),\n      },\n    },\n    {\n      publicKey: {\n        allowCredentials: [\n          {\n            id: base64URLStringToBuffer(credentialId),\n            type: publicKey,\n          },\n        ],\n      },\n    }\n  );\n  const proxyResponse = await axios.post(\n    `${apiUrl}/projects/${projectId}/wallets/proxy`,\n    {\n      signedRequest,\n    }\n  );\n  const { activity } = await proxyResponse.data;\n  if (activity.status === \"ACTIVITY_STATUS_COMPLETED\") {\n    let result = activity?.result?.signRawPayloadResult;\n\n    if (result) {\n      const signatureHex = signatureToHex({\n        r: `0x${result.r}`,\n        s: `0x${result.s}`,\n        v: result.v === \"00\" ? 27n : 28n,\n      });\n      if (signatureHex) {\n        return signatureHex;\n      }\n    }\n  }\n  return \"0x\";\n};\n\nexport const signMessage = async (\n  msg: string | Uint8Array,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  return await signMessageImplementation(\n    hashMessage(typeof msg === \"string\" ? msg : { raw: msg }),\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const signTypedData = async (\n  params: SignTypedDataParams,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  const hashToSign = hashTypedData(params);\n  return await signMessageImplementation(\n    hashToSign,\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const getCredentials = async (\n  projectId: string,\n  name?: string,\n  apiUrl = API_URL\n) => {\n  const url =\n    `${apiUrl}/projects/${projectId}/wallets` + (name ? `/${name}` : \"\");\n  const response = await axios.get(url);\n  const credentials = response.data;\n  return credentials.map((credential: string) => ({\n    id: base64URLStringToBuffer(credential),\n    type: \"public-key\",\n  }));\n};\n\n// https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/browser/src/helpers/base64URLStringToBuffer.ts#L8\nexport function base64URLStringToBuffer(base64URLString: string): ArrayBuffer {\n  // Convert from Base64URL to Base64\n  const base64 = base64URLString.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  /**\n   * Pad with '=' until it's a multiple of four\n   * (4 - (85 % 4 = 1) = 3) % 4 = 3 padding\n   * (4 - (86 % 4 = 2) = 2) % 4 = 2 padding\n   * (4 - (87 % 4 = 3) = 1) % 4 = 1 padding\n   * (4 - (88 % 4 = 0) = 4) % 4 = 0 padding\n   */\n  const padLength = (4 - (base64.length % 4)) % 4;\n  const padded = base64.padEnd(base64.length + padLength, \"=\");\n\n  // Convert to a binary string\n  const binary = atob(padded);\n\n  // Convert binary string to buffer\n  const buffer = new ArrayBuffer(binary.length);\n  const bytes = new Uint8Array(buffer);\n\n  for (let i = 0; i < binary.length; i++) {\n    bytes[i] = binary.charCodeAt(i);\n  }\n\n  return buffer;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/kernel-zerodev/owner/passkey/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { browserInit, TurnkeyApi } from \"@turnkey/http\";\nimport axios from \"axios\";\nimport { API_URL } from \"../../constants.js\";\nimport type { SignTypedDataParams } from \"@alchemy/aa-core\";\nimport { hashTypedData, signatureToHex, hashMessage } from \"viem\";\n\nbrowserInit({\n  baseUrl: \"https://api.turnkey.com\",\n});\n\nexport const abortController = {\n  controller: new AbortController(),\n};\n\nexport function abortWebauthn() {\n  abortController.controller.abort(\"ZeroDev: Reset previous Webauthn request\");\n  abortController.controller = new AbortController();\n}\n\nexport const publicKey = \"public-key\";\n\nexport const es256 = -7;\n\nexport const generateRandomBuffer = (): ArrayBuffer => {\n  const arr = new Uint8Array(32);\n  crypto.getRandomValues(arr);\n  return arr.buffer;\n};\n\nexport const base64UrlEncode = (challenge: ArrayBuffer): string => {\n  return Buffer.from(challenge)\n    .toString(\"base64\")\n    .replace(/\\+/g, \"-\")\n    .replace(/\\//g, \"_\")\n    .replace(/=/g, \"\");\n};\n\nexport const signMessageImplementation = async (\n  msg: string,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  abortWebauthn();\n  const signedRequest = await TurnkeyApi.signSignRawPayload(\n    {\n      body: {\n        type: \"ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2\",\n        organizationId: id,\n        parameters: {\n          signWith: walletId,\n          payload: msg,\n          encoding: \"PAYLOAD_ENCODING_HEXADECIMAL\",\n          hashFunction: \"HASH_FUNCTION_NO_OP\",\n        },\n        timestampMs: String(Date.now()),\n      },\n    },\n    {\n      publicKey: {\n        allowCredentials: [\n          {\n            id: base64URLStringToBuffer(credentialId),\n            type: publicKey,\n          },\n        ],\n      },\n    }\n  );\n  const proxyResponse = await axios.post(\n    `${apiUrl}/projects/${projectId}/wallets/proxy`,\n    {\n      signedRequest,\n    }\n  );\n  const { activity } = await proxyResponse.data;\n  if (activity.status === \"ACTIVITY_STATUS_COMPLETED\") {\n    let result = activity?.result?.signRawPayloadResult;\n\n    if (result) {\n      const signatureHex = signatureToHex({\n        r: `0x${result.r}`,\n        s: `0x${result.s}`,\n        v: result.v === \"00\" ? 27n : 28n,\n      });\n      if (signatureHex) {\n        return signatureHex;\n      }\n    }\n  }\n  return \"0x\";\n};\n\nexport const signMessage = async (\n  msg: string | Uint8Array,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  return await signMessageImplementation(\n    hashMessage(typeof msg === \"string\" ? msg : { raw: msg }),\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const signTypedData = async (\n  params: SignTypedDataParams,\n  id: string,\n  walletId: string,\n  projectId: string,\n  credentialId: string,\n  apiUrl = API_URL\n) => {\n  const hashToSign = hashTypedData(params);\n  return await signMessageImplementation(\n    hashToSign,\n    id,\n    walletId,\n    projectId,\n    credentialId,\n    apiUrl\n  );\n};\n\nexport const getCredentials = async (\n  projectId: string,\n  name?: string,\n  apiUrl = API_URL\n) => {\n  const url =\n    `${apiUrl}/projects/${projectId}/wallets` + (name ? `/${name}` : \"\");\n  const response = await axios.get(url);\n  const credentials = response.data;\n  return credentials.map((credential: string) => ({\n    id: base64URLStringToBuffer(credential),\n    type: \"public-key\",\n  }));\n};\n\n// https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/browser/src/helpers/base64URLStringToBuffer.ts#L8\nexport function base64URLStringToBuffer(base64URLString: string): ArrayBuffer {\n  // Convert from Base64URL to Base64\n  const base64 = base64URLString.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  /**\n   * Pad with '=' until it's a multiple of four\n   * (4 - (85 % 4 = 1) = 3) % 4 = 3 padding\n   * (4 - (86 % 4 = 2) = 2) % 4 = 2 padding\n   * (4 - (87 % 4 = 3) = 1) % 4 = 1 padding\n   * (4 - (88 % 4 = 0) = 4) % 4 = 0 padding\n   */\n  const padLength = (4 - (base64.length % 4)) % 4;\n  const padded = base64.padEnd(base64.length + padLength, \"=\");\n\n  // Convert to a binary string\n  const binary = atob(padded);\n\n  // Convert binary string to buffer\n  const buffer = new ArrayBuffer(binary.length);\n  const bytes = new Uint8Array(buffer);\n\n  for (let i = 0; i < binary.length; i++) {\n    bytes[i] = binary.charCodeAt(i);\n  }\n\n  return buffer;\n}\n"]}

package/dist/types/kernel-zerodev/owner/getCustodialOwner.d.ts

@@ -1,12 +1,12 @@
 import type { SmartAccountSigner } from "@alchemy/aa-core";
-type GetCustodialOwnerParams = {
+type GetCustodialOwnerParams = Readonly<{
     apiUrl?: string;
     turnKeyClient?: unknown;
     privateKey?: string;
     publicKey?: string;
     keyId?: string;
     custodialFilePath?: string;
-};
+}>;
 export declare function getCustodialOwner(identifier: string, { custodialFilePath, privateKey, publicKey, keyId, apiUrl, turnKeyClient, }: GetCustodialOwnerParams): Promise<SmartAccountSigner | undefined>;
 export {};
 //# sourceMappingURL=getCustodialOwner.d.ts.map

package/dist/types/kernel-zerodev/owner/getCustodialOwner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCustodialOwner.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/owner/getCustodialOwner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAQhF,KAAK,uBAAuB,GAAG;IAE7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAKF,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,EACE,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,KAAK,EACL,MAAgB,EAChB,aAAa,GACd,EAAE,uBAAuB,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA8FzC"}
+{"version":3,"file":"getCustodialOwner.d.ts","sourceRoot":"","sources":["../../../../src/kernel-zerodev/owner/getCustodialOwner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAShF,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IAEtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC,CAAC;AAKH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,EACE,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,KAAK,EACL,MAAgB,EAChB,aAAa,GACd,EAAE,uBAAuB,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAsDzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.3.2",
+  "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",