LIT-3748 - Naga price support

local-tests/index.ts

@@ -1,19 +1,19 @@
 import { TinnyEnvironment } from './setup/tinny-environment';
 import { runInBand, runTestsParallel } from './setup/tinny-operations';
 import * as tinnyTests from './tests';
-import { getEoaSessionSigs } from './setup/session-sigs/get-eoa-session-sigs';
-import { getLitActionSessionSigs } from './setup/session-sigs/get-lit-action-session-sigs';
-import { getPkpSessionSigs } from './setup/session-sigs/get-pkp-session-sigs';
+import { getEoaAuthContext } from './setup/session-sigs/get-eoa-session-sigs';
+import { getLitActionAuthContext } from './setup/session-sigs/get-lit-action-session-sigs';
+import { getPkpAuthContext } from './setup/session-sigs/get-pkp-session-sigs';
 import { AccessControlConditions } from './setup/accs/accs';
 
 export {
   TinnyEnvironment,
   runInBand,
   runTestsParallel,
   tinnyTests,
-  getEoaSessionSigs,
-  getLitActionSessionSigs,
-  getPkpSessionSigs,
+  getEoaAuthContext,
+  getLitActionAuthContext,
+  getPkpAuthContext,
   AccessControlConditions,
 };
 

local-tests/setup/accs/accs.ts

