Feature/lit 2961 auth unification breaking remove existing authsigs

local-tests/setup/tinny-environment.ts

@@ -14,7 +14,7 @@ export class TinnyEnvironment {
    * Environment variables used in the process.
    */
   public processEnvs: ProcessEnvs = {
-    MAX_ATTEMPTS: parseInt(process.env['MAX_ATTEMPTS']) || 3,
+    MAX_ATTEMPTS: parseInt(process.env['MAX_ATTEMPTS']) || 1,
     NETWORK: (process.env['NETWORK'] as LIT_TESTNET) || LIT_TESTNET.LOCALCHAIN,
     DEBUG: Boolean(process.env['DEBUG']) || false,
     REQUEST_PER_KILOSECOND:

local-tests/tests/testUseEoaSessionSigsToEncryptDecryptFile.ts

@@ -57,7 +57,7 @@ export const testUseEoaSessionSigsToEncryptDecryptFile = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUseEoaSessionSigsToEncryptDecryptString.ts

@@ -53,7 +53,7 @@ export const testUseEoaSessionSigsToEncryptDecryptString = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUseEoaSessionSigsToEncryptDecryptZip.ts

@@ -55,7 +55,7 @@ export const testUseEoaSessionSigsToEncryptDecryptZip = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUsePkpSessionSigsToEncryptDecryptFile.ts

@@ -58,7 +58,7 @@ export const testUsePkpSessionSigsToEncryptDecryptFile = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUsePkpSessionSigsToEncryptDecryptString.ts

@@ -51,7 +51,7 @@ export const testUsePkpSessionSigsToEncryptDecryptString = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUsePkpSessionSigsToEncryptDecryptZip.ts

@@ -56,7 +56,7 @@ export const testUsePkpSessionSigsToEncryptDecryptZip = async (
   }
 
   const accsResourceString =
-    await LitAccessControlConditionResource.composeLitActionResourceString(
+    await LitAccessControlConditionResource.generateLitActionResourceString(
       accs,
       encryptRes.dataToEncryptHash
     );

local-tests/tests/testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptFile.ts

@@ -60,7 +60,7 @@ export const testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptFile =
     }
 
     const accsResourceString =
-      await LitAccessControlConditionResource.composeLitActionResourceString(
+      await LitAccessControlConditionResource.generateLitActionResourceString(
         accs,
         encryptRes.dataToEncryptHash
       );

local-tests/tests/testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptString.ts

@@ -55,7 +55,7 @@ export const testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptString
     }
 
     const accsResourceString =
-      await LitAccessControlConditionResource.composeLitActionResourceString(
+      await LitAccessControlConditionResource.generateLitActionResourceString(
         accs,
         encryptRes.dataToEncryptHash
       );

local-tests/tests/testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptZip.ts

@@ -58,7 +58,7 @@ export const testUseValidLitActionCodeGeneratedSessionSigsToEncryptDecryptZip =
     }
 
     const accsResourceString =
-      await LitAccessControlConditionResource.composeLitActionResourceString(
+      await LitAccessControlConditionResource.generateLitActionResourceString(
         accs,
         encryptRes.dataToEncryptHash
       );

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

@@ -53,7 +53,7 @@ export class LitAccessControlConditionResource
    * @param {string} dataToEncryptHash - The hash of the data to encrypt.
    * @returns {Promise<string>} The composed resource string in the format 'hashedAccs/dataToEncryptHash'.
    */
-  public static async composeLitActionResourceString(
+  public static async generateLitActionResourceString(
     accs: AccessControlConditions,
     dataToEncryptHash: string
   ): Promise<string> {

packages/constants/src/lib/constants/endpoints.ts

@@ -11,22 +11,22 @@ export const LIT_ENDPOINT = {
   },
   SIGN_SESSION_KEY: {
     path: '/web/sign_session_key',
-    // version: LIT_ENDPOINT_VERSION.V1,
+    version: LIT_ENDPOINT_VERSION.V1,
 
     // FIXME: Change this to V1 once the new version is deployed to all public networks
-    version: LIT_ENDPOINT_VERSION.V0,
+    // version: LIT_ENDPOINT_VERSION.V0,
     envName: 'SIGN_SESSION_KEY',
   },
   EXECUTE_JS: {
     path: '/web/execute',
     // FIXME: Change this to V1 once the new version is deployed to all public networks
-    version: LIT_ENDPOINT_VERSION.V0,
+    version: LIT_ENDPOINT_VERSION.V1,
     envName: 'EXECUTE_JS',
   },
   PKP_SIGN: {
     path: '/web/pkp/sign',
     // version: LIT_ENDPOINT_VERSION.V1,
-    version: LIT_ENDPOINT_VERSION.V0,
+    version: LIT_ENDPOINT_VERSION.V1,
     envName: 'PKP_SIGN',
   },
   PKP_CLAIM: {

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

@@ -1,4 +1,4 @@
-import { SessionSig, StytchToken } from '@lit-protocol/types';
+import { StytchToken } from '@lit-protocol/types';
 import { ethers } from 'ethers';
 import * as jose from 'jose';
 /**

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

@@ -54,7 +54,6 @@ import type {
   NodeErrorV3,
   RejectedNodePromises,
   SendNodeCommand,
-  SessionSig,
   SessionSigsMap,
   SuccessNodePromises,
   SupportedJsonRequests,
@@ -1018,48 +1017,40 @@ export class LitCore {
   };
 
   /**
+   * Retrieves the session signature for a given URL from the sessionSigs map.
+   * Throws an error if sessionSigs is not provided or if the session signature for the URL is not found.
    *
-   * Get either auth sig or session auth sig
-   *
+   * @param sessionSigs - The session signatures map.
+   * @param url - The URL for which to retrieve the session signature.
+   * @returns The session signature for the given URL.
+   * @throws An error if sessionSigs is not provided or if the session signature for the URL is not found.
    */
-  getSessionOrAuthSig = ({
-    authSig,
+  getSessionSigByUrl = ({
     sessionSigs,
     url,
-    mustHave = true,
   }: {
-    authSig?: AuthSig;
-    sessionSigs?: SessionSigsMap;
+    sessionSigs: SessionSigsMap;
     url: string;
-    mustHave?: boolean;
-  }): AuthSig | SessionSig => {
-    if (!authSig && !sessionSigs) {
-      if (mustHave) {
-        throwError({
-          message: `You must pass either authSig, or sessionSigs`,
-          errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
-          errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
-        });
-      } else {
-        log(`authSig or sessionSigs not found. This may be using authMethod`);
-      }
+  }): AuthSig => {
+    if (!sessionSigs) {
+      return throwError({
+        message: `You must pass in sessionSigs`,
+        errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
+        errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
+      });
     }
 
-    if (sessionSigs) {
-      const sigToPassToNode = sessionSigs[url];
+    const sigToPassToNode = sessionSigs[url];
 
-      if (!sigToPassToNode) {
-        throwError({
-          message: `You passed sessionSigs but we could not find session sig for node ${url}`,
-          errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
-          errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
-        });
-      }
-
-      return sigToPassToNode;
+    if (!sessionSigs[url]) {
+      throwError({
+        message: `You passed sessionSigs but we could not find session sig for node ${url}`,
+        errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
+        errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
+      });
     }
 
-    return authSig!;
+    return sigToPassToNode;
   };
 
   validateAccessControlConditionsSchema = async (

packages/encryption/src/lib/params-validators.ts

@@ -34,9 +34,10 @@ import {
   EncryptToJsonProps,
   EncryptZipRequest,
   EvmContractConditions,
-  ExecuteJsProps,
   GetSignedTokenRequest,
+  JsonExecutionSdkParams,
   SessionSigs,
+  SessionSigsMap,
   SolRpcConditions,
   UnifiedAccessControlConditions,
 } from '@lit-protocol/types';
@@ -71,7 +72,7 @@ export const paramsValidators: Record<
   string,
   (params: any) => ParamsValidator[]
 > = {
-  executeJs: (params: ExecuteJsProps) => [
+  executeJs: (params: JsonExecutionSdkParams) => [
     new AuthMaterialValidator('executeJs', params),
     new ExecuteJsValidator('executeJs', params),
     new AuthMethodValidator('executeJs', params.authMethods),
@@ -379,8 +380,7 @@ class FileValidator implements ParamsValidator {
 }
 
 export interface AuthMaterialValidatorProps {
-  authSig?: AuthSig;
-  sessionSigs?: SessionSigs;
+  sessionSigs?: SessionSigsMap;
   chain?: string;
 }
 
@@ -400,14 +400,7 @@ class AuthMaterialValidator implements ParamsValidator {
   }
 
   validate(): IEither<void> {
-    const { authSig, sessionSigs } = this.authMaterial;
-
-    if (authSig && !is(authSig, 'Object', 'authSig', this.fnName))
-      return ELeft({
-        message: 'authSig is not an object',
-        errorKind: LIT_ERROR.INVALID_PARAM_TYPE.kind,
-        errorCode: LIT_ERROR.INVALID_PARAM_TYPE.name,
-      });
+    const { sessionSigs } = this.authMaterial;
 
     if (this.checkIfAuthSigRequiresChainParam) {
       if (!this.authMaterial.chain)
@@ -416,20 +409,6 @@ class AuthMaterialValidator implements ParamsValidator {
           errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
           errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
         });
-
-      if (
-        authSig &&
-        !checkIfAuthSigRequiresChainParam(
-          authSig,
-          this.authMaterial.chain,
-          this.fnName
-        )
-      )
-        return ELeft({
-          message: 'authSig is not valid',
-          errorKind: LIT_ERROR.INVALID_PARAM_TYPE.kind,
-          errorCode: LIT_ERROR.INVALID_PARAM_TYPE.name,
-        });
     }
 
     if (sessionSigs && !is(sessionSigs, 'Object', 'sessionSigs', this.fnName))
@@ -439,17 +418,9 @@ class AuthMaterialValidator implements ParamsValidator {
         errorCode: LIT_ERROR.INVALID_PARAM_TYPE.name,
       });
 
-    if (!sessionSigs && !authSig)
-      return ELeft({
-        message: 'You must pass either authSig or sessionSigs',
-        errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
-        errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
-      });
-
-    // -- validate: if sessionSig and authSig exists
-    if (sessionSigs && authSig)
+    if (!sessionSigs)
       return ELeft({
-        message: 'You cannot have both authSig and sessionSigs',
+        message: 'You must pass in sessionSigs',
         errorKind: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.kind,
         errorCode: LIT_ERROR.INVALID_ARGUMENT_EXCEPTION.name,
       });

packages/lit-node-client-nodejs/src/lib/helpers/encode-code.test.ts

@@ -0,0 +1,31 @@
+import { encodeCode } from './encode-code';
+
+describe('encodeCode', () => {
+  it('should encode a string to base64', () => {
+    const code = 'console.log("Hello, World!")';
+    const encodedCode = encodeCode(code);
+
+    expect(encodedCode).toEqual('Y29uc29sZS5sb2coIkhlbGxvLCBXb3JsZCEiKQ==');
+  });
+
+  it('should handle empty string', () => {
+    const code = '';
+    const encodedCode = encodeCode(code);
+
+    expect(encodedCode).toEqual('');
+  });
+
+  it('should handle special characters', () => {
+    const code = 'const x = 10 + 5 - 3 * 2 / 1;';
+    const encodedCode = encodeCode(code);
+
+    expect(encodedCode).toEqual('Y29uc3QgeCA9IDEwICsgNSAtIDMgKiAyIC8gMTs=');
+  });
+
+  it('should handle non-ASCII characters', () => {
+    const code = 'const name = "Jérémy";';
+    const encodedCode = encodeCode(code);
+
+    expect(encodedCode).toEqual('Y29uc3QgbmFtZSA9ICJKw6lyw6lteSI7');
+  });
+});

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

@@ -0,0 +1,17 @@
+import {
+  uint8arrayFromString,
+  uint8arrayToString,
+} from '@lit-protocol/uint8arrays';
+
+/**
+ * Encodes the given code string into base64 format.
+ *
+ * @param code - The code string to be encoded.
+ * @returns The encoded code string in base64 format.
+ */
+export const encodeCode = (code: string) => {
+  const _uint8Array = uint8arrayFromString(code, 'utf8');
+  const encodedJs = uint8arrayToString(_uint8Array, 'base64');
+
+  return encodedJs;
+};