Skip to content

fix(target_chains/fuel): fuel merkle verification #1620

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 2 commits into from
May 28, 2024
Merged

fix(target_chains/fuel): fuel merkle verification #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e47b65c
fix(target_chains/fuel): fuel merkle verification
cctdaniel May 28, 2024
56c1207
fix pre-commit
cctdaniel May 28, 2024
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 target_chains/fuel/contracts/pyth-contract/src/data_structures/price.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ impl PriceFeed {
let (_, slice) = encoded_proof.split_at(current_offset);
let (encoded_message, _) = slice.split_at(message_size);
current_offset += message_size;
let end_offset = validate_proof(encoded_proof, encoded_message, current_offset, digest);
let end_offset = validate_proof(encoded_proof, current_offset, digest, encoded_message);
// Message type of 0 is a Price Feed
require(
encoded_message
Expand Down
10 changes: 5 additions & 5 deletions target_chains/fuel/contracts/pyth-contract/src/pyth_merkle_proof.sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ fn node_hash(child_a: Bytes, child_b: Bytes) -> Bytes {

pub fn validate_proof(
encoded_proof: Bytes,
leaf_data: Bytes,
ref mut proof_offset: u64,
root: Bytes,
leaf_data: Bytes,
Copy link
Contributor Author

@cctdaniel cctdaniel May 28, 2024

Choose a reason for hiding this comment

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

drive-by: standardizing it to be the same order as the solidity counterpart

) -> u64 {
let mut current_digest = leaf_hash(leaf_data);

Expand All @@ -51,14 +51,14 @@ pub fn validate_proof(
let (_, slice) = encoded_proof.split_at(proof_offset);
let (sibling_digest, _) = slice.split_at(20);
proof_offset += 20;

current_digest = node_hash(current_digest, sibling_digest);

i += 1;
}

// TODO: investigate failing require statement on the accumulator update path.
// require(current_digest == root, PythError::InvalidProof);
let current_digest_b256: b256 = current_digest.into();
let root_b256: b256 = root.into();

require(current_digest_b256 == root_b256, PythError::InvalidProof);

proof_offset
}