@@ -5,7 +5,7 @@ import {
 } from '@lit-protocol/accs-schemas';
 
 export namespace AccessControlConditions {
-  export const getEmvBasicAccessControlConditions = ({
+  export const getEvmBasicAccessControlConditions = ({
     userAddress,
   }): LPACC_EVM_BASIC[] => {
     return [

local-tests/setup/session-sigs/get-eoa-session-sigs.ts

@@ -18,43 +18,28 @@ import {
 import { TinnyPerson } from '../tinny-person';
 import { TinnyEnvironment } from '../tinny-environment';
 
-/**
- * Retrieves the session signatures for an EOA in a given Tinny environment.
- *
- * @param devEnv - The Tinny environment object.
- * @param person - The Tinny person object representing the EOA.
- * @param resourceAbilityRequests - Optional. An array of resource ability requests. If not provided, default requests will be used.
- * @returns A promise that resolves to the session signatures.
- */
-export const getEoaSessionSigs = async (
+export const getEoaAuthContext = (
   devEnv: TinnyEnvironment,
   person: TinnyPerson,
   resourceAbilityRequests?: LitResourceAbilityRequest[]
 ) => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
 
-  if (centralisation === 'decentralised') {
-    console.warn(
-      'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
-    );
-  }
-
   // Use default resourceAbilityRequests if not provided
-  const _resourceAbilityRequests = resourceAbilityRequests || [
-    {
-      resource: new LitPKPResource('*'),
-      ability: LIT_ABILITY.PKPSigning,
-    },
-    {
-      resource: new LitActionResource('*'),
-      ability: LIT_ABILITY.LitActionExecution,
-    },
-  ];
-
-  const sessionSigs = await devEnv.litNodeClient.getSessionSigs({
+  return {
+    pkpPublicKey: person.authMethodOwnedPkp.publicKey,
     chain: 'ethereum',
-    resourceAbilityRequests: _resourceAbilityRequests,
+    resourceAbilityRequests: resourceAbilityRequests || [
+      {
+        resource: new LitPKPResource('*'),
+        ability: LIT_ABILITY.PKPSigning,
+      },
+      {
+        resource: new LitActionResource('*'),
+        ability: LIT_ABILITY.LitActionExecution,
+      },
+    ],
     authNeededCallback: async ({
       uri,
       expiration,
@@ -94,28 +79,18 @@ export const getEoaSessionSigs = async (
     ...(centralisation === 'decentralised' && {
       capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
     }),
-  });
-
-  log('[getEoaSessionSigs]: ', getEoaSessionSigs);
-
-  return sessionSigs;
+  };
 };
 
-export const getEoaSessionSigsWithCapacityDelegations = async (
+export const getEoaAuthContextWithCapacityDelegations = (
   devEnv: TinnyEnvironment,
   fromWallet: ethers.Wallet,
   capacityDelegationAuthSig: AuthSig
 ) => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
 
-  if (centralisation === 'decentralised') {
-    console.warn(
-      'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
-    );
-  }
-
-  const sessionSigs = await devEnv.litNodeClient.getSessionSigs({
+  return {
     chain: 'ethereum',
     resourceAbilityRequests: [
       {
@@ -165,9 +140,5 @@ export const getEoaSessionSigsWithCapacityDelegations = async (
         capacityDelegationAuthSig ?? devEnv.superCapacityDelegationAuthSig,
       ],
     }),
-  });
-
-  log('[getEoaSessionSigs]: ', getEoaSessionSigs);
-
-  return sessionSigs;
+  };
 };

local-tests/setup/session-sigs/get-lit-action-session-sigs.ts

@@ -35,20 +35,14 @@ export const VALID_IPFS_ID = 'QmRf5K7PVi5TWXiJdw7YYtcgpgRY6ufXGr9yYnxBLvLjDp';
  */
 export const INVALID_IPFS_ID = 'QmeUByesskboEkLLcE9Hd3bWFZT5Xt53RSauMNTJSVhfqm';
 
-export const getLitActionSessionSigs = async (
+export const getLitActionAuthContext = (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson,
   resourceAbilityRequests?: LitResourceAbilityRequest[]
 ) => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
 
-  if (centralisation === 'decentralised') {
-    console.warn(
-      'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
-    );
-  }
-
   // Use default resourceAbilityRequests if not provided
   const _resourceAbilityRequests = resourceAbilityRequests || [
     {
@@ -61,41 +55,32 @@ export const getLitActionSessionSigs = async (
     },
   ];
 
-  const litActionSessionSigs =
-    await devEnv.litNodeClient.getLitActionSessionSigs({
-      pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
-      authMethods: [alice.authMethod],
-      resourceAbilityRequests: _resourceAbilityRequests,
-      litActionCode: Buffer.from(VALID_SESSION_SIG_LIT_ACTION_CODE).toString(
-        'base64'
-      ),
-      jsParams: {
-        publicKey: alice.authMethodOwnedPkp.publicKey,
-        sigName: 'unified-auth-sig',
-      },
-
-      ...(centralisation === 'decentralised' && {
-        capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
-      }),
-    });
+  return devEnv.litNodeClient.getPkpAuthContext({
+    pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
+    authMethods: [alice.authMethod],
+    resourceAbilityRequests: _resourceAbilityRequests,
+    litActionCode: Buffer.from(VALID_SESSION_SIG_LIT_ACTION_CODE).toString(
+      'base64'
+    ),
+    jsParams: {
+      publicKey: alice.authMethodOwnedPkp.publicKey,
+      sigName: 'unified-auth-sig',
+    },
 
-  return litActionSessionSigs;
+    ...(centralisation === 'decentralised' && {
+      capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
+    }),
+  });
 };
 
-export const getLitActionSessionSigsUsingIpfsId = async (
+export const getLitActionAuthContextUsingIpfsId = (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson,
   resourceAbilityRequests?: LitResourceAbilityRequest[]
 ) => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
 
-  if (centralisation === 'decentralised') {
-    console.warn(
-      'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
-    );
-  }
-
   // Use default resourceAbilityRequests if not provided
   const _resourceAbilityRequests = resourceAbilityRequests || [
     {
@@ -108,7 +93,7 @@ export const getLitActionSessionSigsUsingIpfsId = async (
     },
   ];
 
-  const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
+  return devEnv.litNodeClient.getPkpAuthContext({
     pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
     authMethods: [alice.authMethod],
     resourceAbilityRequests: _resourceAbilityRequests,
@@ -122,15 +107,13 @@ export const getLitActionSessionSigsUsingIpfsId = async (
       capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
     }),
   });
-
-  return litActionSessionSigs;
 };
 
-export const getInvalidLitActionSessionSigs = async (
+export const getInvalidLitActionAuthContext = (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson
 ) => {
-  const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
+  return devEnv.litNodeClient.getPkpAuthContext({
     pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
     authMethods: [alice.authMethod],
     resourceAbilityRequests: [
@@ -153,15 +136,13 @@ export const getInvalidLitActionSessionSigs = async (
         ],
     },
   });
-
-  return litActionSessionSigs;
 };
 
-export const getInvalidLitActionIpfsSessionSigs = async (
+export const getInvalidLitActionIpfsAuthContext = (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson
 ) => {
-  const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
+  return devEnv.litNodeClient.getPkpAuthContext({
     pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
     authMethods: [alice.authMethod],
     resourceAbilityRequests: [
@@ -182,6 +163,4 @@ export const getInvalidLitActionIpfsSessionSigs = async (
         ],
     },
   });
-
-  return litActionSessionSigs;
 };

local-tests/setup/session-sigs/get-pkp-session-sigs.ts

@@ -1,5 +1,8 @@
 import { LitActionResource, LitPKPResource } from '@lit-protocol/auth-helpers';
-import { LitResourceAbilityRequest } from '@lit-protocol/types';
+import {
+  type AuthenticationContext,
+  LitResourceAbilityRequest,
+} from '@lit-protocol/types';
 import { log } from '@lit-protocol/misc';
 import {
   LIT_ABILITY,
@@ -8,21 +11,15 @@ import {
 import { TinnyEnvironment } from '../tinny-environment';
 import { TinnyPerson } from '../tinny-person';
 
-export const getPkpSessionSigs = async (
+export const getPkpAuthContext = (
   devEnv: TinnyEnvironment,
   alice: TinnyPerson,
   resourceAbilityRequests?: LitResourceAbilityRequest[],
   expiration?: string
-) => {
+): AuthenticationContext => {
   const centralisation =
     CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
 
-  if (centralisation === 'decentralised') {
-    console.warn(
-      'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
-    );
-  }
-
   // Use default resourceAbilityRequests if not provided
   const _resourceAbilityRequests = resourceAbilityRequests || [
     {
@@ -35,7 +32,7 @@ export const getPkpSessionSigs = async (
     },
   ];
 
-  const pkpSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
+  const authContext = devEnv.litNodeClient.getPkpAuthContext({
     pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
     authMethods: [alice.authMethod],
     expiration,
@@ -46,7 +43,7 @@ export const getPkpSessionSigs = async (
     }),
   });
 
-  log('[getPkpSessionSigs]: ', pkpSessionSigs);
+  log('[getPkpAuthContext]: ', authContext);
 
-  return pkpSessionSigs;
+  return authContext;
 };

local-tests/setup/shiva-client.d.ts

@@ -10,6 +10,7 @@ type ContractAbis = {
   pkpHelper: string;
   contractResolver: string;
   paymentDelegation: string;
+  priceFeed: string;
 };
 
 type ContractAddresses = {
@@ -23,6 +24,7 @@ type ContractAddresses = {
   contractResolver: string;
   keyDeriver: string;
   paymentDelegation: string;
+  priceFeed: string;
 };
 
 type TestNetCreateRequest = {

local-tests/setup/shiva-client.ts

@@ -117,7 +117,9 @@ export class TestnetClient {
         },
         PKPNFTMetadata: {},
         PubkeyRouter: {},
-        PriceFeed: {},
+        PriceFeed: {
+          abi: JSON.parse(testNetConfig.contractAbis.priceFeed),
+        },
       },
     };
     return networkContext;

local-tests/setup/tinny-config.ts

@@ -90,6 +90,12 @@ export interface ProcessEnvs {
    * this value will be ignored
    */
   NETWORK_CONFIG: string;
+
+  /**
+   * Max prices to be sent to nodes -- an array of strings that will be parsed as bigints
+   * in order of PRODUCT_ID's values -- DECRYPTION, SIGN, LIT_ACTION
+   */
+  DEFAULT_MAX_PRICES: bigint[];
 }
 
 /**