@zerodev/sdk 4.0.2-passkey.0 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/sdk",
-  "version": "4.0.2-passkey.0",
+  "version": "4.0.2",
   "description": "A collection of ERC-4337 compliant smart contract account interfaces",
   "author": "ZeroDev",
   "license": "MIT",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@alchemy/aa-core": "^0.1.0-alpha.23",
     "@alchemy/aa-ethers": "^0.1.0-alpha.23",
-    "@turnkey/ethers": "^0.16.2",
+    "@turnkey/ethers": "^0.16.5",
     "typescript": "^5.0.4",
     "typescript-template": "*",
     "vitest": "^0.31.0"
@@ -62,12 +62,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/zerodevapp/aa-sdk.git"
+    "url": "git+https://github.com/zerodevapp/sdk.git"
   },
   "bugs": {
-    "url": "https://github.com/zerodevapp/aa-sdk/issues"
+    "url": "https://github.com/zerodevapp/sdk/issues"
   },
-  "homepage": "https://github.com/zerodevapp/aa-sdk/blob/zd-provider/packages/accounts/src/kernel-zerodev/README.md#readme",
+  "homepage": "https://github.com/zerodevapp/sdk/blob/main/README.md#readme",
   "gitHead": "19ba05a77e4f7a0e04f44f34eaecf675fe2c12f2",
   "dependencies": {
     "axios": "^1.4.0",

package/src/kernel-zerodev/account.ts

@@ -10,8 +10,6 @@ import {
   type Transport,
   pad,
   toHex,
-  getContract,
-  type PublicClient,
 } from "viem";
 import { parseAbiParameters } from "abitype";
 import { KernelBaseValidator, ValidatorMode } from "./validator/base.js";
@@ -104,37 +102,6 @@ export class KernelSmartContractAccount<
     return instance;
   }
 
