fix: define NodeAttestation to complete and fix LitNodeClient schema

Author: FedericoAmura

packages/auth-helpers/src/lib/models.ts

@@ -1,13 +1,6 @@
 import { LIT_ABILITY_VALUES } from '@lit-protocol/constants';
 import { ILitResource } from '@lit-protocol/types';
 
-// This is here to prevent circular dependency issue
-export interface AuthSig {
-  sig: any;
-  derivedVia: string;
-  signedMessage: string;
-  address: string;
-}
 export type PlainJSON =
   | boolean
   | number

packages/auth-helpers/src/lib/recap/recap-session-capability-object.ts

@@ -7,12 +7,7 @@ import { SiweMessage } from 'siwe';
 import { Recap } from 'siwe-recap';
 import { LIT_ABILITY_VALUES } from '@lit-protocol/constants';
 import { ILitResource, ISessionCapabilityObject } from '@lit-protocol/types';
-import {
-  AuthSig,
-  AttenuationsObject,
-  CID as CIDString,
-  PlainJSON,
-} from '../models';
+import { AttenuationsObject, CID as CIDString } from '../models';
 import { getRecapNamespaceAndAbility } from './utils';
 import { sanitizeSiweMessage } from '../siwe/siwe-helper';
 
@@ -62,9 +57,9 @@ export class RecapSessionCapabilityObject implements ISessionCapabilityObject {
 
   addAttenuation(
     resource: string,
-    namespace: string = '*',
-    name: string = '*',
-    restriction: { [key: string]: PlainJSON } = {}
+    namespace = '*',
+    name = '*',
+    restriction = {}
   ) {
     return this._inner.addAttenuation(resource, namespace, name, restriction);
   }

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

@@ -66,7 +66,6 @@ import {
   NodeClientErrorV0,
   NodeClientErrorV1,
   NodeCommandServerKeysResponse,
-  NodeErrorV3,
   RejectedNodePromises,
   SendNodeCommand,
   SessionSigsMap,

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

@@ -1,6 +1,6 @@
 import { computeAddress } from '@ethersproject/transactions';
 import { BigNumber, ethers } from 'ethers';
-import { joinSignature, sha256 } from 'ethers/lib/utils';
+import { sha256 } from 'ethers/lib/utils';
 import { SiweMessage } from 'siwe';
 
 import {
@@ -25,9 +25,6 @@ import {
   LOCAL_STORAGE_KEYS,
   ParamsMissingError,
   ParamNullError,
-  NoValidShares,
-  UnknownSignatureType,
-  UnknownSignatureError,
   LitNodeClientNotReadyError,
   InvalidParamType,
   InvalidArgumentException,
@@ -75,7 +72,7 @@ import { encodeCode } from './helpers/encode-code';
 import { getBlsSignatures } from './helpers/get-bls-signatures';
 import { getClaims } from './helpers/get-claims';
 import { getClaimsList } from './helpers/get-claims-list';
-import { getFlattenShare, getSignatures } from './helpers/get-signatures';
+import { getSignatures } from './helpers/get-signatures';
 import { normalizeArray } from './helpers/normalize-array';
 import { normalizeJsParams } from './helpers/normalize-params';
 import { parseAsJsonOrString } from './helpers/parse-as-json-or-string';
@@ -107,9 +104,7 @@ import type {
   LitNodeClientConfig,
   NodeBlsSigningShare,
   NodeCommandResponse,
-  NodeLog,
   NodeShare,
-  PKPSignShare,
   RejectedNodePromises,
   SessionKeyPair,
   SessionSigningTemplate,
@@ -137,7 +132,6 @@ import type {
   EncryptionSignRequest,
   SigningAccessControlConditionRequest,
   JsonPKPClaimKeyRequest,
-  IpfsOptions,
 } from '@lit-protocol/types';
 
 export class LitNodeClientNodeJs
@@ -606,6 +600,7 @@ export class LitNodeClientNodeJs
    * Combine Shares from network public key set and signature shares
    *
    * @param { NodeBlsSigningShare } signatureShares
+   * @param { string } requestId
    *
    * @returns { string } final JWT (convert the sig to base64 and append to the jwt)
    *
@@ -717,9 +712,7 @@ export class LitNodeClientNodeJs
    */
   runOnTargetedNodes = async (
     params: JsonExecutionSdkParamsTargetNode
-  ): Promise<
-    SuccessNodePromises<NodeCommandResponse> | RejectedNodePromises
-  > => {
+  ): Promise<SuccessNodePromises | RejectedNodePromises> => {
     log('running runOnTargetedNodes:', params.targetNodeRange);
 
     if (!params.targetNodeRange) {
@@ -812,7 +805,7 @@ export class LitNodeClientNodeJs
       nodePromises,
       requestId,
       params.targetNodeRange
-    )) as SuccessNodePromises<NodeCommandResponse> | RejectedNodePromises;
+    )) as SuccessNodePromises | RejectedNodePromises;
   };
 
   // ========== Scoped Business Logics ==========
@@ -969,7 +962,7 @@ export class LitNodeClientNodeJs
     }
 
     // -- case: promises success (TODO: check the keys of "values")
-    const responseData = (res as SuccessNodePromises<NodeShare>).values;
+    const responseData = (res as SuccessNodePromises).values as NodeShare[];
 
     logWithRequestId(
       requestId,
@@ -1032,9 +1025,7 @@ export class LitNodeClientNodeJs
     const parsedResponse = parseAsJsonOrString(mostCommonResponse.response);
 
     // -- 3. combine logs
-    const mostCommonLogs: string = mostCommonString(
-      responseData.map((r: NodeLog) => r.logs)
-    );
+    const mostCommonLogs = mostCommonString(responseData.map((r) => r.logs));
 
     // -- 4. combine claims
     const claimsList = getClaimsList(responseData);
@@ -1174,7 +1165,7 @@ export class LitNodeClientNodeJs
     }
 
     // -- case: promises success (TODO: check the keys of "values")
-    const responseData = (res as SuccessNodePromises<PKPSignShare>).values;
+    const responseData = (res as SuccessNodePromises).values;
 
     logWithRequestId(
       requestId,
@@ -1304,9 +1295,8 @@ export class LitNodeClientNodeJs
       this._throwNodeError(res, requestId);
     }
 
-    const signatureShares: NodeBlsSigningShare[] = (
-      res as SuccessNodePromises<NodeBlsSigningShare>
-    ).values;
+    const signatureShares: NodeBlsSigningShare[] = (res as SuccessNodePromises)
+      .values;
 
     log('signatureShares', signatureShares);
 
@@ -1553,9 +1543,8 @@ export class LitNodeClientNodeJs
       this._throwNodeError(res, requestId);
     }
 
