Skip to content

refactor: move overflow check #19175

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

Open
iAmMichaelConnor wants to merge 1 commit into
base: next
Choose a base branch
from
+9 −19
Open

refactor: move overflow check #19175

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
"ierc",
"IGSE",
"incentivized",
"incrementation",
"indexeddb",
"interruptible",
"IPFS",
Expand Down
18 changes: 0 additions & 18 deletions ...uits/crates/rollup-lib/src/checkpoint_root/components/checkpoint_root_inputs_validator.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ impl<let NumPreviousRollups: u32, let NumVkIndices: u32> CheckpointRootInputsVal
}

self.validate_start_states();

self.validate_end_states();
}

fn validate_previous_rollup_proofs_and_vks(self) {
Expand Down Expand Up @@ -114,20 +112,4 @@ impl<let NumPreviousRollups: u32, let NumVkIndices: u32> CheckpointRootInputsVal
"Hash of the previous block header is not the last leaf in the archive tree",
);
}

fn validate_end_states(self) {
let end_sponge_blob =
self.previous_rollups[NumPreviousRollups - 1].public_inputs.end_sponge_blob;

// Check that the number of absorbed blob fields is not larger than the maximum number of fields allowed.
// Note: It must not equal the max allowed number because an additional checkpoint end marker will be absorbed
// in `checkpoint_rollup_public_inputs_composer`.
assert(
end_sponge_blob.num_absorbed_fields < FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT,
"Attempted to overfill blobs",
);

// The `end_sponge_blob` is validated against the injected blob fields in
// `checkpoint_rollup_public_inputs_composer.nr`, after the checkpoint end marker is absorbed.
}
}
9 changes: 8 additions & 1 deletion noir-projects/noir-protocol-circuits/crates/types/src/blob_data/sponge_blob.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,15 @@ impl SpongeBlob {
}

pub fn absorb_checkpoint_end_marker(&mut self) {
// If you ever increase the size of an `end_marker` beyond 1 Field, you need to adjust this
// incrementation accordingly:
self.num_absorbed_fields += 1;
let end_marker = create_checkpoint_end_marker(self.num_absorbed_fields);
// Check that the number of absorbed blob fields is not larger than the maximum number of fields allowed.
assert(
self.num_absorbed_fields <= FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT,
"Attempted to overfill blobs",
);
let end_marker: Field = create_checkpoint_end_marker(self.num_absorbed_fields);
self.sponge.absorb(end_marker);
}

Expand Down