Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion common/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime/debug"
)

var tag = "v4.5.32"
var tag = "v4.5.33"

var commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
Expand Down
30 changes: 21 additions & 9 deletions crates/l2geth/src/rpc_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ impl ChunkInterpreter for RpcClient<'_> {
.ok_or_else(|| eyre::eyre!("Block {block_hash} not found"))?;

let number = block.header.number;
let parent_hash = block.header.parent_hash;
if number == 0 {
eyre::bail!("no number in header or use block 0");
}
Expand All @@ -120,16 +121,27 @@ impl ChunkInterpreter for RpcClient<'_> {
.chain_id(chain_id)
.execution_witness(provider.debug_execution_witness(number.into()).await?);

if let Some(witness) = prev_witness {
if witness.header.number != number - 1 {
eyre::bail!(
"the ref witness is not the previous block, expected {} get {}",
number - 1,
witness.header.number,
);
let prev_state_root = match prev_witness {
Some(witness) => {
if witness.header.number != number - 1 {
eyre::bail!(
"the ref witness is not the previous block, expected {} get {}",
number - 1,
witness.header.number,
);
}
witness.header.state_root
}
witness_builder = witness_builder.prev_state_root(witness.header.state_root);
}
None => {
let parent_block = provider
.get_block_by_hash(parent_hash)
.await?
.expect("parent block should exist");

parent_block.header.state_root
}
};
witness_builder = witness_builder.prev_state_root(prev_state_root);

Ok(witness_builder.build()?)
}
Expand Down