Merge pull request #888 from LIT-Protocol/feature/jss-100-naga-bug-accs-failing-on-unified-accs

fix(accs): Custom EVM contract condition type failing on unified acce…

Author: Ansonhkg

packages/e2e/src/tickets/jss100-custom-contract-accs.spec.ts

@@ -0,0 +1,144 @@
+import { createAuthManager, storagePlugins } from '@lit-protocol/auth';
+import { createLitClient } from '@lit-protocol/lit-client';
+import { nagaDev } from '@lit-protocol/networks';
+import { privateKeyToAccount } from 'viem/accounts';
+import {
+  createAccBuilder,
+  UnifiedAccessControlCondition,
+} from '@lit-protocol/access-control-conditions';
+
+import { createPublicClient, http } from 'viem';
+import { baseSepolia } from 'viem/chains';
+
+const liveMasterAccount = privateKeyToAccount(
+  process.env['LIVE_MASTER_ACCOUNT'] as `0x${string}`
+);
+
+const rawAccs = [
+  {
+    conditionType: 'evmContract',
+    contractAddress: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+    functionName: 'balanceOf',
+    functionParams: [':userAddress'],
+    functionAbi: {
+      inputs: [{ internalType: 'address', name: 'account', type: 'address' }],
+      name: 'balanceOf',
+      outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+      stateMutability: 'view',
+      type: 'function',
+    },
+    chain: 'baseSepolia',
+    returnValueTest: {
+      key: '',
+      comparator: '>=',
+      value: '0',
+    },
+  },
+] as UnifiedAccessControlCondition;
+
+describe('jss100 custom contract accs', () => {
+  beforeAll(async () => {
+    const client = createPublicClient({
+      chain: baseSepolia,
+      transport: http(),
+    });
+
+    const balance = await client.readContract({
+      address: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+      abi: [
+        {
+          constant: true,
+          inputs: [{ name: 'account', type: 'address' }],
+          name: 'balanceOf',
+          outputs: [{ name: '', type: 'uint256' }],
+          payable: false,
+          stateMutability: 'view',
+          type: 'function',
+        },
+      ],
+      functionName: 'balanceOf',
+      args: [liveMasterAccount.address],
+    });
+
+    if (BigInt(balance) <= 0n) {
+      throw new Error(
+        `Test account ${liveMasterAccount.address} has no balance for token 0x036CbD53842c5426634e7929541eC2318f3dCF7e. Please get some before running the test.`
+      );
+    }
+  });
+
+  it('should be able to use the custom contract accs api - evmContract conditions', async () => {
+    console.log(
+      '🔧 [TEST] Testing evmContract conditions (rawAccs):',
+      JSON.stringify(rawAccs, null, 2)
+    );
+
+    console.log(
+      'Setting up permissions for address:',
+      liveMasterAccount.address
+    );
+
+    console.log('🔧 [SESSION] Creating fresh litClient and clearing storage');
+
+    const litClient = await createLitClient({ network: nagaDev });
+
+    // Use unique storage path with timestamp to prevent session reuse
+    const uniqueStoragePath = `.e2e/jss100-${Date.now()}`;
+    console.log('🔧 [SESSION] Using unique storage path:', uniqueStoragePath);
+
+    const authManager = createAuthManager({
+      storage: storagePlugins.localStorageNode({
+        appName: 'jss100-custom-contract-accs',
+        networkName: 'naga-dev',
+        storagePath: uniqueStoragePath,
+      }),
+    });
+
+    /**
+     * ====================================
+     * Create the auth context
+     * ====================================
+     */
+    const aliceEoaAuthContext = await authManager.createEoaAuthContext({
+      config: {
+        account: liveMasterAccount,
+      },
+      authConfig: {
+        statement: 'I authorize the Lit Protocol to execute this Lit Action.',
+        domain: 'example.com',
+        resources: [
+          ['lit-action-execution', '*'],
+          ['pkp-signing', '*'],
+          ['access-control-condition-decryption', '*'],
+        ],
+        capabilityAuthSigs: [],
+        expiration: new Date(Date.now() + 1000 * 60 * 15).toISOString(),
+      },
+      litClient: litClient,
+    });
+
+    // Handle both array and single condition formats correctly
+    const unifiedAccs = createAccBuilder().unifiedAccs(rawAccs).build();
+
+    console.log('unifiedAccs:', JSON.stringify(unifiedAccs, null, 2));
+
+    const stringData = 'Hello world';
+    const encryptedStringData = await litClient.encrypt({
+      dataToEncrypt: stringData,
+      unifiedAccessControlConditions: unifiedAccs,
+    });
+
+    console.log(encryptedStringData);
+
+    // Use the same account to decrypt the data
+    const decryptedStringData = await litClient.decrypt({
+      data: encryptedStringData,
+      unifiedAccessControlConditions: unifiedAccs,
+      authContext: aliceEoaAuthContext,
+    });
+
+    console.log('decryptedStringData:', decryptedStringData);
+
+    expect(decryptedStringData.convertedData).toBe(stringData);
+  });
+});

