Merge branch 'naga' into hwrdtm/ncc_hash_collision

Author: Ansonhkg

.github/workflows/e2e.yml

@@ -51,9 +51,9 @@ jobs:
         run: NETWORK=naga-dev bun run test:e2e all
         timeout-minutes: 10
 
-      - name: Run health check for naga-test
-        run: NETWORK=naga-test bun run test:e2e all
-        timeout-minutes: 10
+      # - name: Run health check for naga-test
+      #   run: NETWORK=naga-test bun run test:e2e all
+      #   timeout-minutes: 10
 
       - name: Run health check for naga-staging
         run: NETWORK=naga-staging bun run test:e2e all

.gitignore

@@ -90,4 +90,5 @@ lit-cache
 lit-auth-local
 artillery-state.json
 artillery-pkp-tokens
-lit-auth-artillery
+lit-auth-artillery
+alice-auth-manager-data

README.md

@@ -113,4 +113,4 @@ bunx changeset publish
 
 # Contact
 
-You can reach the Lit Protocol team through [Telegram](https://t.me/+aa73FAF9Vp82ZjJh), [Discord](https://litgateway.com/discord), or [X](https://x.com/litprotocol).
+You can reach the Lit Protocol team through [Telegram](https://t.me/+aa73FAF9Vp82ZjJh), [Discord](https://litgateway.com/discord), or [X](https://x.com/litprotocol).

bun.lock

@@ -19,21 +19,29 @@ import {
 } from './helper/tests';
 import { init } from './init';
 
+const RPC_OVERRIDE = process.env['LIT_YELLOWSTONE_PRIVATE_RPC_URL'];
+if (RPC_OVERRIDE) {
+  console.log(
+    '🧪 E2E: Using RPC override (LIT_YELLOWSTONE_PRIVATE_RPC_URL):',
+    RPC_OVERRIDE
+  );
+}
+
 describe('all', () => {
   // Singleton baby
   let ctx: Awaited<ReturnType<typeof init>>;
 
   // Auth contexts for testing
   let alicePkpAuthContext: any;
-  let aliceCustomAuthContext: any;
+  let eveCustomAuthContext: any;
 
   beforeAll(async () => {
     try {
       ctx = await init();
 
       // Create PKP and custom auth contexts using helper functions
       // alicePkpAuthContext = await createPkpAuthContext(ctx);
-      aliceCustomAuthContext = await createCustomAuthContext(ctx);
+      eveCustomAuthContext = await createCustomAuthContext(ctx);
     } catch (e) {
       console.error(e);
       process.exit(1);
@@ -48,10 +56,12 @@ describe('all', () => {
         createPkpSignTest(ctx, () => ctx.aliceEoaAuthContext)());
       it('executeJs', () =>
         createExecuteJsTest(ctx, () => ctx.aliceEoaAuthContext)());
-      it('viewPKPsByAddress', () =>
-        createViewPKPsByAddressTest(ctx, () => ctx.aliceEoaAuthContext)());
+      it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)());
       it('viewPKPsByAuthData', () =>
-        createViewPKPsByAuthDataTest(ctx, () => ctx.aliceEoaAuthContext)());
+        createViewPKPsByAuthDataTest(
+          ctx,
+          ctx.aliceViemAccountAuthData
+        )());
       it('pkpEncryptDecrypt', () =>
         createPkpEncryptDecryptTest(ctx, () => ctx.aliceEoaAuthContext)());
       it('encryptDecryptFlow', () =>
@@ -90,9 +100,12 @@ describe('all', () => {
         it('executeJs', () =>
           createExecuteJsTest(ctx, () => ctx.alicePkpAuthContext)());
         it('viewPKPsByAddress', () =>
-          createViewPKPsByAddressTest(ctx, () => ctx.alicePkpAuthContext)());
+          createViewPKPsByAddressTest(ctx)());
         it('viewPKPsByAuthData', () =>
-          createViewPKPsByAuthDataTest(ctx, () => ctx.alicePkpAuthContext)());
+          createViewPKPsByAuthDataTest(
+            ctx,
+            ctx.aliceViemAccountAuthData
+          )());
         it('pkpEncryptDecrypt', () =>
           createPkpEncryptDecryptTest(ctx, () => ctx.alicePkpAuthContext)());
         it('encryptDecryptFlow', () =>
@@ -124,34 +137,51 @@ describe('all', () => {
 
       describe('endpoints', () => {
         it('pkpSign', () =>
-          createPkpSignTest(ctx, () => aliceCustomAuthContext)());
+          createPkpSignTest(
+            ctx,
+            () => eveCustomAuthContext,
+            ctx.eveViemAccountPkp.pubkey
+          )());
         it('executeJs', () =>
-          createExecuteJsTest(ctx, () => aliceCustomAuthContext)());
-        it('viewPKPsByAddress', () =>
-          createViewPKPsByAddressTest(ctx, () => aliceCustomAuthContext)());
+          createExecuteJsTest(
+            ctx,
+            () => eveCustomAuthContext,
+            ctx.eveViemAccountPkp.pubkey
+          )());
+        it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)());
         it('viewPKPsByAuthData', () =>
-          createViewPKPsByAuthDataTest(ctx, () => aliceCustomAuthContext)());
+          createViewPKPsByAuthDataTest(ctx, ctx.eveCustomAuthData)());
         it('pkpEncryptDecrypt', () =>
-          createPkpEncryptDecryptTest(ctx, () => aliceCustomAuthContext)());
+          createPkpEncryptDecryptTest(
+            ctx,
+            () => eveCustomAuthContext,
+            ctx.eveViemAccountPkp.ethAddress
+          )());
         it('encryptDecryptFlow', () =>
-          createEncryptDecryptFlowTest(ctx, () => aliceCustomAuthContext)());
-        it('pkpPermissionsManagerFlow', () =>
-          createPkpPermissionsManagerFlowTest(
+          createEncryptDecryptFlowTest(
             ctx,
-            () => aliceCustomAuthContext
+            () => eveCustomAuthContext,
+            ctx.eveViemAccountPkp.pubkey
           )());
-      });
 
-      describe('integrations', () => {
-        describe('pkp viem account', () => {
-          it('sign message', () =>
-            createViemSignMessageTest(ctx, () => aliceCustomAuthContext)());
-          it('sign transaction', () =>
-            createViemSignTransactionTest(ctx, () => aliceCustomAuthContext)());
-          it('sign typed data', () =>
-            createViemSignTypedDataTest(ctx, () => aliceCustomAuthContext)());
-        });
+        // Disable for now because it requires a different flow
+        // it('pkpPermissionsManagerFlow', () =>
+        //   createPkpPermissionsManagerFlowTest(
+        //     ctx,
+        //     () => eveCustomAuthContext, ctx.eveViemAccountPkp.pubkey
+        //   )());
       });
+
+      // describe('integrations', () => {
+      //   describe('pkp viem account', () => {
+      //     it('sign message', () =>
+      //       createViemSignMessageTest(ctx, () => eveCustomAuthContext, ctx.eveViemAccountPkp.pubkey)());
+      //     it('sign transaction', () =>
+      //       createViemSignTransactionTest(ctx, () => eveCustomAuthContext, ctx.eveViemAccountPkp.pubkey)());
+      //     it('sign typed data', () =>
+      //       createViemSignTypedDataTest(ctx, () => eveCustomAuthContext, ctx.eveViemAccountPkp.pubkey)());
+      //   });
+      // });
     });
 
     describe('EOA Native', () => {
@@ -161,3 +191,114 @@ describe('all', () => {
     });
   });
 });
