feat: add nodeSet to the requests

Author: Ansonhkg

packages/contracts-sdk/src/lib/contracts-sdk.ts

@@ -1129,7 +1129,6 @@ export class LitContracts {
       });
 
     const networks = activeValidatorStructs.map((item: ValidatorStruct) => {
-      const centralisation = CENTRALISATION_BY_NETWORK[litNetwork];
 
       // Convert the integer IP to a string format
       const ip = intToIP(item.ip);

packages/core/src/lib/lit-core.ts

@@ -70,6 +70,7 @@ import {
   NodeClientErrorV1,
   NodeCommandServerKeysResponse,
   NodeErrorV3,
+  NodeSet,
   RejectedNodePromises,
   SendNodeCommand,
   SessionSigsMap,
@@ -387,6 +388,30 @@ export class LitCore {
     }
   }
 
+  /**
+   * Gets the set of nodes from validator data, transforming bootstrap URLs into NodeSet objects.
+   * 
+   * @returns {Promise<NodeSet[]>} A promise that resolves with an array of NodeSet objects.
+   */
+  protected _getNodeSet = async (): Promise<NodeSet[]> => {
+    const validatorData = await this._getValidatorData();
+    const bootstrapUrls = validatorData.bootstrapUrls;
+
+    const nodeSet = bootstrapUrls.map((url) => {
+      // remove protocol from the url as we only need ip:port
+      const urlWithoutProtocol = url.replace(/(^\w+:|^)\/\//, '') as string;
+
+      return {
+        socketAddress: urlWithoutProtocol,
+
+        // FIXME: This is a placeholder value, we need to get the actual value from the contract
+        value: 1,
+      };
+    });
+
+    return nodeSet;
+  };
+
   /**
    *  Stops internal listeners/polling that refresh network state and watch for epoch changes.
    *  Removes global objects created internally
@@ -674,11 +699,9 @@ export class LitCore {
     await Promise.race([
       new Promise((_resolve, reject) => {
         timeoutHandle = setTimeout(() => {
-          const msg = `Error: Could not handshake with nodes after timeout of ${
-            this.config.connectTimeout
-          }ms. Could only connect to ${Object.keys(serverKeys).length} of ${
-            this.config.bootstrapUrls.length
-          } nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`;
+          const msg = `Error: Could not handshake with nodes after timeout of ${this.config.connectTimeout
+            }ms. Could only connect to ${Object.keys(serverKeys).length} of ${this.config.bootstrapUrls.length
+            } nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`;
 
           try {
             throw new InitError({}, msg);
@@ -1006,8 +1029,8 @@ export class LitCore {
       this._epochCache.currentNumber &&
       this._epochCache.startTime &&
       Math.floor(Date.now() / 1000) <
-        this._epochCache.startTime +
-          Math.floor(EPOCH_PROPAGATION_DELAY / 1000) &&
+      this._epochCache.startTime +
+      Math.floor(EPOCH_PROPAGATION_DELAY / 1000) &&
       this._epochCache.currentNumber >= 3 // FIXME: Why this check?
     ) {
       return this._epochCache.currentNumber - 1;
@@ -1038,7 +1061,7 @@ export class LitCore {
     data,
     requestId,
   }: // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  SendNodeCommand): Promise<any> => {
+    SendNodeCommand): Promise<any> => {
     // FIXME: Replace <any> usage with explicit, strongly typed handlers
     data = { ...data, epoch: this.currentEpochNumber };
 

packages/lit-node-client-nodejs/src/lib/lit-node-client-nodejs.ts

@@ -136,8 +136,7 @@ import type {
 
 export class LitNodeClientNodeJs
   extends LitCore
-  implements LitClientSessionManager, ILitNodeClient
-{
+  implements LitClientSessionManager, ILitNodeClient {
   defaultAuthCallback?: (authSigParams: AuthCallbackParams) => Promise<AuthSig>;
 
   // ========== Constructor ==========
@@ -785,6 +784,8 @@ export class LitNodeClientNodeJs
         url,
       });
 
+      // FIXME - will be removing this function in another PR. Temporary fix.
+      // @ts-ignore
       const reqBody: JsonExecutionRequestTargetNode = {
         ...params,
         targetNodeRange: params.targetNodeRange,
@@ -865,9 +866,12 @@ export class LitNodeClientNodeJs
       url,
     });
 
+    const nodeSet = await this._getNodeSet();
+
     const reqBody: JsonExecutionRequest = {
       ...formattedParams,
       authSig: sessionSig,
+      nodeSet
     };
 
     const urlWithPath = composeLitUrl({
@@ -1139,6 +1143,8 @@ export class LitNodeClientNodeJs
       );
     }
 
+    const nodeSet = await this._getNodeSet();
+
     // ========== Get Node Promises ==========
     // Handle promises for commands sent to Lit nodes
 
@@ -1157,8 +1163,10 @@ export class LitNodeClientNodeJs
         // -- optional params
         ...(params.authMethods &&
           params.authMethods.length > 0 && {
-            authMethods: params.authMethods,
-          }),
+          authMethods: params.authMethods,
+        }),
+
+        nodeSet
       };
 
       logWithRequestId(requestId, 'reqBody:', reqBody);
@@ -1884,8 +1892,8 @@ export class LitNodeClientNodeJs
     const sessionCapabilityObject = params.sessionCapabilityObject
       ? params.sessionCapabilityObject
       : await this.generateSessionCapabilityObjectWithWildcards(
-          params.resourceAbilityRequests.map((r) => r.resource)
-        );
+        params.resourceAbilityRequests.map((r) => r.resource)
+      );
     const expiration = params.expiration || LitNodeClientNodeJs.getExpiration();
 
     // -- (TRY) to get the wallet signature
@@ -1916,8 +1924,6 @@ export class LitNodeClientNodeJs
       resourceAbilityRequests: params.resourceAbilityRequests,
     });
 
-    // console.log('XXX needToResignSessionKey:', needToResignSessionKey);
-
     // -- (CHECK) if we need to resign the session key
     if (needToResignSessionKey) {
       log('need to re-sign session key. Signing...');
@@ -1969,28 +1975,30 @@ export class LitNodeClientNodeJs
 
     const capabilities = params.capacityDelegationAuthSig
       ? [
-          ...(params.capabilityAuthSigs ?? []),
-          params.capacityDelegationAuthSig,
-          authSig,
-        ]
+        ...(params.capabilityAuthSigs ?? []),
+        params.capacityDelegationAuthSig,
+        authSig,
+      ]
       : [...(params.capabilityAuthSigs ?? []), authSig];
 
-    const signingTemplate = {
+    // This is the template that will be combined with the node address as a single object, then signed by the session key
+    // so that the node can verify the session signature
+    const sessionSigningTemplate = {
       sessionKey: sessionKey.publicKey,
       resourceAbilityRequests: params.resourceAbilityRequests,
       capabilities,
       issuedAt: new Date().toISOString(),
       expiration: sessionExpiration,
 
-      // FIX ME: This is a dummy value for now
+      // FIXME: This is a dummy value for now
       maxPrice: '0x1234567890abcdef1234567890abcdef12345678',
     };
 
-    const signatures: SessionSigsMap = {};
+    const sessionSigs: SessionSigsMap = {};
 
     this.connectedNodes.forEach((nodeAddress: string) => {
       const toSign: SessionSigningTemplate = {
-        ...signingTemplate,
+        ...sessionSigningTemplate,
         nodeAddress,
       };
 
@@ -2004,7 +2012,7 @@ export class LitNodeClientNodeJs
       const uint8arrayMessage = uint8arrayFromString(signedMessage, 'utf8');
       const signature = nacl.sign.detached(uint8arrayMessage, uint8arrayKey);
 
-      signatures[nodeAddress] = {
+      sessionSigs[nodeAddress] = {
         sig: uint8arrayToString(signature, 'base16'),
         derivedVia: 'litSessionSignViaNacl',
         signedMessage: signedMessage,
@@ -2013,19 +2021,19 @@ export class LitNodeClientNodeJs
       };
     });
 
-    log('signatures:', signatures);
+    log('sessionSigs:', sessionSigs);
 
     try {
       const formattedSessionSigs = formatSessionSigs(
-        JSON.stringify(signatures)
+        JSON.stringify(sessionSigs)
       );
       log(formattedSessionSigs);
     } catch (e) {
       // swallow error
       log('Error formatting session signatures: ', e);
     }
 
-    return signatures;
+    return sessionSigs;
   };
 
   /**