Skip to content

fix: batched address tree init assert tree and queue index are the same #2318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ananas-block merged 5 commits into from
Mar 2, 2026
Merged

fix: batched address tree init assert tree and queue index are the same #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad0d643
fix: batched address tree init assert tree and queue index are the same
ananas-block Feb 28, 2026
0a67ddd
fix: add cpi ix data address queue index assignment
ananas-block Mar 1, 2026
d8620fe
fix
ananas-block Mar 1, 2026
e11fb25
fix tests
ananas-block Mar 1, 2026
a0783bd
fix lint
ananas-block Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion program-libs/compressed-account/src/instruction_data/zero_copy_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ impl ZNewAddressParamsAssignedPackedMut<'_> {
) {
self.seed = seed;
self.address_merkle_tree_root_index = address_merkle_tree_root_index;
self.address_queue_account_index = 0; // always 0 for v2 address trees.
self.address_queue_account_index = address_merkle_tree_account_index;
if let Some(assigned_account_index) = assigned_account_index {
self.assigned_account_index = assigned_account_index;
self.assigned_to_account = 1; // set to true
Expand Down
14 changes: 7 additions & 7 deletions program-libs/compressed-account/tests/zero_copy_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ fn test_new_address_set_success_with_assigned_account() {
assert_eq!(z_new_address.assigned_account_index, 7);
assert_eq!(z_new_address.address_merkle_tree_account_index, 10);
assert_eq!(z_new_address.assigned_to_account, 1);
assert_eq!(z_new_address.address_queue_account_index, 0); // Invariant: always 0
assert_eq!(z_new_address.address_queue_account_index, 10);
}

#[test]
Expand Down Expand Up @@ -567,7 +567,7 @@ fn test_new_address_set_success_without_assigned_account() {
assert_eq!(z_new_address.assigned_account_index, 0);
assert_eq!(z_new_address.address_merkle_tree_account_index, 10);
assert_eq!(z_new_address.assigned_to_account, 0);
assert_eq!(z_new_address.address_queue_account_index, 0); // Invariant: always 0
assert_eq!(z_new_address.address_queue_account_index, 10);
}

#[test]
Expand All @@ -580,16 +580,16 @@ fn test_new_address_set_invariant_address_queue_account_index() {
NewAddressParamsAssignedPacked::zero_copy_at_mut(&mut data).unwrap();

// Execute multiple times with different inputs
// Invariant: address_queue_account_index == address_merkle_tree_account_index
// for v2 batched address trees (queue is embedded in the tree account).
z_new_address.set([1u8; 32], U16::new(100), Some(5), 10);
assert_eq!(z_new_address.address_queue_account_index, 0);
assert_eq!(z_new_address.address_queue_account_index, 10);

z_new_address.set([2u8; 32], U16::new(200), None, 20);
assert_eq!(z_new_address.address_queue_account_index, 0);
assert_eq!(z_new_address.address_queue_account_index, 20);

z_new_address.set([3u8; 32], U16::new(300), Some(50), 30);
assert_eq!(z_new_address.address_queue_account_index, 0);

// Assert invariant: address_queue_account_index always 0 for v2 address trees
assert_eq!(z_new_address.address_queue_account_index, 30);
}

// =============================================================================
Expand Down
14 changes: 13 additions & 1 deletion programs/system/src/processor/create_address_cpi_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@ pub fn derive_new_addresses<'info, 'a, 'b: 'a, const ADDRESS_ASSIGNMENT: bool>(
Err(SystemProgramError::DeriveAddressError)
}?;

cpi_ix_data.addresses[i].tree_index = context.get_index_or_insert(
let tree_index = context.get_index_or_insert(
new_address_params.address_merkle_tree_account_index(),
remaining_accounts,
"V2 address tree",
)?;
cpi_ix_data.addresses[i].tree_index = tree_index;
cpi_ix_data.addresses[i].queue_index = tree_index;

context.set_address_fee(
tree.metadata.rollover_metadata.network_fee,
Expand All @@ -83,6 +85,16 @@ pub fn derive_new_addresses<'info, 'a, 'b: 'a, const ADDRESS_ASSIGNMENT: bool>(
tree.queue_batches.next_index,
);

// For batched address trees the queue is embedded in the tree
// account so both indices must point to the same account.
if new_address_params.address_queue_index()
Copy link
Contributor

@SwenSchaeferjohann SwenSchaeferjohann Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we explicitly set it in line 74 and 75, does that make this check redundant?

Copy link
Contributor Author

@ananas-block ananas-block Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check addresses system program instruction data. The assignment is account compression program cpi instruction data. It's a safeguard in case that we are using the indices in other functions.

!= new_address_params.address_merkle_tree_account_index()
{
return Err(ProgramError::from(
SystemProgramError::AddressMerkleTreeAccountDiscriminatorMismatch,
));
}

(
derive_address(
&new_address_params.seed(),
Expand Down
2 changes: 1 addition & 1 deletion sdk-tests/csdk-anchor-full-derived-test/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3863,7 +3863,7 @@ async fn test_d9_edge_many_literals() {
#[tokio::test]
async fn test_d9_edge_mixed() {
use csdk_anchor_full_derived_test::d9_seeds::{
edge_cases::{AB, SEED_123, _UNDERSCORE_CONST},
edge_cases::{_UNDERSCORE_CONST, AB, SEED_123},
D9EdgeMixedParams,
};

Expand Down