chore: add memcp filter option to rpc, bump to photon 0.39.0 (#1043)

* bump 1

bump 0.7.0

* fix install-sh

* fix test spelling

* bump to 40

---------

Co-authored-by: Swen <swen.schaeferjohann@code.berlin>

Author: SwenSchaeferjohann

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightprotocol/zk-compression-cli",
-  "version": "0.5.1",
+  "version": "0.7.0",
   "description": "ZK Compression: Secure Scaling on Solana",
   "maintainers": [
     {

cli/src/utils/constants.ts

@@ -21,7 +21,7 @@ export const LIGHT_PROVER_PROCESS_NAME = "light-prover";
 export const INDEXER_PROCESS_NAME = "photon";
 export const FORESTER_PROCESS_NAME = "forester";
 
-export const PHOTON_VERSION = "0.38.0";
+export const PHOTON_VERSION = "0.40.0";
 
 export const LIGHT_PROTOCOL_PROGRAMS_DIR_ENV = "LIGHT_PROTOCOL_PROGRAMS_DIR";
 export const BASE_PATH = "../../bin/";

js/stateless.js/src/rpc-interface.ts

@@ -1,4 +1,4 @@
-import { PublicKey, DataSizeFilter, MemcmpFilter } from '@solana/web3.js';
+import { PublicKey, MemcmpFilter, DataSlice } from '@solana/web3.js';
 import {
     type as pick,
     number,
@@ -37,6 +37,13 @@ export interface LatestNonVotingSignatures {
     };
 }
 
+export interface GetCompressedAccountsByOwnerConfig {
+    filters?: GetCompressedAccountsFilter[];
+    dataSlice?: DataSlice;
+    cursor?: string;
+    limit?: BN;
+}
+
 export interface LatestNonVotingSignaturesPaginated {
     context: { slot: number };
     value: {
@@ -107,14 +114,17 @@ export interface GetCompressedTokenAccountsByOwnerOrDelegateOptions {
     limit?: BN;
 }
 
-export type GetCompressedAccountsFilter = MemcmpFilter | DataSizeFilter;
+/**
+ * Note, DataSizeFilter is currently not available.
+ */
+export type GetCompressedAccountsFilter = MemcmpFilter; // | DataSizeFilter;
 
 export type GetCompressedAccountConfig = {
     encoding?: string;
 };
 
 export type GetCompressedAccountsConfig = {
-    encoding?: string;
+    dataSlice: DataSlice;
     filters?: GetCompressedAccountsFilter[];
 };
 
@@ -131,6 +141,7 @@ export type WithContext<T> = {
     /** response value */
     value: T;
 };
+
 export type WithCursor<T> = {
     /** context */
     cursor: string | null;
@@ -493,6 +504,7 @@ export interface CompressionApiInterface {
 
     getCompressedAccountsByOwner(
         owner: PublicKey,
+        config?: GetCompressedAccountsByOwnerConfig,
     ): Promise<WithCursor<CompressedAccountWithMerkleContext[]>>;
 
     getCompressedTokenAccountsByOwner(

js/stateless.js/src/rpc.ts

@@ -35,6 +35,7 @@ import {
     LatestNonVotingSignaturesResultPaginated,
     LatestNonVotingSignaturesPaginated,
     WithContext,
+    GetCompressedAccountsByOwnerConfig,
     WithCursor,
 } from './rpc-interface';
 import {
@@ -663,17 +664,25 @@ export class Rpc extends Connection implements CompressionApiInterface {
      */
     async getCompressedAccountsByOwner(
         owner: PublicKey,
+        config?: GetCompressedAccountsByOwnerConfig,
     ): Promise<WithCursor<CompressedAccountWithMerkleContext[]>> {
         const unsafeRes = await rpcRequest(
             this.compressionApiEndpoint,
             'getCompressedAccountsByOwner',
-            { owner: owner.toBase58() },
+            {
+                owner: owner.toBase58(),
+                filters: config?.filters || [],
+                dataSlice: config?.dataSlice,
+                cursor: config?.cursor,
+                limit: config?.limit?.toNumber(),
+            },
         );
 
         const res = create(
             unsafeRes,
             jsonRpcResultAndContext(CompressedAccountsByOwnerResult),
         );
+
         if ('error' in res) {
             throw new SolanaJSONRPCError(
                 res.error,

js/stateless.js/src/test-helpers/test-rpc/test-rpc.ts

@@ -16,6 +16,7 @@ import { getParsedEvents } from './get-parsed-events';
 import { defaultTestStateTreeAccounts } from '../../constants';
 import {
     CompressedTransaction,
+    GetCompressedAccountsByOwnerConfig,
     LatestNonVotingSignatures,
     LatestNonVotingSignaturesPaginated,
     SignatureWithMetadata,
@@ -334,7 +335,14 @@ export class TestRpc extends Connection implements CompressionApiInterface {
      */
     async getCompressedAccountsByOwner(
         owner: PublicKey,
+        _config?: GetCompressedAccountsByOwnerConfig,
     ): Promise<WithCursor<CompressedAccountWithMerkleContext[]>> {
+        if (_config) {
+            throw new Error(
+                'dataSlice or filters are not supported in test-rpc. Please use rpc.ts instead.',
+            );
+        }
+
         const accounts = await getCompressedAccountsByOwnerTest(this, owner);
         return {
             items: accounts,

js/stateless.js/tests/e2e/rpc-interop.test.ts

@@ -40,6 +40,25 @@ describe('rpc-interop', () => {
     const transferAmount = 1e4;
     const numberOfTransfers = 15;
 
+    it('getCompressedAccountsByOwner [noforester] filter should work', async () => {
+        let accs = await rpc.getCompressedAccountsByOwner(payer.publicKey, {
+            filters: [
+                {
+                    memcmp: {
+                        offset: 1,
+                        bytes: '5Vf',
+                    },
+                },
+            ],
+        });
+        assert.equal(accs.items.length, 0);
+
+        accs = await rpc.getCompressedAccountsByOwner(payer.publicKey, {
+            dataSlice: { offset: 1, length: 2 },
+        });
+
+        assert.equal(accs.items.length, 1);
+    });
     it('getValidityProof [noforester] (inclusion) should match', async () => {
         const senderAccounts = await rpc.getCompressedAccountsByOwner(
             payer.publicKey,

pnpm-lock.yaml

@@ -13,7 +13,7 @@ VERSIONS=(
     "solana:1.18.17"
     "anchor:anchor-v0.29.0"
     "jq:jq-1.7.1"
-    "photon:0.38.0"
+    "photon:0.40.0"
 )
 
 # Architecture-specific suffixes