Revert "only increment deposit index on state for old deposit flow"

This reverts commit 817d4235ae.
This commit is contained in:
realbigsean
2024-05-11 05:00:47 -04:00
parent 817d4235ae
commit 5f09453287
7 changed files with 13 additions and 43 deletions

View File

@@ -171,9 +171,7 @@ impl<E: EthSpec> Operation<E> for Deposit {
spec: &ChainSpec,
_: &Operations<E, Self>,
) -> Result<(), BlockProcessingError> {
let res = process_deposits(state, &[self.clone()], spec);
dbg!(serde_json::to_string(state).unwrap());
res
process_deposits(state, &[self.clone()], spec)
}
}

View File

@@ -60,9 +60,6 @@ impl<E: EthSpec> Case for SanityBlocks<E> {
}
fn result(&self, _case_index: usize, fork_name: ForkName) -> Result<(), Error> {
if _case_index != 74 || fork_name != ForkName::Electra {
return Ok(());
}
self.metadata.bls_setting.unwrap_or_default().check()?;
let mut bulk_state = self.pre.clone();
@@ -114,15 +111,13 @@ impl<E: EthSpec> Case for SanityBlocks<E> {
spec,
)?;
// if block.state_root() == bulk_state.update_tree_hash_cache().unwrap()
// && block.state_root() == indiv_state.update_tree_hash_cache().unwrap()
// {
// Ok(())
// } else {
// Err(BlockProcessingError::StateRootMismatch)
// }
Ok::<_, BlockProcessingError>(())
if block.state_root() == bulk_state.update_tree_hash_cache().unwrap()
&& block.state_root() == indiv_state.update_tree_hash_cache().unwrap()
{
Ok(())
} else {
Err(BlockProcessingError::StateRootMismatch)
}
})
.map(|_| (bulk_state, indiv_state));