Skip to content

starknet_committer: extract metadata construction to a function #14000

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
ArielElp wants to merge 1 commit into
base: ariel/commit_or_load
Choose a base branch
from
+27 −15
Open

starknet_committer: extract metadata construction to a function #14000

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
42 changes: 27 additions & 15 deletions crates/apollo_committer/src/committer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,31 @@ enum CommitBlockHeightPlan {
CommitTip { state_diff_commitment: StateDiffCommitment },
}

fn commit_tip_metadata_bundle(
height: BlockNumber,
global_root: GlobalRoot,
state_diff_commitment: StateDiffCommitment,
) -> (HashMap<ForestMetadataType, DbValue>, BlockNumber) {
let next_offset = height.unchecked_next();
(
HashMap::from([
(
ForestMetadataType::CommitmentOffset,
DbValue(DbBlockNumber(next_offset).serialize().to_vec()),
),
(
ForestMetadataType::StateRoot(DbBlockNumber(height)),
serialize_felt_no_packing(global_root.0),
),
(
ForestMetadataType::StateDiffHash(DbBlockNumber(height)),
serialize_felt_no_packing(state_diff_commitment.0.0),
),
]),
next_offset,
)
}

/// Apollo committer. Maintains the Starknet state tries in persistent storage.
pub struct Committer<S: Storage, ForestDB>
where
Expand Down Expand Up @@ -223,21 +248,8 @@ where
block_measurements.start_measurement(Action::EndToEnd);
let CommitStateDiffOutput { filled_forest, global_root, deleted_nodes } =
self.commit_state_diff(state_diff, &mut block_measurements).await?;
let next_offset = height.unchecked_next();
let metadata = HashMap::from([
(
ForestMetadataType::CommitmentOffset,
DbValue(DbBlockNumber(next_offset).serialize().to_vec()),
),
(
ForestMetadataType::StateRoot(DbBlockNumber(height)),
serialize_felt_no_packing(global_root.0),
),
(
ForestMetadataType::StateDiffHash(DbBlockNumber(height)),
serialize_felt_no_packing(state_diff_commitment.0.0),
),
]);
let (metadata, next_offset) =
commit_tip_metadata_bundle(height, global_root, state_diff_commitment);
info!(
"For block number {height}, writing filled forest to storage with metadata: \
{metadata:?}, delete {} nodes",
Expand Down
Loading