-  async getAddress(): Promise<Address> {
-    if (!this.validator) {
-      throw new Error("Validator not connected");
-    }
-    if (!this.accountAddress) {
-      try {
-        const initializeData = encodeFunctionData({
-          abi: KernelAccountAbi,
-          functionName: "initialize",
-          args: [
-            this.validator.getAddress(),
-            await this.validator.getEnableData(),
-          ],
-        });
-        const kernelFactory = getContract({
-          abi: KernelFactoryAbi,
-          address: KERNEL_FACTORY_ADDRESS,
-          publicClient: this.rpcProvider as PublicClient,
-        });
-        return await kernelFactory.read.getAccountAddress([
-          initializeData,
-          this.index,
-        ]);
-      } catch (error) {
-        throw new Error(`getCounterFactualAddress failed: ${error}`);
-      }
-    }
-
-    return this.accountAddress;
-  }
-
   connectValidator(validator: KernelBaseValidator): this {
     defineReadOnly(this, "validator", validator);
     return this;

package/src/kernel-zerodev/constants.ts

@@ -14,8 +14,8 @@ export const API_URL = "https://prod-api.zerodev.app";
 export const ECDSA_VALIDATOR_ADDRESS =
   "0xd9AB5096a832b9ce79914329DAEE236f8Eea0390";
 export const KERNEL_FACTORY_ADDRESS =
-  "0x85DF6Dc686FBDcAc7da61651D116fc71B2246B50";
-export const KERNEL_IMPL_ADDRESS = "0xD2063bE7C610eb55492C05385743edDbf5b6B951";
+  "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3";
+export const KERNEL_IMPL_ADDRESS = "0xf048AD83CB2dfd6037A43902a2A5Be04e53cd2Eb";
 export const KILL_SWITCH_VALIDATOR_ADDRESS =
   "0x2db0DbfDf90Dbe2859158Aa71db1FcDCb3E579c8";
 export const KILL_SWITCH_ACTION = "0xf5aa34DD2cba311947e143183ED325A4A8C674Af";
@@ -69,3 +69,27 @@ export const ERC20_APPROVAL_AMOUNT: { [key: string]: bigint } = {
 export const minPriorityFeePerBidDefaults = new Map<number, bigint>([
   [polygon.id, 30_000_000_000n],
 ]);
+
+export const INFURA_API_KEY = "f36f7f706a58477884ce6fe89165666c";
+export const CHAIN_ID_TO_NODE: { [key: number]: string } = {
+  1: `https://mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  5: `https://goerli.infura.io/v3/${INFURA_API_KEY}`,
+  137: `https://polygon-mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  80001: `https://polygon-mumbai.infura.io/v3/${INFURA_API_KEY}`,
+  10: `https://optimism-mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  420: `https://optimism-goerli.infura.io/v3/${INFURA_API_KEY}`,
+  42161: `https://arbitrum-mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  // 42161: 'https://evocative-stylish-dinghy.arbitrum-mainnet.discover.quiknode.pro/80b526d14fa9fd9a8b0db1e65554acaf00c6a1ab/',
+  421613: `https://arbitrum-goerli.infura.io/v3/${INFURA_API_KEY}`,
+  43114: `https://avalanche-mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  43113: `https://avalanche-fuji.infura.io/v3/${INFURA_API_KEY}`,
+  1313161554: `https://aurora-mainnet.infura.io/v3/${INFURA_API_KEY}`,
+  1313161555: `https://aurora-testnet.infura.io/v3/${INFURA_API_KEY}`,
+  56: "https://wandering-quaint-reel.bsc.quiknode.pro/508c3d245c14adb8689ed4073d29aa5795dfa24e/",
+  97: "https://sly-indulgent-paper.bsc-testnet.quiknode.pro/ab7e00c229f5967334160958e40fd6a4d893fb93/",
+  8453: "https://twilight-red-tree.base-mainnet.quiknode.pro/dc6eb27bf0f917df215922488dd97f4de7d9b08e/",
+  84531:
+    "https://icy-long-mountain.base-goerli.quiknode.pro/5b80d93e97cc9412a63c10a30841869abbef9596/",
+  100: "https://thrilling-fluent-film.xdai.quiknode.pro/305955cffb9868cdd95b5e3dc9775f20678ad9ac/",
+  10200: "https://nd-810-853-201.p2pify.com/e828b09f0d43591de96c297b3f36fffd",
+};

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

@@ -56,7 +56,7 @@ export async function getCustodialOwner(
   const turnkeySigner = new TurnkeySigner({
     apiPublicKey: publicKey,
     apiPrivateKey: privateKey,
-    baseUrl: "https://coordinator-beta.turnkey.io",
+    baseUrl: "https://api.turnkey.com",
     organizationId: keyId,
     privateKeyId: response.data.walletId,
   });

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

@@ -2,6 +2,7 @@ import type { SignTypedDataParams, SmartAccountSigner } from "@alchemy/aa-core";
 import { Web3Provider, type ExternalProvider } from "@ethersproject/providers";
 import { type TypedDataField } from "@ethersproject/abstract-signer";
 import type { Hex } from "viem";
+import { fixSignedData } from "../utils.js";
 
 export function getRPCProviderOwner(web3Provider: any): SmartAccountSigner {
   const provider = new Web3Provider(web3Provider as ExternalProvider);
@@ -12,11 +13,14 @@ export function getRPCProviderOwner(web3Provider: any): SmartAccountSigner {
       Promise.resolve((await signer.getAddress()) as `0x${string}`),
     signMessage: async (msg: Uint8Array | string) =>
       (await signer.signMessage(msg)) as `0x${string}`,
-    signTypedData: async (params: SignTypedDataParams) =>
-      (await signer._signTypedData(
-        params.domain!,
-        params.types as unknown as Record<string, TypedDataField[]>,
-        params.message
-      )) as Hex,
+    signTypedData: async (params: SignTypedDataParams) => {
+      return fixSignedData(
+        (await signer._signTypedData(
+          params.domain!,
+          params.types as unknown as Record<string, TypedDataField[]>,
+          params.message
+        )) as Hex
+      );
+    },
   };
 }

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

@@ -7,7 +7,7 @@ import type { SignTypedDataParams } from "@alchemy/aa-core";
 import { hashTypedData } from "viem";
 
 browserInit({
-  baseUrl: "https://coordinator-beta.turnkey.io",
+  baseUrl: "https://api.turnkey.com",
 });
 
 export const publicKey = "public-key";
@@ -55,7 +55,7 @@ export const signMessage = async (
   credentialId: string,
   apiUrl = API_URL
 ) => {
-  const signedRequest = await TurnkeyApi.federatedPostSignRawPayload(
+  const signedRequest = await TurnkeyApi.signSignRawPayload(
     {
       body: {
         type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD",

package/src/kernel-zerodev/utils.ts

@@ -5,6 +5,7 @@ import {
   type Hex,
   type WalletClient,
   toHex,
+  isHex,
 } from "viem";
 import type {
   SignTypedDataParams,
@@ -13,6 +14,7 @@ import type {
 } from "@alchemy/aa-core";
 import { Signer, type TypedDataField } from "@ethersproject/abstract-signer";
 import { Wallet } from "@ethersproject/wallet";
+import { splitSignature, joinSignature } from "@ethersproject/bytes";
 import type { SupportedGasToken } from "./paymaster/types.js";
 import { gasTokenChainAddresses } from "./constants.js";
 
@@ -104,3 +106,18 @@ export const randomHexString = (length: number): Hex =>
       Math.floor(Math.random() * 16).toString(16)
     ).join("")
   );
+
+export const fixSignedData = (sig: Hex): Hex => {
+  let signature = sig;
+  if (!isHex(signature)) {
+    signature = `0x${signature}`;
+    if (!isHex(signature)) {
+      throw new Error("Invalid signed data " + sig);
+    }
+  }
+  let { r, s, v } = splitSignature(signature);
+  if (v === 0) v = 27;
+  if (v === 1) v = 28;
+  const joined = joinSignature({ r, s, v });
+  return joined as Hex;
+};

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

@@ -19,6 +19,7 @@ import {
 import { KernelAccountAbi } from "../abis/KernelAccountAbi.js";
 import {
   BUNDLER_URL,
+  CHAIN_ID_TO_NODE,
   ECDSA_VALIDATOR_ADDRESS,
   ENTRYPOINT_ADDRESS,
 } from "../constants.js";
@@ -61,7 +62,7 @@ export abstract class KernelBaseValidator {
   protected selector?: string;
   protected rpcUrl?: string;
   protected bundlerProvider?: PaymasterAndBundlerProviders;
-  protected publicClient?: PublicClient<Transport, Chain>;
+  publicClient?: PublicClient<Transport, Chain>;
 
   constructor(params: KernelBaseValidatorParams) {
     this.projectId = params.projectId;
@@ -77,17 +78,7 @@ export abstract class KernelBaseValidator {
     this.rpcUrl = params.rpcUrl ?? BUNDLER_URL;
     this.bundlerProvider = params.bundlerProvider;
     this.publicClient = createPublicClient({
-      transport: http(this.rpcUrl, {
-        fetchOptions: {
-          headers:
-            this.rpcUrl === BUNDLER_URL
-              ? {
-                  projectId: this.projectId,
-                  bundlerProvider: this.bundlerProvider,
-                }
-              : {},
-        },
-      }),
+      transport: http(CHAIN_ID_TO_NODE[this.chain?.id ?? polygonMumbai.id]),
       chain: this.chain ?? polygonMumbai,
     });
   }