Skip to content

Commit 45bc552

Browse files
authored
Merge pull request #146 from scroll-tech/chore/bump-reth-yet-again
feat: bump `reth`, `revm-scroll` and related changes
2 parents f1e2645 + 49fc310 commit 45bc552

File tree

11 files changed

+73
-67
lines changed

11 files changed

+73
-67
lines changed

Cargo.lock

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/bin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ tracing-subscriber.workspace = true
4545
[features]
4646
default = ["dev"]
4747
dev = ["dep:tracing", "sbv/dev", "dep:tracing-subscriber"]
48-
scroll = ["sbv/scroll", "sbv/scroll-compress-ratio"]
48+
scroll = ["sbv/scroll", "sbv/scroll-compress-info"]

crates/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ scroll = [
4646
"sbv-primitives/scroll-chainspec",
4747
"sbv-primitives/scroll-reth-evm-types",
4848
]
49-
scroll-compress-ratio = ["sbv-primitives/scroll-compress-ratio"]
49+
scroll-compress-info = ["sbv-primitives/scroll-compress-info"]
5050
dev = ["dep:tracing", "sbv-primitives/dev", "sbv-trie/dev"]
5151

5252
# sp1 related

crates/core/src/executor/scroll.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct EvmExecutor<'a> {
1616
chain_spec: Arc<ChainSpec>,
1717
db: WitnessDatabase<'a>,
1818
block: &'a RecoveredBlock<Block>,
19-
compression_ratios: Option<Vec<U256>>,
19+
compression_infos: Option<Vec<(U256, usize)>>,
2020
}
2121

2222
impl<'a> EvmExecutor<'a> {
@@ -25,13 +25,13 @@ impl<'a> EvmExecutor<'a> {
2525
chain_spec: Arc<ChainSpec>,
2626
db: WitnessDatabase<'a>,
2727
block: &'a RecoveredBlock<Block>,
28-
compression_ratios: Option<Vec<U256>>,
28+
compression_infos: Option<Vec<(U256, usize)>>,
2929
) -> Self {
3030
Self {
3131
chain_spec,
3232
db,
3333
block,
34-
compression_ratios,
34+
compression_infos,
3535
}
3636
}
3737
}
@@ -62,13 +62,13 @@ impl EvmExecutor<'_> {
6262
ScrollBlockExecutor::new(evm, ctx, factory.spec(), factory.receipt_builder());
6363

6464
let result = cycle_track!(
65-
match self.compression_ratios {
65+
match self.compression_infos {
6666
None => {
6767
executor.execute_block(self.block.transactions_recovered())
6868
}
69-
Some(compression_ratios) => executor.execute_block_with_compression_cache(
69+
Some(compression_infos) => executor.execute_block_with_compression_cache(
7070
self.block.transactions_recovered(),
71-
compression_ratios,
71+
compression_infos,
7272
),
7373
},
7474
"handle_block"

0 commit comments

Comments
 (0)