+
+describe('rpc override', () => {
+  const TEST_RPC = process.env.LIT_YELLOWSTONE_PRIVATE_RPC_URL;
+  // const TEST_RPC = 'https://yellowstone-override.example';
+
+  // beforeAll(() => {
+  //   process.env.LIT_YELLOWSTONE_PRIVATE_RPC_URL = TEST_RPC;
+  // });
+
+  // afterAll(() => {
+  //   process.env.LIT_YELLOWSTONE_PRIVATE_RPC_URL = ORIGINAL_RPC;
+  // });
+
+  it('applies env rpc override to module and client', async () => {
+    const networks = await import('@lit-protocol/networks');
+
+    // choose module by NETWORK env (same way init.ts does)
+    const network = process.env.NETWORK || 'naga-dev';
+    const importNameMap: Record<string, string> = {
+      'naga-dev': 'nagaDev',
+      'naga-test': 'nagaTest',
+      'naga-local': 'nagaLocal',
+      'naga-staging': 'nagaStaging',
+    };
+    const importName = importNameMap[network];
+    const baseModule: any = (networks as any)[importName];
+
+    // apply override
+    const mod =
+      typeof baseModule.withOverrides === 'function'
+        ? baseModule.withOverrides({ rpcUrl: TEST_RPC })
+        : baseModule;
+
+    // log for verification
+    // base vs effective (when override is supported)
+    const baseRpcUrl =
+      typeof baseModule.getRpcUrl === 'function'
+        ? baseModule.getRpcUrl()
+        : 'n/a';
+    const effRpcUrl =
+      typeof mod.getRpcUrl === 'function' ? mod.getRpcUrl() : 'n/a';
+    // eslint-disable-next-line no-console
+    console.log('[rpc-override] TEST_RPC:', TEST_RPC);
+    // eslint-disable-next-line no-console
+    console.log(
+      '[rpc-override] module rpc (base → effective):',
+      baseRpcUrl,
+      '→',
+      effRpcUrl
+    );
+    try {
+      const baseChain =
+        typeof baseModule.getChainConfig === 'function'
+          ? baseModule.getChainConfig()
+          : null;
+      const effChain =
+        typeof mod.getChainConfig === 'function' ? mod.getChainConfig() : null;
+      if (baseChain && effChain) {
+        // eslint-disable-next-line no-console
+        console.log(
+          '[rpc-override] module chain id/name (base → effective):',
+          `${baseChain.id}/${baseChain.name}`,
+          '→',
+          `${effChain.id}/${effChain.name}`
+        );
+        // eslint-disable-next-line no-console
+        console.log(
+          '[rpc-override] module rpcUrls.default.http (base → effective):',
+          baseChain.rpcUrls.default.http,
+          '→',
+          effChain.rpcUrls.default.http
+        );
+        // eslint-disable-next-line no-console
+        console.log(
+          '[rpc-override] module rpcUrls.public.http (base → effective):',
+          (baseChain.rpcUrls as any)['public']?.http,
+          '→',
+          (effChain.rpcUrls as any)['public']?.http
+        );
+      }
+    } catch {}
+
+    // module reflects override
+    expect(mod.getRpcUrl()).toBe(TEST_RPC);
+    const chain = mod.getChainConfig();
+    expect(chain.rpcUrls.default.http[0]).toBe(TEST_RPC);
+    expect((chain.rpcUrls as any)['public'].http[0]).toBe(TEST_RPC);
+
+    // client reflects override
+    const { createLitClient } = await import('@lit-protocol/lit-client');
+    const client = await createLitClient({ network: mod });
+    const cc = client.getChainConfig();
+
+    // eslint-disable-next-line no-console
+    console.log('[rpc-override] client rpcUrl:', cc.rpcUrl);
+    // eslint-disable-next-line no-console
+    console.log(
+      '[rpc-override] client viem rpcUrls.default:',
+      cc.viemConfig.rpcUrls.default.http
+    );
+    // eslint-disable-next-line no-console
+    console.log(
+      '[rpc-override] client viem rpcUrls.public:',
+      (cc.viemConfig.rpcUrls as any)['public']?.http
+    );
+
+    expect(cc.rpcUrl).toBe(TEST_RPC);
+    expect(cc.viemConfig.rpcUrls.default.http[0]).toBe(TEST_RPC);
+    expect((cc.viemConfig.rpcUrls as any)['public'].http[0]).toBe(TEST_RPC);
+  });
+});

