feat: add v2 endpoints and update response schemas for compressed accounts and transactions

Author: sergeytimoshin

src/api/api.rs

@@ -482,7 +482,7 @@ impl PhotonApi {
             OpenApiSpec {
                 name: "getValidityProofV2".to_string(),
                 request: Some(GetValidityProofRequestDocumentation::schema().1),
-                response: GetValidityProofResponse::schema().1,
+                response: GetValidityProofResponseV2::schema().1,
             },
             OpenApiSpec {
                 name: "getCompressionSignaturesForAccount".to_string(),

src/api/method/get_validity_proof/common.rs

@@ -88,7 +88,7 @@ impl From<GetValidityProofResponse> for GetValidityProofResponseV2 {
             value: CompressedProofWithContextV2 {
                 compressedProof: response.value.compressedProof,
                 roots: response.value.roots,
-                rootIndices: response.value.rootIndices.into_iter().map(Some).collect(),
+                rootIndices: response.value.rootIndices.into_iter().map(|x| RootIndex { root_index: x, in_tree: true}).collect(),
                 leafIndices: response.value.leafIndices,
                 leaves: response.value.leaves,
                 merkleTrees: response.value.merkleTrees,
@@ -191,13 +191,45 @@ pub struct CompressedProofWithContext {
     pub merkleTrees: Vec<String>,
 }
 
+#[derive(Serialize, Deserialize, ToSchema, Debug, Default)]
+#[serde(rename_all = "camelCase")]
+#[allow(non_snake_case)]
+pub struct RootIndex {
+    pub root_index: u64,
+    pub in_tree: bool,
+}
+
+impl From<RootIndex> for Option<u64> {
+    fn from(val: RootIndex) -> Option<u64> {
+        match val.in_tree {
+            true => Some(val.root_index),
+            false => None,
+        }
+    }
+}
+
+impl From<Option<u64>> for RootIndex {
+    fn from(val: Option<u64>) -> RootIndex {
+        match val {
+            Some(root_index) => RootIndex {
+                root_index,
+                in_tree: true,
+            },
+            None => RootIndex {
+                root_index: 0,
+                in_tree: false,
+            },
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, ToSchema, Debug, Default)]
 #[serde(rename_all = "camelCase")]
 #[allow(non_snake_case)]
 pub struct CompressedProofWithContextV2 {
     pub compressedProof: CompressedProof,
     pub roots: Vec<String>,
-    pub rootIndices: Vec<Option<u64>>,
+    pub rootIndices: Vec<RootIndex>,
     pub leafIndices: Vec<u32>,
     pub leaves: Vec<String>,
     pub merkleTrees: Vec<String>,

src/api/method/get_validity_proof/mod.rs

@@ -3,7 +3,7 @@ mod v1;
 mod v2;
 
 pub use common::{
-    CompressedProof, CompressedProofWithContext, GetValidityProofRequest,
+    CompressedProof, CompressedProofWithContext, CompressedProofWithContextV2, RootIndex, GetValidityProofRequest,
     GetValidityProofRequestDocumentation, GetValidityProofResponse, GetValidityProofResponseV2,
 };
 pub use v1::get_validity_proof;

src/api/method/get_validity_proof/v2.rs

@@ -92,7 +92,7 @@ pub async fn get_validity_proof_v2(
                 .to_string(),
         );
         // proof by index has no root.
-        v2_response.value.rootIndices.insert(index, None);
+        v2_response.value.rootIndices.insert(index, None.into());
         v2_response.value.roots.insert(index, "".to_string());
     }
     Ok(v2_response)

src/ingester/persist/leaf_node_proof.rs

@@ -5,7 +5,7 @@ use crate::dao::generated::state_trees;
 use crate::ingester::persist::get_tree_height;
 use crate::ingester::persist::leaf_node::{leaf_index_to_node_index, LeafNode};
 use crate::ingester::persist::persisted_state_tree::{
-    get_proof_nodes, get_proof_path, validate_proof, MerkleProofWithContext, ZERO_BYTES,
+    get_proof_nodes, get_proof_path, MerkleProofWithContext, ZERO_BYTES,
 };
 use sea_orm::QueryFilter;
 use sea_orm::{ColumnTrait, DatabaseTransaction, EntityTrait};

src/openapi/mod.rs

@@ -19,8 +19,7 @@ use crate::api::method::get_multiple_new_address_proofs::AddressWithTree;
 use crate::api::method::get_multiple_new_address_proofs::MerkleContextWithNewAddressProof;
 use crate::api::method::get_queue_elements::MerkleProofWithContextV2;
 use crate::api::method::get_transaction_with_compression_info::AccountWithOptionalTokenData;
-use crate::api::method::get_validity_proof::CompressedProof;
-use crate::api::method::get_validity_proof::CompressedProofWithContext;
+use crate::api::method::get_validity_proof::{CompressedProof, CompressedProofWithContext, CompressedProofWithContextV2, RootIndex};
 use crate::api::method::utils::Context;
 use crate::api::method::utils::Limit;
 use crate::api::method::utils::PaginatedSignatureInfoList;
@@ -105,6 +104,8 @@ const JSON_CONTENT_TYPE: &str = "application/json";
     UnsignedInteger,
     CompressedProof,
     CompressedProofWithContext,
+    CompressedProofWithContextV2,
+    RootIndex,
     MerkleContextWithNewAddressProof,
     SignatureInfoListWithError,
     SignatureInfoWithError,