Merge branch 'feature/jss-93-refactor-bun-pnpm' into feature/jss-105-refactor-auth-services-from-elysia-to-express

Ansonhkg · web-flow · commit 226198d28748 · 2025-09-25T01:27:13.000+01:00
diff --git a/packages/access-control-conditions/package.json b/packages/access-control-conditions/package.json
@@ -26,6 +26,7 @@
   "typings": "./src/index.d.ts",
   "dependencies": {
     "ethers": "^5.7.1",
-    "zod": "3.24.3"
+    "zod": "3.24.3",
+    "@ethersproject/providers": "5.7.0"
   }
 }
diff --git a/packages/artillery/project.json b/packages/artillery/project.json
@@ -7,47 +7,53 @@
     "init": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "tsx packages/artillery/src/init.ts"
+        "cwd": "{projectRoot}",
+        "command": "tsx src/init.ts"
       }
     },
     "balance-status": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "tsx packages/artillery/src/balance-status.ts"
+        "cwd": "{projectRoot}",
+        "command": "tsx src/balance-status.ts"
       }
     },
     "run:pkp-sign": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "artillery run packages/artillery/configs/pkp-sign.yml"
+        "cwd": "{projectRoot}",
+        "command": "artillery run configs/pkp-sign.yml"
       }
     },
     "run:encrypt-decrypt": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "artillery run packages/artillery/configs/encrypt-decrypt.yml"
+        "cwd": "{projectRoot}",
+        "command": "artillery run configs/encrypt-decrypt.yml"
       }
     },
     "run:execute": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "artillery run packages/artillery/configs/execute.yml"
+        "cwd": "{projectRoot}",
+        "command": "artillery run configs/execute.yml"
       }
     },
     "run:mix": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "artillery run packages/artillery/configs/mix.yml"
+        "cwd": "{projectRoot}",
+        "command": "artillery run configs/mix.yml"
       }
     },
     "run:sign-session-key": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "artillery run packages/artillery/configs/sign-session-key.yml"
+        "cwd": "{projectRoot}",
+        "command": "artillery run configs/sign-session-key.yml"
       }
     }
   },
   "tags": []
 }
 
-
diff --git a/packages/auth-helpers/package.json b/packages/auth-helpers/package.json
@@ -34,6 +34,7 @@
     "siwe": "^2.3.2",
     "siwe-recap": "0.0.2-alpha.0",
     "viem": "2.29.4",
-    "zod": "3.24.3"
+    "zod": "3.24.3",
+    "@ethersproject/transactions": "5.7.0"
   }
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -22,7 +22,8 @@
     "universal"
   ],
   "dependencies": {
-    "@noble/curves": "^1.8.1",
+    "@noble/hashes": "1.8.0",
+    "@noble/curves": "1.8.1",
     "@simplewebauthn/browser": "^7.2.0",
     "@simplewebauthn/typescript-types": "^7.0.0",
     "@wagmi/core": "^2.17.1",
diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -30,19 +30,19 @@
   "author": "Lit Protocol",
   "license": "MIT",
   "dependencies": {
-    "viem": "2.29.4",
-    "zod": "^3.22.0"
+    "zod": "3.24.3"
   },
   "devDependencies": {
-    "@types/node": "^20.0.0",
-    "typescript": "^5.0.0"
+    "@types/node": "20.0.0",
+    "typescript": "5.8.3"
   },
   "peerDependencies": {
     "@lit-protocol/access-control-conditions": "workspace:*",
     "@lit-protocol/auth": "workspace:*",
     "@lit-protocol/lit-client": "workspace:*",
     "@lit-protocol/networks": "workspace:*",
-    "@lit-protocol/schemas": "workspace:*"
+    "@lit-protocol/schemas": "workspace:*",
+    "viem": "2.29.4"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/packages/e2e/src/e2e.spec.ts b/packages/e2e/src/e2e.spec.ts
@@ -144,25 +144,13 @@ describe('all', () => {
             ctx.eveViemAccountPkp.pubkey
           )());
         it('viewPKPsByAddress', () =>
-          createViewPKPsByAddressTest(
-            ctx,
-            () => eveCustomAuthContext,
-            ctx.eveViemAccountPkp.pubkey
-          )());
+          createViewPKPsByAddressTest(ctx, () => ctx.aliceEoaAuthContext)());
         it('viewPKPsByAuthData', () =>
           createViewPKPsByAuthDataTest(ctx, () => eveCustomAuthContext)());
         it('pkpEncryptDecrypt', () =>
-          createPkpEncryptDecryptTest(
-            ctx,
-            () => eveCustomAuthContext,
-            ctx.eveViemAccountPkp.ethAddress
-          )());
+          createPkpEncryptDecryptTest(ctx, () => ctx.aliceEoaAuthContext)());
         it('encryptDecryptFlow', () =>
-          createEncryptDecryptFlowTest(
-            ctx,
-            () => eveCustomAuthContext,
-            ctx.eveViemAccountPkp.pubkey
-          )());
+          createEncryptDecryptFlowTest(ctx, () => ctx.aliceEoaAuthContext)());
 
         // Disable for now because it requires a different flow
         // it('pkpPermissionsManagerFlow', () =>
