feat: regenerate photon-api crate & v2 proof handling (#1753)

* feat: regenerate photon-api crate

* refactor: remove debug print statement from get_validity_proof_v2

* feat: enable indexer in LightValidatorConfig for address tree initialization

* refactor: disable adjust address root index calculation in types.rs

* feat: update photon dependency to a newer commit

* rename AddressSeq to AddressQueueIndex and update related references

* refactor: implement Display trait for AccountState and update formatting

* rename: change AddressSeq to AddressQueueIndex and update module references

* refactor: change nullifier_queue_index and tree_type to u16 in AccountContext

Author: sergeytimoshin

forester/Cargo.toml

@@ -20,7 +20,7 @@ light-merkle-tree-reference = { workspace = true }
 light-registry = { workspace = true }
 photon-api = { workspace = true }
 forester-utils = { workspace = true }
-light-client = { workspace = true }
+light-client = { workspace = true, features = ["v2"] }
 light-merkle-tree-metadata = { workspace = true }
 light-sdk = { workspace = true, features = ["anchor"] }
 light-program-test = { workspace = true }

forester/tests/address_v2_test.rs

@@ -25,7 +25,7 @@ use light_compressed_account::{
     },
 };
 use light_compressed_token::process_transfer::transfer_sdk::to_account_metas;
-use light_program_test::{accounts::test_accounts::TestAccounts, indexer::TestIndexer, Indexer};
+use light_program_test::{accounts::test_accounts::TestAccounts, Indexer};
 use light_prover_client::gnark::helpers::{LightValidatorConfig, ProverConfig};
 use light_test_utils::create_address_test_program_sdk::{
     create_pda_instruction, CreateCompressedPdaInstructionInputs,
@@ -289,11 +289,12 @@ async fn create_v2_addresses<R: RpcConnection + MerkleTreeExt + Indexer>(
             tree: *batch_address_merkle_tree,
         })
         .collect::<Vec<_>>();
-    let test_indexer = TestIndexer::init_from_acounts(rpc.get_payer(), env, 50).await;
-    let proof_result = test_indexer
+
+    let proof_result = rpc
         .get_validity_proof_v2(Vec::new(), address_with_trees)
         .await
         .unwrap();
+
     if num_addresses == 1 {
         let data: [u8; 31] = [1; 31];
         let new_address_params = NewAddressParams {
@@ -303,13 +304,11 @@ async fn create_v2_addresses<R: RpcConnection + MerkleTreeExt + Indexer>(
             address_merkle_tree_root_index: proof_result.address_root_indices[0],
         };
 
-        let proof = proof_result.proof;
-
         let create_ix_inputs = CreateCompressedPdaInstructionInputs {
             data,
             signer: &payer.pubkey(),
             output_compressed_account_merkle_tree_pubkey: &env.v1_state_trees[0].merkle_tree,
-            proof: &proof.unwrap(),
+            proof: &proof_result.proof.unwrap(),
             new_address_params,
             registered_program_pda,
         };

scripts/install.sh

@@ -102,7 +102,7 @@ install_rust() {
         export PATH="${PREFIX}/cargo/bin:${PATH}"
         rustup component add --toolchain 1.83-x86_64-unknown-linux-gnu clippy
         cargo install cargo-expand --locked
-        cargo install --git https://github.com/Lightprotocol/photon.git --rev edff82c5cb7fd891b5ab62faed9126594c97d90b --locked
+        cargo install --git https://github.com/Lightprotocol/photon.git --rev 41ac9d0e3607a820ef1dbf4312b288992f792864 --locked
         log "rust"
     fi
 }

sdk-libs/client/src/indexer/photon_indexer.rs

@@ -776,14 +776,13 @@ impl Indexer for PhotonIndexer {
                     }),
                     ..Default::default()
                 };
-
                 let result = photon_api::apis::default_api::get_validity_proof_v2_post(
                     &self.configuration,
                     request,
                 )
                 .await?;
                 let result = Self::extract_result("get_validity_proof_v2", result.result)?;
-                super::types::ProofRpcResultV2::from_api_model(*result.value, hashes.len())
+                super::types::ProofRpcResultV2::from_api_model(*result.value)
             })
             .await
         }

sdk-libs/client/src/indexer/types.rs

@@ -109,7 +109,7 @@ impl ProofRpcResult {
 #[derive(Debug, Default, Clone)]
 pub struct ProofRpcResultV2 {
     pub proof: Option<CompressedProof>,
-    // If none -> proof by index  and not included in zkp, else included in zkp
+    // If none -> proof by index and not included in zkp, else included in zkp
     pub root_indices: Vec<Option<u16>>,
     pub address_root_indices: Vec<u16>,
 }
@@ -118,7 +118,6 @@ pub struct ProofRpcResultV2 {
 impl ProofRpcResultV2 {
     pub fn from_api_model(
         value: photon_api::models::CompressedProofWithContextV2,
-        num_hashes: usize,
     ) -> Result<Self, IndexerError> {
         let proof = if let Some(proof) = value.compressed_proof {
             let proof = CompressedProof {
@@ -142,17 +141,19 @@ impl ProofRpcResultV2 {
 
         Ok(Self {
             proof,
-            root_indices: value.root_indices[..num_hashes]
+            root_indices: value
+                .accounts
                 .iter()
                 .map(|x| {
-                    if x.prove_by_index {
+                    if x.root_index.prove_by_index {
                         None
                     } else {
-                        Some(x.root_index)
+                        Some(x.root_index.root_index as u16)
                     }
                 })
                 .collect::<Vec<Option<u16>>>(),
-            address_root_indices: value.root_indices[num_hashes..]
+            address_root_indices: value
+                .addresses
                 .iter()
                 .map(|x| x.root_index)
                 .collect::<Vec<u16>>(),