feat: a bunch of fixes and merge conflicts resolution

Author: FedericoAmura

local-tests/tests/testPkpEthersWithEoaSessionSigsToSignWithAuthContext.ts

@@ -24,7 +24,6 @@ export const testPkpEthersWithEoaSessionSigsToSignWithAuthContext = async (
     pkpPubKey: alice.pkp.publicKey,
     litNodeClient: devEnv.litNodeClient,
     authContext: {
-      client: devEnv.litNodeClient,
       getSessionSigsProps: {
         authNeededCallback: async function (
           params: AuthCallbackParams

packages/pkp-base/src/lib/pkp-base.ts

@@ -417,7 +417,7 @@ export class PKPBase<T = PKPBaseDefaultParams> {
 
     try {
       const sig = await this.litNodeClient.pkpSign({
-        toSign: Array.from(toSign),
+        toSign,
         pubKey: this.uncompressedPubKey,
         sessionSigs: controllerSessionSigs,
       });

packages/pkp-walletconnect/src/lib/pkp-walletconnect.spec.ts

@@ -44,7 +44,7 @@ describe('PKPWalletConnect', () => {
             const toSign = await createSiweMessageWithRecaps({
               uri: params.uri!,
               expiration: params.expiration!,
-              resources: [params.resourceAbilityRequests!],
+              resources: params.resourceAbilityRequests!,
               walletAddress: wallet.address,
               nonce: await litNodeClient.getLatestBlockhash(),
               litNodeClient,

packages/schemas/package.json

@@ -20,7 +20,7 @@
   "tags": [
     "universal"
   ],
-  "version": "6.7.0",
+  "version": "7.0.0-alpha.8",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/schemas/src/lib/ILitNodeClient.ts

@@ -14,7 +14,6 @@ import {
   EncryptSdkParamsSchema,
   ExecuteJsResponseSchema,
   FormattedMultipleAccsSchema,
-  GetSignedTokenRequestSchema,
   HandshakeWithNodeSchema,
   JsonExecutionSdkParamsSchema,
   JsonHandshakeResponseSchema,
@@ -205,19 +204,6 @@ export const ILitNodeClientSchema = z.object({
     .function()
     .args(JsonExecutionSdkParamsSchema)
     .returns(z.promise(z.union([ExecuteJsResponseSchema, z.undefined()]))),
-  /**
-   *
-   * Request a signed JWT from the LIT network. Before calling this function, you must know the access control conditions for the item you wish to gain authorization for.
-   *
-   * @param { GetSignedTokenRequest } params
-   *
-   * @returns { Promise<string> } final JWT
-   *
-   */
-  getSignedToken: z
-    .function()
-    .args(GetSignedTokenRequestSchema)
-    .returns(z.promise(z.union([z.string(), z.undefined()]))),
   /**
    * Encrypt data with Lit identity-based Timelock Encryption.
    *

packages/schemas/src/lib/models.ts

@@ -88,7 +88,7 @@ export const AuthCallbackParamsSchema = LitActionSdkParamsSchema.extend({
    * Optional project ID for WalletConnect V2. Only required if one is using checkAndSignAuthMessage and wants to display WalletConnect as an option.
    */
   walletConnectProjectId: z.string().optional(),
-  resourceAbilityRequests: LitResourceAbilityRequestSchema.optional(),
+  resourceAbilityRequests: z.array(LitResourceAbilityRequestSchema).optional(),
 });
 
 export const LitNodeClientConfigSchema = z.object({

packages/schemas/src/lib/schemas.ts

@@ -22,17 +22,6 @@ export const IProviderSchema = z.object({
 
 export const ChainSchema = z.string();
 
-export const VerifyJWTPropsSchema = z.object({
-  publicKey: z.string(),
-  // A JWT signed by the LIT network using the BLS12-381 algorithm
-  jwt: z.string(),
-});
-
-export const JWTHeaderSchema = z.object({
-  alg: z.string(),
-  typ: z.string(),
-});
-
 export const SignatureSchema = z.object({
   r: z.string(),
   s: z.string(),
@@ -265,7 +254,7 @@ export const CreateCustomAuthMethodRequestSchema = z.object({
 
 export const BaseJsonPkpSignRequestSchema = z.object({
   authMethods: z.array(AuthMethodSchema).optional(),
-  toSign: z.array(z.number()),
+  toSign: z.instanceof(Uint8Array),
 });
 
 /**
@@ -281,6 +270,9 @@ export const JsonPkpSignSdkParamsSchema = BaseJsonPkpSignRequestSchema.extend({
  * The actual payload structure sent to the node /pkp/sign endpoint.
  */
 export const JsonPkpSignRequestSchema = BaseJsonPkpSignRequestSchema.extend({
+  // Nodes can sign number[], not Uint8Array. Must use normalizeArray function
+  toSign: z.array(z.number()),
+
   authSig: AuthSigSchema,
 
   /**
@@ -768,11 +760,6 @@ export const SigningAccessControlConditionRequestSchema =
     exp: z.number().optional(),
   });
 
-export const GetSignedTokenRequestSchema =
-  SigningAccessControlConditionRequestSchema.extend({
-    sessionSigs: SessionSigsMapSchema,
-  });
-
 export const EncryptSdkParamsSchema =
   MultipleAccessControlConditionsSchema.extend({
     dataToEncrypt: z.instanceof(Uint8Array),

packages/types/src/lib/interfaces.ts

@@ -1,4 +1,3 @@
-import { Provider } from '@ethersproject/abstract-provider';
 import depd from 'depd';
 import { z } from 'zod';
 
@@ -26,7 +25,6 @@ import {
   SigResponseSchema,
   ExecuteJsResponseBaseSchema,
   ExecuteJsResponseSchema,
-  GetSignedTokenRequestSchema,
   MultipleAccessControlConditionsSchema,
   EncryptSdkParamsSchema,
   DecryptResponseSchema,
@@ -58,8 +56,6 @@ import {
   SolanaAuthSigSchema,
   CosmosAuthSigSchema,
   IProviderSchema,
-  VerifyJWTPropsSchema,
-  JWTHeaderSchema,
   ClaimKeyResponseSchema,
   SignatureSchema,
   BaseJsonPkpSignRequestSchema,
@@ -163,17 +159,6 @@ export interface DecryptFileProps {
   symmetricKey: SymmetricKey;
 }
 
-export type VerifyJWTProps = z.infer<typeof VerifyJWTPropsSchema>;
-
-export interface IJWT<T> {
-  verified: boolean;
-  header: JWTHeader;
-  payload: T;
-  signature: Uint8Array;
-}
-
-export type JWTHeader = z.infer<typeof JWTHeaderSchema>;
-
 export type SigningAccessControlConditionJWTPayload = z.infer<
   typeof SigningAccessControlConditionJWTPayloadSchema
 >;
@@ -238,14 +223,18 @@ export type MultipleAccessControlConditions = z.infer<
   typeof MultipleAccessControlConditionsSchema
 >;
 
+/**
+ * @deprecated
+ */
 export type JsonAccsRequest = z.infer<typeof JsonAccsRequestSchema>;
 
 export type JsonSigningRetrieveRequest = z.infer<
   typeof JsonSigningRetrieveRequestSchema
 >;
 
-export type GetSignedTokenRequest = z.infer<typeof GetSignedTokenRequestSchema>;
-
+/**
+ * @deprecated
+ */
 export type JsonSigningStoreRequest = z.infer<
   typeof JsonSigningStoreRequestSchema
 >;