diff --git a/packages/e2e/src/helper/auth-contexts.ts b/packages/e2e/src/helper/auth-contexts.ts
@@ -5,9 +5,7 @@ import { init } from '../init';
  */
 export const createPkpAuthContext: (
   ctx: Awaited<ReturnType<typeof init>>
-) => Promise<any> = async (
-  ctx: Awaited<ReturnType<typeof init>>
-) => {
+) => Promise<any> = async (ctx: Awaited<ReturnType<typeof init>>) => {
   console.log('🔁 Creating PKP Auth Context');
   try {
     const pkpAuthContext = await ctx.authManager.createPkpAuthContext({
@@ -37,22 +35,14 @@ export const createPkpAuthContext: (
  */
 export const createCustomAuthContext: (
   ctx: Awaited<ReturnType<typeof init>>
-) => Promise<any> = async (
-  ctx: Awaited<ReturnType<typeof init>>
-) => {
+) => Promise<any> = async (ctx: Awaited<ReturnType<typeof init>>) => {
   console.log('🔁 Creating Custom Auth Context');
+
   try {
     // Set up custom auth method type and validation IPFS CID (from custom-auth-flow example)
-    const uniqueDappName = 'e2e-test-dapp';
-    const uniqueAuthMethodType = hexToBigInt(
-      keccak256(toBytes(uniqueDappName))
-    );
-    const uniqueUserId = `${uniqueDappName}-alice`;
-    const authMethodId = keccak256(toBytes(uniqueUserId));
-    const validationIpfsCid = 'QmYLeVmwJPVs7Uebk85YdVPivMyrvoeKR6X37kyVRZUXW4';
 
     const customAuthContext = await ctx.authManager.createCustomAuthContext({
-      pkpPublicKey: ctx.aliceViemAccountPkp.publicKey,
+      pkpPublicKey: ctx.eveViemAccountPkp.pubkey,
       authConfig: {
         resources: [
           ['pkp-signing', '*'],
@@ -63,17 +53,17 @@ export const createCustomAuthContext: (
       },
       litClient: ctx.litClient,
       customAuthParams: {
-        litActionIpfsId: validationIpfsCid,
+        litActionIpfsId: ctx.eveValidationIpfsCid,
         jsParams: {
-          pkpPublicKey: ctx.aliceViemAccountPkp.publicKey,
-          username: 'alice',
+          pkpPublicKey: ctx.eveViemAccountPkp.pubkey,
+          username: 'eve',
           password: 'lit',
-          authMethodId: authMethodId,
+          authMethodId: ctx.eveCustomAuthData.authMethodId,
         },
       },
     });
 
-    console.log('✅ Custom Auth Context created');
+    console.log('✅ Custom Auth Context created', customAuthContext);
     return customAuthContext;
   } catch (e) {
     console.error('❌ Error creating Custom Auth Context', e);
diff --git a/packages/lit-client/src/lib/LitClient/createLitClient.ts b/packages/lit-client/src/lib/LitClient/createLitClient.ts
@@ -10,10 +10,18 @@ import {
 } from '@lit-protocol/access-control-conditions';
 import { encrypt as blsEncrypt } from '@lit-protocol/crypto';
 import { getChildLogger } from '@lit-protocol/logger';
-import type {
-  LitNetworkModule,
-  PKPStorageProvider,
+import {
+  type LitNetworkModule,
+  type PKPStorageProvider,
+  type ExpectedAccountOrWalletClient,
+  type GenericTxRes,
+  type LitTxRes,
+  type PKPData,
+  type AuthMethod,
+  PKPPermissionsManager,
+  PaymentManager,
 } from '@lit-protocol/networks';
+
 import {
   AuthContextSchema2,
   AuthData,
@@ -736,8 +744,14 @@ export const _createNagaLitClient = async (
       loginUrl: networkModule.getDefaultLoginBaseUrl(),
     },
     disconnect: _stateManager.stop,
-    mintWithEoa: networkModule.chainApi.mintWithEoa,
-    mintWithAuth: networkModule.chainApi.mintWithAuth,
+    mintWithEoa: networkModule.chainApi.mintWithEoa as (params: {
+      account: ExpectedAccountOrWalletClient;
+    }) => Promise<GenericTxRes<LitTxRes<PKPData>, PKPData>>,
+    mintWithAuth: networkModule.chainApi.mintWithAuth as (params: {
+      account: ExpectedAccountOrWalletClient;
+      authData: any;
+      scopes: string[];
+    }) => Promise<GenericTxRes<LitTxRes<PKPData>, PKPData>>,
     mintWithCustomAuth: async (params: MintWithCustomAuthRequest) => {
       const validatedParams = MintWithCustomAuthSchema.parse(params);
 
diff --git a/packages/networks/src/index.ts b/packages/networks/src/index.ts
@@ -39,3 +39,18 @@ export type { PKPStorageProvider } from './storage/types';
 
 // Schema types
 export type { MintRequestRaw } from './networks/vNaga/shared/managers/LitChainClient/schemas/MintRequestSchema';
+
+// ----- re-exports for SDK consumers
+export type { ExpectedAccountOrWalletClient } from './networks/vNaga/shared/managers/contract-manager/createContractsManager';
+export { PKPPermissionsManager } from './networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/PKPPermissionsManager';
+export { PaymentManager } from './networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/PaymentManager/PaymentManager';
+export type {
+  GenericTxRes,
+  LitTxRes,
+} from './networks/vNaga/shared/managers/LitChainClient/apis/types';
+export type { PKPData } from './networks/vNaga/shared/managers/LitChainClient/schemas/shared/PKPDataSchema';
+export type { AuthMethod } from './networks/vNaga/shared/managers/LitChainClient/apis/highLevelApis/PKPPermissionsManager/handlers/getPermissionsContext';
+export type { PkpIdentifierRaw } from './networks/vNaga/shared/managers/LitChainClient/apis/rawContractApis/permissions/utils/resolvePkpTokenId';
+export { getMaxPricesForNodeProduct } from './networks/vNaga/shared/managers/pricing-manager/getMaxPricesForNodeProduct';
+export { getUserMaxPrice } from './networks/vNaga/shared/managers/pricing-manager/getUserMaxPrice';
+export { PRODUCT_IDS } from './networks/vNaga/shared/managers/pricing-manager/constants';
diff --git a/packages/networks/src/storage/types.ts b/packages/networks/src/storage/types.ts
@@ -1,5 +1,4 @@
-import { PKPInfo } from '@lit-protocol/types';
-
+import { PKPData } from '@lit-protocol/schemas';
 export interface PKPStorageProvider {
   readPKPTokens?(params: {
     authMethodType: number | bigint;
@@ -37,11 +36,11 @@ export interface PKPStorageProvider {
   readPKPs?(params: {
     authMethodType: number | bigint;
     authMethodId: string;
-  }): Promise<PKPInfo[] | null>;
+  }): Promise<PKPData[] | null>;
 
   writePKPs?(params: {
     authMethodType: number | bigint;
     authMethodId: string;
-    pkps: PKPInfo[];
+    pkps: PKPData[];
   }): Promise<void>;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`"typings": "./src/index.d.ts",`
`27`	`27`	`"dependencies": {`
`28`	`28`	`"ethers": "^5.7.1",`
`29`		`- "zod": "3.24.3"`
	`29`	`+ "zod": "3.24.3",`
	`30`	`+ "@ethersproject/providers": "5.7.0"`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`"siwe": "^2.3.2",`
`35`	`35`	`"siwe-recap": "0.0.2-alpha.0",`
`36`	`36`	`"viem": "2.29.4",`
`37`		`- "zod": "3.24.3"`
	`37`	`+ "zod": "3.24.3",`
	`38`	`+ "@ethersproject/transactions": "5.7.0"`
`38`	`39`	`}`
`39`	`40`	`}`