feat: add customResources to sessionSigs

Author: Ansonhkg

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

@@ -0,0 +1,27 @@
+export function parseCustomResources(nodeResponses: any) {
+  return ((nodeResponses.values.map((item: any) => {
+    return {
+      signedMessage: item.siweMessage
+    };
+  }).map((v: any) => {
+    const signedMessage = v.signedMessage;
+    const urnLine = signedMessage.match(/urn:recap:[\w\d]+/)![0];
+
+    const authContext = JSON.parse(atob(urnLine.split(':')[2])).att['lit-resolvedauthcontext://*']['Auth/Auth'][0]['auth_context'];
+
+    const extractedCustomAuthResource = (authContext['customAuthResource']).slice(8, -2);
+    const formattedCustomAuthResource = extractedCustomAuthResource.replace(/\\"/g, '"');
+    let result;
+
+    try {
+      result = JSON.parse(formattedCustomAuthResource);
+    } catch (e) {
+      result = extractedCustomAuthResource
+    }
+
+    return {
+      authContext,
+      formattedCustomAuthResource: result,
+    };
+  }).find((item: any) => item.formattedCustomAuthResource !== 'undefined')))?.formattedCustomAuthResource
+}

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

@@ -76,6 +76,7 @@ import { parsePkpSignResponse } from './helpers/parse-pkp-sign-response';
 import { processLitActionResponseStrategy } from './helpers/process-lit-action-response-strategy';
 import { removeDoubleQuotes } from './helpers/remove-double-quotes';
 import { blsSessionSigVerify } from './helpers/validate-bls-session-sig';
+import { parseCustomResources } from './helpers/parseCustomResources';
 
 import type {
   AuthCallback,
@@ -135,8 +136,7 @@ import type {
 
 export class LitNodeClientNodeJs
   extends LitCore
-  implements LitClientSessionManager, ILitNodeClient
-{
+  implements LitClientSessionManager, ILitNodeClient {
   defaultAuthCallback?: (authSigParams: AuthCallbackParams) => Promise<AuthSig>;
 
   // ========== Constructor ==========
@@ -1293,8 +1293,8 @@ export class LitNodeClientNodeJs
         // -- optional params
         ...(params.authMethods &&
           params.authMethods.length > 0 && {
-            authMethods: params.authMethods,
-          }),
+          authMethods: params.authMethods,
+        }),
       };
 
       logWithRequestId(requestId, 'reqBody:', reqBody);
@@ -1880,18 +1880,35 @@ export class LitNodeClientNodeJs
     });
 
     // -- resolve promises
+    const numberToResolve = params?.handleAllResponses ? this.connectedNodes.size : this.config.minNodeCount;
+
+    console.log("numberToResolve:", numberToResolve);
     let res;
     try {
       res = await this.handleNodePromises(
         nodePromises,
         requestId,
-        this.config.minNodeCount
+        numberToResolve,
       );
       log('signSessionKey node promises:', res);
     } catch (e) {
       throw new Error(`Error when handling node promises: ${e}`);
     }
 
+    // -- handle all responses
+    let customResources;
+
+
+    console.log("res:", res);
+
+    try {
+      customResources = parseCustomResources(res);
+    } catch (e) {
+      log(`Failed to parse custom resources, not a problem.`)
+    }
+
+    console.log("customResources:", customResources);
+
     logWithRequestId(requestId, 'handleNodePromises res:', res);
 
     // -- case: promises rejected
@@ -2035,6 +2052,7 @@ export class LitNodeClientNodeJs
         derivedVia: 'lit.bls',
         signedMessage,
         address: computeAddress(hexPrefixed(publicKey)),
+        ...(customResources && { customResources: customResources })
       },
       pkpPublicKey: publicKey,
     };
@@ -2096,8 +2114,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
@@ -2180,10 +2198,10 @@ export class LitNodeClientNodeJs
 
     const capabilities = params.capacityDelegationAuthSig
       ? [
-          ...(params.capabilityAuthSigs ?? []),
-          params.capacityDelegationAuthSig,
-          authSig,
-        ]
+        ...(params.capabilityAuthSigs ?? []),
+        params.capacityDelegationAuthSig,
+        authSig,
+      ]
       : [...(params.capabilityAuthSigs ?? []), authSig];
 
     const signingTemplate = {
@@ -2318,6 +2336,8 @@ export class LitNodeClientNodeJs
             litActionIpfsId: props.litActionIpfsId,
           }),
           ...(props.jsParams && { jsParams: props.jsParams }),
