v2 API for compressed account proofs by sergeytimoshin · Pull Request #10 · Lightprotocol/photon

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin · 2025-02-28T14:53:34Z

implement v2 API for compressed account proofs
refactored TreeAndQueue and tree heights helper

ananas-block · 2025-02-28T15:05:48Z

+ pub root_seq: u64,
+}
+
+impl MerkleProofWithContext {


can we add a unit test for this?

its the same original function written by helius https://github.com/Lightprotocol/photon/blob/main/src/ingester/persist/persisted_state_tree.rs#L335-L374

ananas-block · 2025-02-28T15:09:11Z

+ pub queue: SerializablePubkey,
+ pub root_seq: u64,
+ pub prove_by_index: bool,
+ pub tree_type: u16,


would it make sense to use the struct we defined for merkle_tree, queue, and tree_type?

Hm, depends on what's more convenient for the client @SwenSchaeferjohann wdyt?

Wrapped into context info
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L37
https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L36

ananas-block · 2025-02-28T15:11:22Z

+ ));
+ };
+
+ // Enrich with account data if available


doesn't the call fail if no data is available?

https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_compressed_account_proof/v2.rs#L77-L81

ananas-block · 2025-02-28T15:13:00Z

+ if let Some(account) = account_map.get(&value.hash.to_vec()) {
+ value.tree_type = account.tree_type as u16;
+ value.queue = SerializablePubkey::try_from(account.queue.clone())?;
+ }


shouldn't this fail if there is no account?

Added check https://github.com/Lightprotocol/photon/blob/sergey/photon-ref-tree-context/src/api/method/get_multiple_compressed_account_proofs/v2.rs#L94-L98

ananas-block · 2025-02-28T15:16:19Z

+#[derive(Debug, Clone)]
+pub struct TreeInfo {
+ pub tree: Pubkey,
+ pub queue: Pubkey,


can we add cpi_context here?

Sure, but it always None for now, we can add it later

* refactored TreeAndQueue and tree heights helpers

Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

…ueV2

…structure and update related parsing logic

…moving nested structure

sergeytimoshin changed the title * implement v2 API for compressed account proofsv2 API for compressed account proofsFeb 28, 2025

ananas-block reviewed Feb 28, 2025
View reviewed changes

Comment threadsrc/api/method/get_compressed_account_proof/v2.rs Outdated

ananas-block reviewed Feb 28, 2025
View reviewed changes

sergeytimoshinand others added 7 commits February 28, 2025 16:11

* implement v2 API for compressed account proofs
c423ece
* refactored TreeAndQueue and tree heights helpers

Update src/api/method/get_compressed_account_proof/v2.rs
97d57dd
Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

fix: add error handling for mismatched accounts and hashes in v2 API
f23ceeb

fix: add error handling for missing account in v2 API
90d162b

feat: integrate ContextInfo into GetCompressedAccountProofResponseVal…
62b3b9d
…ueV2

refactor: clean up imports in tx_event_parser.rs
d066125

refactor: remove debug print statement from leaf_node.rs
14dfd6d

sergeytimoshin force-pushed the sergey/photon-ref-tree-context branch from 4b9c802 to 14dfd6dCompare February 28, 2025 16:14

sergeytimoshin added 2 commits February 28, 2025 17:39

refactor: simplify GetMultipleCompressedAccountProofsResponseValueV2 …
d76e21e
…structure and update related parsing logic

refactor: simplify GetMultipleCompressedAccountProofsResponseV2 by re…
7296ab4
…moving nested structure

SwenSchaeferjohann approved these changes Feb 28, 2025
View reviewed changes

SwenSchaeferjohann merged commit 12cbda6 into jorrit/feat-add-testFeb 28, 2025