Skip to content

fix: target indexes for placeholder proofs #705

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
merged 1 commit into from
Sep 10, 2025
Merged

fix: target indexes for placeholder proofs #705

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions crates/rbuilder/src/utils/receipts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ fn calculate_receipts_root_and_placeholder_proof_with_cache(
let root = trie.root_hash(true, &cache.empty_proof_store).unwrap();

let target_idx = receipts.len().checked_sub(1).unwrap();
let adjusted_idx = adjust_index_for_rlp(target_idx, receipts.len());
let nibbles = Nibbles::unpack(alloy_rlp::encode_fixed_size(&adjusted_idx));
let nibbles = Nibbles::unpack(alloy_rlp::encode_fixed_size(&target_idx));
let proof = trie.proof(&nibbles, &cache.empty_proof_store).unwrap();

(root, proof)
Expand Down Expand Up @@ -152,8 +151,7 @@ fn calculate_tx_root_and_placeholder_proof_with_cache(
let root = trie.root_hash(true, &cache.empty_proof_store).unwrap();

let target_idx = executed_tx_infos.len().checked_sub(1).unwrap();
let adjusted_idx = adjust_index_for_rlp(target_idx, executed_tx_infos.len());
let nibbles = Nibbles::unpack(alloy_rlp::encode_fixed_size(&adjusted_idx));
let nibbles = Nibbles::unpack(alloy_rlp::encode_fixed_size(&target_idx));
let proof = trie.proof(&nibbles, &cache.empty_proof_store).unwrap();

(root, proof)
Expand Down Expand Up @@ -181,8 +179,7 @@ fn calculate_tx_root_and_placeholder_proof_with_alloy(
pub fn ordered_trie_root_and_proof(items: &[Bytes], proof_index: usize) -> (B256, Vec<Bytes>) {
let items_len = items.len();

let adjusted_proof_index = adjust_index_for_rlp(proof_index, items_len);
let proof_target_encoded = alloy_rlp::encode_fixed_size(&adjusted_proof_index);
let proof_target_encoded = alloy_rlp::encode_fixed_size(&proof_index);
let proof_retainer = ProofRetainer::from_iter([Nibbles::unpack(&proof_target_encoded)]);

let mut hb = HashBuilder::default().with_proof_retainer(proof_retainer);
Expand Down
Loading