Skip to content
Merged
Changes from all commits
Commits
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
49 changes: 24 additions & 25 deletions sequencer/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,65 +33,64 @@ use crate::{
};

pub(crate) async fn compute_state_update(
state: &ValidatedState,
parent_state: &ValidatedState,
instance: &NodeState,
peers: &impl StateCatchup,
parent_leaf: &Leaf2,
proposed_leaf: &Leaf2,
) -> anyhow::Result<(ValidatedState, Delta)> {
let header = proposed_leaf.block_header();

let (state, delta, total_rewards_distributed) = parent_state
.apply_header(
instance,
peers,
parent_leaf,
header,
header.version(),
proposed_leaf.view_number(),
)
.await?;

// Check internal consistency.
let parent_header = parent_leaf.block_header();
ensure!(
state.chain_config.commit() == parent_header.chain_config().commit(),
"internal error! in-memory chain config {:?} does not match parent header {:?}",
state.chain_config.commit() == header.chain_config().commit(),
"internal error! in-memory chain config {:?} does not match header {:?}",
state.chain_config,
parent_header.chain_config(),
header.chain_config(),
);
ensure!(
state.block_merkle_tree.commitment() == parent_header.block_merkle_tree_root(),
"internal error! in-memory block tree {} does not match parent header {}",
state.block_merkle_tree.commitment() == header.block_merkle_tree_root(),
"internal error! in-memory block tree {} does not match header {}",
state.block_merkle_tree.commitment(),
parent_header.block_merkle_tree_root()
header.block_merkle_tree_root()
);
ensure!(
state.fee_merkle_tree.commitment() == parent_header.fee_merkle_tree_root(),
"internal error! in-memory fee tree {} does not match parent header {}",
state.fee_merkle_tree.commitment() == header.fee_merkle_tree_root(),
"internal error! in-memory fee tree {} does not match header {}",
state.fee_merkle_tree.commitment(),
parent_header.fee_merkle_tree_root()
header.fee_merkle_tree_root()
);

match parent_header.reward_merkle_tree_root() {
match header.reward_merkle_tree_root() {
Either::Left(v1_root) => {
ensure!(
state.reward_merkle_tree_v1.commitment() == v1_root,
"internal error! in-memory v1 reward tree {} does not match parent header {}",
"internal error! in-memory v1 reward tree {} does not match header {}",
state.reward_merkle_tree_v1.commitment(),
v1_root
)
},
Either::Right(v2_root) => {
ensure!(
state.reward_merkle_tree_v2.commitment() == v2_root,
"internal error! in-memory v2 reward tree {} does not match parent header {}",
"internal error! in-memory v2 reward tree {} does not match header {}",
state.reward_merkle_tree_v2.commitment(),
v2_root
)
},
}

let (state, delta, total_rewards_distributed) = state
.apply_header(
instance,
peers,
parent_leaf,
header,
header.version(),
proposed_leaf.view_number(),
)
.await?;

if header.version() >= DrbAndHeaderUpgradeVersion::version() {
let Some(actual_total) = total_rewards_distributed else {
bail!(
Expand Down