packages/lit-client/src/lib/LitClient/createLitClient.ts

@@ -24,6 +24,7 @@ import {
 import {
   AuthContextSchema2,
   AuthData,
+  ChainSchema,
   EncryptedVersion1Schema,
   HexPrefixedSchema,
   JsonSignCustomSessionKeyRequestForPkpReturnSchema,
@@ -670,7 +671,7 @@ export const _createNagaLitClient = async (
       unifiedAccessControlConditions: params.unifiedAccessControlConditions,
       connectionInfo: currentConnectionInfo,
       version: networkModule.version,
-      chain: params.chain,
+      chain: ChainSchema.parse(params.chain),
       jitContext,
     })) as RequestItem<z.infer<typeof EncryptedVersion1Schema>>[];
 

packages/networks/src/networks/vNaga/shared/managers/api-manager/decrypt/decrypt.RequestDataSchema.ts

@@ -1,11 +1,28 @@
 import { z } from 'zod';
 import { MultipleAccessControlConditionsSchema } from '@lit-protocol/access-control-conditions-schemas';
 import { AuthSigSchema } from '@lit-protocol/schemas';
+import { FormattedMultipleAccs } from '@lit-protocol/types';
+import { getFormattedAccessControlConditions } from '@lit-protocol/access-control-conditions';
 
 export const DecryptRequestDataSchema =
   MultipleAccessControlConditionsSchema.extend({
     ciphertext: z.string(),
     dataToEncryptHash: z.string(),
     authSig: AuthSigSchema,
     chain: z.string(),
+  }).transform((data) => {
+    const {
+      formattedAccessControlConditions,
+      formattedEVMContractConditions,
+      formattedSolRpcConditions,
+      formattedUnifiedAccessControlConditions,
+    }: FormattedMultipleAccs = getFormattedAccessControlConditions(data);
+
+    return {
+      ...data,
+      accessControlConditions: formattedAccessControlConditions,
+      evmContractConditions: formattedEVMContractConditions,
+      solRpcConditions: formattedSolRpcConditions,
+      unifiedAccessControlConditions: formattedUnifiedAccessControlConditions,
+    };
   });

packages/networks/src/storage/types.ts

@@ -1,4 +1,4 @@
-import { PKPInfo } from '@lit-protocol/types';
+import { PKPData } from '@lit-protocol/schemas';
 
 export interface PKPStorageProvider {
   readPKPTokens?(params: {
@@ -37,11 +37,11 @@ export interface PKPStorageProvider {
   readPKPs?(params: {
     authMethodType: number | bigint;
     authMethodId: string;
-  }): Promise<PKPInfo[] | null>;
+  }): Promise<PKPData[] | null>;
 
   writePKPs?(params: {
     authMethodType: number | bigint;
     authMethodId: string;
-    pkps: PKPInfo[];
+    pkps: PKPData[];
   }): Promise<void>;
 }

packages/schemas/src/lib/schemas.ts

@@ -218,14 +218,14 @@ export const JsonSchema: z.ZodType<Json> = z.lazy(() =>
 );
 
 export const HexSchema = z.string().regex(/^0x[0-9a-fA-F]+$/);
-export const ChainSchema = z.string();
+export const ChainSchema = z.string().default('ethereum');
 export const EvmChainSchema = z.enum(LIT_CHAINS_KEYS);
 
 export const ChainedSchema = z.object({
   /**
    * The chain name of the chain that will be used. See LIT_CHAINS for currently supported chains.
    */
-  chain: ChainSchema,
+  chain: ChainSchema.optional(),
 });
 
 export const PricedSchema = z.object({