Skip to content
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

Jump to bottom

fix: handle contract commitments for contract without data items #388

Merged
merged 5 commits into from
Oct 2, 2024
Merged

fix: handle contract commitments for contract without data items #388

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71b6c09
fix: handle contract commitments for contract without data items
whichqua Sep 27, 2024
048752e
Merge branch 'gm/no-possible-convertion' into gm/internal-error-tree-…
whichqua Sep 27, 2024
b5d131d
Merge branch 'gm/no-possible-convertion' into gm/internal-error-tree-…
whichqua Oct 1, 2024
483967d
Merge branch 'gm/no-possible-convertion' into gm/internal-error-tree-…
whichqua Oct 2, 2024
93f97e2
fix: only one commitment return
whichqua Oct 2, 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
28 changes: 16 additions & 12 deletions crates/bin/prove_block/src/reexecute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,26 @@ pub(crate) fn format_commitment_facts<H: HashFunctionType>(

impl PerContractStorage for ProverPerContractStorage {
async fn compute_commitment(&mut self) -> Result<CommitmentInfo, CommitmentInfoError> {
// TODO: error code
let contract_data =
self.storage_proof.contract_data.as_ref().expect("storage proof should have a contract_data field");
let updated_root = contract_data.root;

let commitment_facts = format_commitment_facts::<PedersenHash>(&contract_data.storage_proofs);
let (updated_root, commitment_facts) = match self.storage_proof.contract_data.as_ref() {
Some(contract_data) => {
let updated_root = contract_data.root;
let commitment_facts = format_commitment_facts::<PedersenHash>(&contract_data.storage_proofs);

let previous_commitment_facts = match &self.previous_storage_proof.contract_data {
None => HashMap::default(),
Some(previous_contract_data) => {
format_commitment_facts::<PedersenHash>(&previous_contract_data.storage_proofs)
}
};

let previous_commitment_facts = match &self.previous_storage_proof.contract_data {
None => HashMap::default(),
Some(previous_contract_data) => {
format_commitment_facts::<PedersenHash>(&previous_contract_data.storage_proofs)
let commitment_facts =
commitment_facts.into_iter().chain(previous_commitment_facts.into_iter()).collect();
(updated_root, commitment_facts)
}
// Defaults when no contract data is available
None => (Felt252::ZERO, HashMap::default()),
};

let commitment_facts = commitment_facts.into_iter().chain(previous_commitment_facts.into_iter()).collect();

Ok(CommitmentInfo {
previous_root: self.previous_tree_root,
updated_root,
Expand Down
Loading