LIT-Protocol · Ansonhkg · Jan 27, 2025 · Jan 27, 2025 · Jan 28, 2025 · Jan 30, 2025
@@ -9,7 +9,7 @@ import {
 import { log } from '@lit-protocol/misc';
 import { SigningScheme } from '@lit-protocol/types';
 
-import { getEoaSessionSigs } from 'local-tests/setup/session-sigs/get-eoa-session-sigs';
+import { getEoaAuthContext } from 'local-tests/setup/session-sigs/get-eoa-session-sigs';
 import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
 
 interface SigningSchemeConfig {
@@ -106,11 +106,11 @@ export const testUseEoaSessionSigsToPkpSign = async (
 
       const signingScheme = signingSchemeConfig.signingScheme;
       log(`Checking testUseEoaSessionSigsToPkpSign for ${signingSchemeConfig}`);
-      const eoaSessionSigs = await getEoaSessionSigs(devEnv, alice);
+      // const eoaSessionSigs = await getEoaSessionSigs(devEnv, alice);
 
       const pkpSignature = await devEnv.litNodeClient.pkpSign({
         pubKey: alice.pkp.publicKey,
-        sessionSigs: eoaSessionSigs,
+        authContext: getEoaAuthContext(devEnv, alice),
         messageToSign: alice.loveLetter,
         signingScheme,
       });

@@ -51,6 +51,9 @@ export type LIT_CURVE_TYPE = keyof typeof LIT_CURVE; // Identical to Sig
 // This should replicate SigShare.sigType in types package
 export type LIT_CURVE_VALUES = (typeof LIT_CURVE)[keyof typeof LIT_CURVE];
 
+/**
+ * CHANGE: This is not needed when the combiner is integrated
+ */
 export const CURVE_GROUPS = ['BLS', 'ECDSA', 'FROST'] as const;
 
 /**

@@ -10,7 +10,6 @@ import {
   InvalidNodeAttestation,
   InvalidParamType,
   LIT_CURVE,
-  LIT_CURVE_VALUES,
   LIT_ENDPOINT,
   LIT_ERROR_CODE,
   LIT_NETWORK,
@@ -23,12 +22,7 @@ import {
   STAKING_STATES,
   STAKING_STATES_VALUES,
   UnknownError,
-  InvalidArgumentException,
-  LitNodeClientBadConfigError,
-  InvalidEthBlockhash,
-  LitNodeClientNotReadyError,
-  InvalidNodeAttestation,
-  LogLevel,
+  version,
   LitEcdsaVariantType,
 } from '@lit-protocol/constants';
 import { LitContracts } from '@lit-protocol/contracts-sdk';

@@ -27,7 +27,6 @@ import {
   InvalidParamType,
   InvalidSessionSigs,
   InvalidSignatureError,
-  LIT_ACTION_IPFS_HASH,
   LIT_CURVE_TYPE,
   LIT_ENDPOINT,
   LitNodeClientNotReadyError,
@@ -296,71 +295,6 @@ export class LitNodeClientNodeJs extends LitCore implements ILitNodeClient {
   };
 
   /**
-   * Check if a given object is of type SessionKeyPair.
-   *
-   * @param obj - The object to check.
-   * @returns True if the object is of type SessionKeyPair.
-   */
-  isSessionKeyPair(obj: unknown): obj is SessionKeyPair {
-    return (
-      typeof obj === 'object' &&
-      obj !== null &&
-      'publicKey' in obj &&
-      'secretKey' in obj &&
-      typeof obj.publicKey === 'string' &&
-      typeof obj.secretKey === 'string'
-    );
-  }
-
-  /**
-   * Generates wildcard capability for each of the LIT resources
-   * specified.
-   * @param litResources is an array of LIT resources
-   * @param addAllCapabilities is a boolean that specifies whether to add all capabilities for each resource
-   */
-  static async generateSessionCapabilityObjectWithWildcards(
-    litResources: ILitResource[],
-    addAllCapabilities?: boolean
-  ): Promise<ISessionCapabilityObject> {
-    const sessionCapabilityObject = new RecapSessionCapabilityObject({}, []);
-
-    // disable for now
-    const _addAllCapabilities = addAllCapabilities ?? false;
-
-    if (_addAllCapabilities) {
-      for (const litResource of litResources) {
-        sessionCapabilityObject.addAllCapabilitiesForResource(litResource);
-      }
-    }
-
-    return sessionCapabilityObject;
-  }
-
-  // backward compatibility
-  async generateSessionCapabilityObjectWithWildcards(
-    litResources: ILitResource[]
-  ): Promise<ISessionCapabilityObject> {
-    return await LitNodeClientNodeJs.generateSessionCapabilityObjectWithWildcards(
-      litResources
-    );
-  }
-
-  /**
-   *
-   * Get expiration for session default time is 1 day / 24 hours
-   *
-   */
-  static getExpiration = () => {
-    return new Date(Date.now() + 1000 * 60 * 60 * 24).toISOString();
-  };
-
-  // backward compatibility
-  getExpiration = () => {
-    return LitNodeClientNodeJs.getExpiration();
-  };
-
-  /**
-   *
    * Get the signature from local storage, if not, generates one
    */
   private _getWalletSig = async ({
@@ -934,7 +868,7 @@ export class LitNodeClientNodeJs extends LitCore implements ILitNodeClient {
    */
   pkpSign = async (params: JsonPkpSignSdkParams): Promise<LitNodeSignature> => {
     // -- validate required params
-    const requiredParamKeys = ['messageToSign', 'pubKey']; // TODO migrate to zod
+    const requiredParamKeys = ['messageToSign', 'pubKey', 'authContext']; // TODO migrate to zod
 
     (requiredParamKeys as (keyof JsonPkpSignSdkParams)[]).forEach((key) => {
       if (!params[key]) {
@@ -977,6 +911,16 @@ export class LitNodeClientNodeJs extends LitCore implements ILitNodeClient {
     // ========== Get Node Promises ==========
     // Handle promises for commands sent to Lit nodes
 
+    const targetNodeUrls = targetNodePrices.map(({ url }) => url);
+    const nodePromises = this._getNodePromises(
+      targetNodeUrls,
+      (url: string) => {
+        // -- get the session sig from the url key
+        const sessionSig = this._getSessionSigByUrl({
+          sessionSigs,
+          url,
+        });
+
       const toSign =
         CURVE_GROUP_BY_CURVE_TYPE[params.signingScheme] !== 'ECDSA'
           ? params.messageToSign!
@@ -985,21 +929,17 @@ export class LitNodeClientNodeJs extends LitCore implements ILitNodeClient {
       const reqBody: JsonPkpSignRequest = {
         toSign: normalizeArray(toSign),
         signingScheme: params.signingScheme,
-        pubkey: hexPrefixed(params.pubKey),
-        authSig: sessionSig,
-
-        const reqBody: JsonPkpSignRequest<LIT_CURVE_TYPE> = {
-          toSign: normalizeArray(params.toSign),
           pubkey: hexPrefixed(params.pubKey),
           authSig: sessionSig,
 
-        // nodeSet: thresholdNodeSet,
-        nodeSet: nodeSet,
-      };
+          // -- optional params - no longer allowed in >= Naga?
+          // ...(params.authContext.authMethods &&
+          //   params.authContext.authMethods.length > 0 && {
+          //     authMethods: params.authContext.authMethods,
+          //   }),
 
           // nodeSet: thresholdNodeSet,
           nodeSet: this._getNodeSet(targetNodeUrls),
-          signingScheme: 'EcdsaK256Sha256',
         };
 
         logWithRequestId(requestId, 'reqBody:', reqBody);
@@ -1009,10 +949,14 @@ export class LitNodeClientNodeJs extends LitCore implements ILitNodeClient {
           endpoint: LIT_ENDPOINT.PKP_SIGN,
         });
 
-    const res = await this.handleNodePromises<PKPSignEndpointResponse>(
+        return this.generatePromise(urlWithPath, reqBody, requestId);
+      }
+    );
+
+    const res = await this._handleNodePromises(
       nodePromises,
       requestId,
-      nodeSet.length
+      this._getThreshold()
     );
 
     // ========== Handle Response ==========

@@ -7,8 +7,6 @@
  * The module exports the PKPBase class, as well as the PKPBaseProp type definition used for
  * initializing the class instances.
  */
-import depd from 'depd';
-
 import {
   InitError,
   LitNodeClientNotReadyError,
@@ -20,7 +18,6 @@ import {
   AuthenticationContext,
   JsonExecutionSdkParams,
   PKPBaseProp,
-  AuthSig,
   LitNodeSignature,
   PKPBaseDefaultParams,
   RPCUrls,
@@ -357,7 +354,7 @@ export class PKPBase<T = PKPBaseDefaultParams> {
       const sig = await this.litNodeClient.pkpSign({
         messageToSign,
         pubKey: this.uncompressedPubKey,
-        sessionSigs: controllerSessionSigs,
+        authContext: this.authContext,
         signingScheme: 'EcdsaK256Sha256',
       });
 

@@ -1,7 +1,7 @@
 import { Provider } from '@ethersproject/abstract-provider';
 import depd from 'depd';
 
-import { SigType } from './EndpointResponses';
+import { EcdsaSigType, SigType } from './EndpointResponses';
 import { ILitNodeClient } from './ILitNodeClient';
 import { ISessionCapabilityObject, LitResourceAbilityRequest } from './models';
 import {
@@ -19,7 +19,6 @@ import {
   SolRpcConditions,
   UnifiedAccessControlConditions,
 } from './types';
-import { EcdsaSigType, SigType } from './EndpointResponses';
 const deprecated = depd('lit-js-sdk:types:interfaces');
 
 export interface AccsOperatorParams {
@@ -187,7 +186,6 @@ export interface Node {
 }
 
 export interface BaseJsonPkpSignRequest {
-  authMethods?: AuthMethod[];
   signingScheme: SigningScheme;
 }
 
@@ -198,7 +196,8 @@ export interface BaseJsonPkpSignRequest {
 export interface JsonPkpSignSdkParams {
   pubKey: string;
   messageToSign: Uint8Array;
-  sessionSigs: SessionSigsMap;
+  authContext: AuthenticationContext;
+  userMaxPrice?: bigint;
 }
 
 /**
@@ -208,6 +207,7 @@ export interface JsonPkpSignRequest
   extends BaseJsonPkpSignRequest,
     NodeSetRequired {
   authSig: AuthSig;
+  authMethods?: AuthMethod[];
   toSign: ArrayLike<number>;
 
   /**