fix: init type and viem

Author: Ansonhkg

e2e/bun.lock

@@ -0,0 +1,54 @@
+{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "@lit-protocol/e2e",
+      "dependencies": {
+        "viem": "2.29.4",
+        "zod": "^3.22.0",
+      },
+      "devDependencies": {
+        "@types/node": "^20.0.0",
+        "typescript": "^5.0.0",
+      },
+      "peerDependencies": {
+        "@lit-protocol/auth": "*",
+        "@lit-protocol/lit-client": "*",
+        "@lit-protocol/networks": "*",
+      },
+    },
+  },
+  "packages": {
+    "@adraffy/ens-normalize": ["@adraffy/[email protected]", "", {}, "sha512-/3DDPKHqqIqxUULp8yP4zODUY1i+2xvVWsv8A79xGWdCAG+8sb0hRh0Rk2QyOJUnnbyPUAZYcpBuRe3nS2OIUg=="],
+
+    "@noble/curves": ["@noble/[email protected]", "", { "dependencies": { "@noble/hashes": "1.7.2" } }, "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g=="],
+
+    "@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ=="],
+
+    "@scure/base": ["@scure/[email protected]", "", {}, "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg=="],
+
+    "@scure/bip32": ["@scure/[email protected]", "", { "dependencies": { "@noble/curves": "~1.8.1", "@noble/hashes": "~1.7.1", "@scure/base": "~1.2.2" } }, "sha512-t96EPDMbtGgtb7onKKqxRLfE5g05k7uHnHRM2xdE6BP/ZmxaLtPek4J4KfVn/90IQNrU1IOAqMgiDtUdtbe3nw=="],
+
+    "@scure/bip39": ["@scure/[email protected]", "", { "dependencies": { "@noble/hashes": "~1.7.1", "@scure/base": "~1.2.4" } }, "sha512-TFM4ni0vKvCfBpohoh+/lY05i9gRbSwXWngAsF4CABQxoaOHijxuaZ2R6cStDQ5CHtHO9aGJTr4ksVJASRRyMA=="],
+
+    "@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-hfrc+1tud1xcdVTABC2JiomZJEklMcXYNTVtZLAeqTVWD+qL5jkHKT+1lOtqDdGxt+mB53DTtiz673vfjU8D1Q=="],
+
+    "abitype": ["[email protected]", "", { "peerDependencies": { "typescript": ">=5.0.4", "zod": "^3 >=3.22.0" }, "optionalPeers": ["typescript", "zod"] }, "sha512-ZeiI6h3GnW06uYDLx0etQtX/p8E24UaHHBj57RSjK7YBFe7iuVn07EDpOeP451D06sF27VOz9JJPlIKJmXgkEg=="],
+
+    "eventemitter3": ["[email protected]", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
+
+    "isows": ["[email protected]", "", { "peerDependencies": { "ws": "*" } }, "sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg=="],
+
+    "ox": ["[email protected]", "", { "dependencies": { "@adraffy/ens-normalize": "^1.10.1", "@noble/curves": "^1.6.0", "@noble/hashes": "^1.5.0", "@scure/bip32": "^1.5.0", "@scure/bip39": "^1.4.0", "abitype": "^1.0.6", "eventemitter3": "5.0.1" }, "peerDependencies": { "typescript": ">=5.4.0" }, "optionalPeers": ["typescript"] }, "sha512-wi5ShvzE4eOcTwQVsIPdFr+8ycyX+5le/96iAJutaZAvCes1J0+RvpEPg5QDPDiaR0XQQAvZVl7AwqQcINuUug=="],
+
+    "typescript": ["[email protected]", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="],
+
+    "undici-types": ["[email protected]", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
+
+    "viem": ["[email protected]", "", { "dependencies": { "@noble/curves": "1.8.2", "@noble/hashes": "1.7.2", "@scure/bip32": "1.6.2", "@scure/bip39": "1.5.4", "abitype": "1.0.8", "isows": "1.0.7", "ox": "0.6.9", "ws": "8.18.1" }, "peerDependencies": { "typescript": ">=5.0.4" }, "optionalPeers": ["typescript"] }, "sha512-Dhyae+w1LKKpYVXypGjBnZ3WU5EHl/Uip5RtVwVRYSVxD5VvHzqKzIfbFU1KP4vnnh3++ZNgLjBY/kVT/tPrrg=="],
+
+    "ws": ["[email protected]", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w=="],
+
+    "zod": ["[email protected]", "", {}, "sha512-6tgzLuwVST5oLUxXTmBqoinKMd3JeesgbgseXeFasKKj8Q1FCZrHnbqJOyiEvr4cVAlbug+CgIsmJ8cl/pU5FA=="],
+  }
+}

e2e/package.json

@@ -35,7 +35,7 @@
   "author": "Lit Protocol",
   "license": "MIT",
   "dependencies": {
-    "viem": "^2.0.0",
+    "viem": "2.29.4",
     "zod": "^3.22.0"
   },
   "devDependencies": {

e2e/src/init.ts

@@ -4,17 +4,25 @@ import {
   ViemAccountAuthenticator,
 } from '@lit-protocol/auth';
 import { createLitClient } from '@lit-protocol/lit-client';
+import { Account, PrivateKeyAccount } from 'viem';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 import { z } from 'zod';
 import { fundAccount } from './helper/fundAccount';
 
-const SupportedNetworkSchema = z.enum(['naga-dev', 'naga-local', 'naga-staging']);
+const SupportedNetworkSchema = z.enum([
+  'naga-dev',
+  'naga-local',
+  'naga-staging',
+]);
 type SupportedNetwork = z.infer<typeof SupportedNetworkSchema>;
 
 const LogLevelSchema = z.enum(['silent', 'info', 'debug']);
 type LogLevel = z.infer<typeof LogLevelSchema>;
 
-export const init = async (network?: SupportedNetwork, logLevel?: LogLevel): Promise<{
+export const init = async (
+  network?: SupportedNetwork,
+  logLevel?: LogLevel
+): Promise<{
   litClient: any;
   authManager: any;
   localMasterAccount: any;

packages/auth/src/lib/AuthManager/authContexts/getEoaAuthContext.ts

@@ -6,7 +6,7 @@ import {
 } from '@lit-protocol/schemas';
 import { AuthSig } from '@lit-protocol/types';
 import { GetWalletClientReturnType } from '@wagmi/core';
-import { Account, WalletClient } from 'viem';
+import { Account, PrivateKeyAccount, WalletClient } from 'viem';
 import { z } from 'zod';
 import { ViemAccountAuthenticator } from '../../authenticators/ViemAccountAuthenticator';
 import { WalletClientAuthenticator } from '../../authenticators/WalletClientAuthenticator';
@@ -16,7 +16,8 @@ import { AuthConfigSchema } from '@lit-protocol/schemas';
 export type ExpectedAccountOrWalletClient =
   | Account
   | WalletClient
-  | GetWalletClientReturnType;
+  | GetWalletClientReturnType
+  | PrivateKeyAccount;
 
 interface GetEoaAuthContextParams {
   authentication: {

packages/auth/src/lib/authenticators/ViemAccountAuthenticator.ts

@@ -10,7 +10,14 @@ import {
 import { getChildLogger } from '@lit-protocol/logger';
 import { AuthData } from '@lit-protocol/schemas';
 import { AuthMethod, AuthSig, EthBlockhashInfo } from '@lit-protocol/types';
-import { Account, getAddress, Hex, keccak256, stringToBytes } from 'viem';
+import {
+  Account,
+  getAddress,
+  Hex,
+  keccak256,
+  PrivateKeyAccount,
+  stringToBytes,
+} from 'viem';
 
 const _logger = getChildLogger({
   module: 'ViemAccountAuthenticator',
@@ -67,7 +74,7 @@ export class ViemAccountAuthenticator {
   }
 
   static async authenticate(
-    account: Account,
+    account: Account | PrivateKeyAccount,
     messageToSign?: string
   ): Promise<AuthData> {
     let _toSign = messageToSign;

packages/lit-client/src/lib/LitClient/types/NagaLitClient.type.ts

@@ -11,7 +11,11 @@ import {
 import { z } from 'zod';
 import { MintWithCustomAuthRequest } from '../schemas/MintWithCustomAuthSchema';
 import { BaseLitClient } from './BaseClient.type';
-import { AuthContextSchema2, HexPrefixedSchema } from '@lit-protocol/schemas';
+import {
+  AuthContextSchema2,
+  AuthDataSchema,
+  HexPrefixedSchema,
+} from '@lit-protocol/schemas';
 import { Chain, Hex } from 'viem';
 import type { PKPStorageProvider } from '@lit-protocol/networks';
 
@@ -189,11 +193,13 @@ export interface NagaLitClient extends BaseLitClient<any> {
    * ```
    */
   viewPKPsByAuthData: (params: {
-    authData: {
-      authMethodType: number | bigint;
-      authMethodId: string;
-      accessToken?: string;
-    };
+    authData:
+      | {
+          authMethodType: number | bigint;
+          authMethodId: string;
+          accessToken?: string;
+        }
+      | z.infer<typeof AuthDataSchema>;
     pagination?: { limit?: number; offset?: number };
     storageProvider?: PKPStorageProvider;
   }) => Promise<any>;