-    const signatureShares: NodeBlsSigningShare[] = (
-      res as SuccessNodePromises<NodeBlsSigningShare>
-    ).values;
+    const signatureShares: NodeBlsSigningShare[] = (res as SuccessNodePromises)
+      .values;
 
     logWithRequestId(requestId, 'signatureShares', signatureShares);
 
@@ -1930,9 +1919,9 @@ export class LitNodeClientNodeJs
     return signSessionKeyRes;
   };
 
-  private _isSuccessNodePromises = <T>(
-    res: SuccessNodePromises<T> | RejectedNodePromises
-  ): res is SuccessNodePromises<T> => {
+  private _isSuccessNodePromises = (
+    res: SuccessNodePromises | RejectedNodePromises
+  ): res is SuccessNodePromises => {
     return res.success;
   };
 

packages/schemas/src/lib/schemas.ts

@@ -497,7 +497,7 @@ export const JsonSigningResourceIdSchema = z.object({
 export const JsonAccsRequestSchema =
   MultipleAccessControlConditionsSchema.extend({
     // The chain name of the chain that you are querying.  See ALL_LIT_CHAINS for currently supported chains.
-    chain: ChainSchema,
+    chain: ChainSchema.optional(),
 
     // The resourceId representing something on the web via a URL
     resourceId: JsonSigningResourceIdSchema.optional(),
@@ -668,13 +668,25 @@ export const HandshakeWithNodeSchema = z.object({
   challenge: z.string(),
 });
 
+export const NodeAttestationSchema = z.object({
+  type: z.string(),
+  noonce: z.string(),
+  data: z.object({
+    INSTANCE_ID: z.string(),
+    RELEASE_ID: z.string(),
+    UNIX_TIME: z.string(),
+  }),
+  signatures: z.array(z.string()),
+  report: z.string(),
+});
+
 export const NodeCommandServerKeysResponseSchema = z.object({
   serverPublicKey: z.string(),
   subnetPublicKey: z.string(),
   networkPublicKey: z.string(),
   networkPublicKeySet: z.string(),
   hdRootPubkeys: z.array(z.string()),
-  attestation: z.string().optional(),
+  attestation: NodeAttestationSchema,
   latestBlockhash: z.string().optional(),
 });
 
@@ -863,7 +875,7 @@ export const ILitNodeClientSchema = z.object({
 
   // ========== Constructor ==========
   // ** IMPORTANT !! You have to create your constructor when implementing this class **
-  constructor: z.function(),
+  // constructor: z.function().args(z.union([LitNodeClientConfigSchema, CustomNetworkSchema])),
 
   // ========== Scoped Class Helpers ==========
 
@@ -894,7 +906,7 @@ export const ILitNodeClientSchema = z.object({
    */
   combineSharesAndGetJWT: z
     .function()
-    .args(z.array(NodeBlsSigningShareSchema))
+    .args(z.array(NodeBlsSigningShareSchema), z.string().optional())
     .returns(z.promise(z.string())),
   /**
    *
@@ -936,7 +948,7 @@ export const ILitNodeClientSchema = z.object({
    */
   getNodePromises: z
     .function()
-    .args(z.function()) // TODO improve
+    .args(z.function().args(z.string()).returns(z.promise(z.any()))) // TODO improve
     .returns(z.array(z.promise(z.any()))), // TODO
   /**
    * Handle node promises

packages/types/src/lib/interfaces.ts

@@ -40,11 +40,11 @@ import {
   SuccessNodePromisesSchema,
   NodeErrorV1Schema,
   RejectedNodePromisesSchema,
+  NodeAttestationSchema,
 } from '@lit-protocol/schemas';
 
 import { ILitNodeClient } from './ILitNodeClient';
 import { ISessionCapabilityObject, LitResourceAbilityRequest } from './models';
-import { SigningAccessControlConditionRequest } from './node-interfaces/node-interfaces';
 import {
   AcceptedFileType,
   AccessControlConditions,
@@ -463,14 +463,13 @@ export interface PkpSignedData {
   sigType: string;
   dataSigned: string;
 }
-export interface NodeShare {
+export interface NodeShare extends NodeLog {
   claimData: any;
   shareIndex: any;
   unsignedJwt: any;
   signedData: SigShare;
   decryptedData: any;
   response: any;
-  logs: any;
   success?: boolean | '';
 }
 
@@ -609,17 +608,7 @@ export interface CombinedECDSASignature {
 
 export type HandshakeWithNode = z.infer<typeof HandshakeWithNodeSchema>;
 
-export interface NodeAttestation {
-  type: string;
-  noonce: string;
-  data: {
-    INSTANCE_ID: string;
-    RELEASE_ID: string;
-    UNIX_TIME: string;
-  };
-  signatures: string[];
-  report: string;
-}
+export type NodeAttestation = z.infer<typeof NodeAttestationSchema>;
 
 export type JsonHandshakeResponse = z.infer<typeof JsonHandshakeResponseSchema>;