e2e/src/e2e.spec.ts

@@ -39,18 +39,12 @@ export const createCustomAuthContext = 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', '*'],
@@ -61,17 +55,17 @@ export const createCustomAuthContext = async (
       },
       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);

e2e/src/helper/auth-contexts.ts

@@ -3,7 +3,8 @@ import { assert } from '../assertions';
 
 export const createEncryptDecryptFlowTest = (
   ctx: Awaited<ReturnType<typeof init>>,
-  getAuthContext: () => any
+  getAuthContext: () => any,
+  address?: string
 ) => {
   return async () => {
     const { createAccBuilder } = await import(
@@ -17,7 +18,7 @@ export const createEncryptDecryptFlowTest = (
     if (authContext === ctx.aliceEoaAuthContext) {
       aliceAddress = ctx.aliceViemAccount.address;
     } else {
-      aliceAddress = ctx.aliceViemAccountPkp.ethAddress;
+      aliceAddress = address || ctx.aliceViemAccountPkp.ethAddress;
     }
 
     // Set up access control conditions requiring Bob's wallet ownership

e2e/src/helper/tests/encrypt-decrypt-flow.ts

@@ -3,7 +3,8 @@ import { assert } from '../assertions';
 
 export const createExecuteJsTest = (
   ctx: Awaited<ReturnType<typeof init>>,
-  getAuthContext: () => any
+  getAuthContext: () => any,
+  pubkey?: string
 ) => {
   return async () => {
     const litActionCode = `
@@ -29,7 +30,7 @@ export const createExecuteJsTest = (
         message: 'Test message from e2e executeJs',
         sigName: 'e2e-test-sig',
         toSign: 'Test message from e2e executeJs',
-        publicKey: ctx.aliceViemAccountPkp.publicKey,
+        publicKey: pubkey || ctx.aliceViemAccountPkp.publicKey,
       },
     });
 

e2e/src/helper/tests/execute-js.ts

@@ -3,7 +3,8 @@ import { assert } from '../assertions';
 
 export const createPkpEncryptDecryptTest = (
   ctx: Awaited<ReturnType<typeof init>>,
-  getAuthContext: () => any
+  getAuthContext: () => any,
+  address?: string
 ) => {
   return async () => {
     const { createAccBuilder } = await import(
@@ -19,7 +20,7 @@ export const createPkpEncryptDecryptTest = (
       addressToUse = ctx.aliceViemAccount.address;
     } else {
       // PKP or Custom auth contexts
-      addressToUse = ctx.aliceViemAccountPkp.ethAddress;
+      addressToUse = address || ctx.aliceViemAccountPkp.ethAddress;
     }
 
     // Set up access control conditions requiring wallet ownership

e2e/src/helper/tests/pkp-encrypt-decrypt.ts

@@ -3,12 +3,13 @@ import { assert } from '../assertions';
 
 export const createPkpSignTest = (
   ctx: Awaited<ReturnType<typeof init>>,
-  getAuthContext: () => any
+  getAuthContext: () => any,
+  pubkey?: string
 ) => {
   return async () => {
     const res = await ctx.litClient.chain.ethereum.pkpSign({
       authContext: getAuthContext(),
-      pubKey: ctx.aliceViemAccountPkp.publicKey,
+      pubKey: pubkey || ctx.aliceViemAccountPkp.publicKey,
       toSign: 'Hello, world!',
     });