+
+          ...(params.handleAllResponses && { handleAllResponses: params.handleAllResponses })
         });
 
         return response.authSig;

packages/types/src/lib/interfaces.ts

@@ -314,7 +314,7 @@ export interface JsonSignChainDataRequest {
 
 export interface JsonSignSessionKeyRequestV1
   extends Pick<LitActionSdkParams, 'jsParams'>,
-    Pick<LitActionSdkParams, 'litActionIpfsId'> {
+  Pick<LitActionSdkParams, 'litActionIpfsId'> {
   sessionKey: string;
   authMethods: AuthMethod[];
   pkpPublicKey?: string;
@@ -503,7 +503,7 @@ export interface JsonExecutionSdkParamsTargetNode
 
 export interface JsonExecutionSdkParams
   extends Pick<LitActionSdkParams, 'jsParams'>,
-    ExecuteJsAdvancedOptions {
+  ExecuteJsAdvancedOptions {
   /**
    *  JS code to run on the nodes
    */
@@ -579,7 +579,7 @@ export interface SessionSigsOrAuthSig {
 
 export interface DecryptRequestBase
   extends SessionSigsOrAuthSig,
-    MultipleAccessControlConditions {
+  MultipleAccessControlConditions {
   /**
    * The chain name of the chain that this contract is deployed on.  See LIT_CHAINS for currently supported chains.
    */
@@ -624,7 +624,7 @@ export interface EncryptFileRequest extends DecryptRequestBase {
   file: AcceptedFileType;
 }
 
-export interface DecryptRequest extends EncryptResponse, DecryptRequestBase {}
+export interface DecryptRequest extends EncryptResponse, DecryptRequestBase { }
 
 export interface DecryptResponse {
   // The decrypted data as a Uint8Array
@@ -646,10 +646,10 @@ export interface SigResponse {
 
 export interface ExecuteJsResponseBase {
   signatures:
-    | {
-        sig: SigResponse;
-      }
-    | any;
+  | {
+    sig: SigResponse;
+  }
+  | any;
 }
 
 /**
@@ -679,7 +679,7 @@ export interface ExecuteJsNoSigningResponse extends ExecuteJsResponseBase {
   logs: string;
 }
 
-export interface LitNodePromise {}
+export interface LitNodePromise { }
 
 export interface SendNodeCommand {
   url: string;
@@ -688,10 +688,10 @@ export interface SendNodeCommand {
 }
 export interface SigShare {
   sigType:
-    | 'BLS'
-    | 'K256'
-    | 'ECDSA_CAIT_SITH' // Legacy alias of K256
-    | 'EcdsaCaitSithP256';
+  | 'BLS'
+  | 'K256'
+  | 'ECDSA_CAIT_SITH' // Legacy alias of K256
+  | 'EcdsaCaitSithP256';
 
   signatureShare: string;
   shareIndex?: number;
@@ -1091,6 +1091,11 @@ export interface SignSessionKeyProp extends LitActionSdkParams {
    * A LIT resource ability is a combination of a LIT resource and a LIT ability.
    */
   resourceAbilityRequests?: LitResourceAbilityRequest[];
+
+  /**
+   * By default, it handles minNodeCount of responses
+   */
+  handleAllResponses?: boolean;
 }
 
 export interface SignSessionKeyResponse {
@@ -1159,7 +1164,7 @@ export interface CommonGetSessionSigsProps {
 
 export interface BaseProviderGetSessionSigsProps
   extends CommonGetSessionSigsProps,
-    LitActionSdkParams {
+  LitActionSdkParams {
   /**
    * This is a callback that will be used to generate an AuthSig within the session signatures. It's inclusion is required, as it defines the specific resources and abilities that will be allowed for the current session.
    */
@@ -1168,7 +1173,7 @@ export interface BaseProviderGetSessionSigsProps
 
 export interface GetSessionSigsProps
   extends CommonGetSessionSigsProps,
-    LitActionSdkParams {
+  LitActionSdkParams {
   /**
    * This is a callback that will be used to generate an AuthSig within the session signatures. It's inclusion is required, as it defines the specific resources and abilities that will be allowed for the current session.
    */
@@ -1692,7 +1697,7 @@ export interface LoginUrlParams {
   error: string | null;
 }
 
-export interface BaseAuthenticateOptions {}
+export interface BaseAuthenticateOptions { }
 
 export interface EthWalletAuthenticateOptions extends BaseAuthenticateOptions {
   /**
@@ -1758,9 +1763,9 @@ export interface MintCapacityCreditsPerKilosecond
 }
 export interface MintCapacityCreditsContext
   extends MintCapacityCreditsPerDay,
-    MintCapacityCreditsPerSecond,
-    MintCapacityCreditsPerKilosecond,
-    GasLimitParam {}
+  MintCapacityCreditsPerSecond,
+  MintCapacityCreditsPerKilosecond,
+  GasLimitParam { }
 export interface MintCapacityCreditsRes {
   rliTxHash: string;
   capacityTokenId: any;
@@ -1883,12 +1888,12 @@ export interface LitActionSdkParams {
    * An object that contains params to expose to the Lit Action.  These will be injected to the JS runtime before your code runs, so you can use any of these as normal variables in your Lit Action.
    */
   jsParams?:
-    | {
-        [key: string]: any;
-        publicKey?: string;
-        sigName?: string;
-      }
-    | any;
+  | {
+    [key: string]: any;
+    publicKey?: string;
+    sigName?: string;
+  }
+  | any;
 }
 
 export interface LitEndpoint {
@@ -1910,7 +1915,7 @@ export interface SignerLike {
 
 export interface GetPkpSessionSigs
   extends CommonGetSessionSigsProps,
-    LitActionSdkParams {
+  LitActionSdkParams {
   pkpPublicKey: string;
 
   /**
@@ -1924,6 +1929,8 @@ export interface GetPkpSessionSigs
   authMethods?: AuthMethod[];
 
   ipfsOptions?: IpfsOptions;
+
+  handleAllResponses?: boolean;
 }
 
 /**
@@ -1936,18 +1943,18 @@ export type GetLitActionSessionSigs = CommonGetSessionSigsProps &
   Pick<Required<LitActionSdkParams>, 'jsParams'> &
   (
     | (Pick<Required<LitActionSdkParams>, 'litActionCode'> & {
-        litActionIpfsId?: never;
-      })
+      litActionIpfsId?: never;
+    })
     | (Pick<Required<LitActionSdkParams>, 'litActionIpfsId'> & {
-        litActionCode?: never;
-      })
+      litActionCode?: never;
+    })
   ) & {
     ipfsOptions?: IpfsOptions;
 
     /**
      * Special property to return all node responses
      */
-    getNodeResponses?: boolean;
+    handleAllResponses?: boolean;
   };
 
 export interface SessionKeyCache {

packages/wrapped-keys/src/lib/api/tria-batch-generate-private-keys.ts

@@ -93,7 +93,7 @@ export async function triaBatchGeneratePrivateKeys(
       ],
       litActionIpfsId: params.ipfsId,
       jsParams: _jsParams,
-      getNodeResponses: true,
+      handleAllResponses: true,
     });
   } catch (e) {
     throw new Error(`Error getting Lit Action Session Sigs: ${e}`);

packages/wrapped-keys/src/lib/api/utils.ts

@@ -107,32 +107,4 @@ export function getPkpAccessControlCondition(
       value: pkpAddress,
     },
   };
-}
-
-export function parseCustoemrResourcesFromNodeResponses(responses: any) {
-  return ((responses.map((item: any) => {
-    return {
-      signedMessage: item.siweMessage
-    };
-  }).map((v: any) => {
-    const signedMessage = v.signedMessage;
-    const urnLine = signedMessage.match(/urn:recap:[\w\d]+/)![0];
-
-    const authContext = JSON.parse(atob(urnLine.split(':')[2])).att['lit-resolvedauthcontext://*']['Auth/Auth'][0]['auth_context'];
-
-    const extractedCustomAuthResource = (authContext['customAuthResource']).slice(8, -2);
-    const formattedCustomAuthResource = extractedCustomAuthResource.replace(/\\"/g, '"');
-    let result;
-
-    try {
-      result = JSON.parse(formattedCustomAuthResource);
-    } catch (e) {
-      result = extractedCustomAuthResource
-    }
-
-    return {
-      authContext,
-      formattedCustomAuthResource: result,
-    };
-  }).find((item: any) => item.formattedCustomAuthResource !== 'undefined')))?.formattedCustomAuthResource
 }