diff --git a/Cargo.lock b/Cargo.lock index 6084123..b435e1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3923,7 +3923,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-chains", "alloy-consensus", @@ -3943,7 +3943,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3961,7 +3961,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "proc-macro2", "quote", @@ -3971,7 +3971,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -3984,7 +3984,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3996,7 +3996,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4006,7 +4006,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -4017,7 +4017,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4033,7 +4033,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -4045,7 +4045,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4062,7 +4062,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4084,7 +4084,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4104,7 +4104,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-evm", "alloy-primitives", @@ -4117,7 +4117,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4133,7 +4133,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "once_cell", @@ -4158,7 +4158,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "derive_more", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -4208,7 +4208,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4233,7 +4233,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "reth-scroll-forks" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-chains", "alloy-primitives", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4294,7 +4294,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "reth-trie-common", @@ -4303,7 +4303,7 @@ dependencies = [ [[package]] name = "reth-stateless" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4329,7 +4329,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "derive_more", @@ -4340,7 +4340,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4362,7 +4362,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4378,7 +4378,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4400,7 +4400,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4432,7 +4432,7 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "zstd", ] @@ -4607,7 +4607,7 @@ dependencies = [ [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm#d6b77e226ce20646d0ddf3dfe3b1fb3ec8a58cc3" +source = "git+https://github.com/scroll-tech/scroll-revm#f5ae93d909f185461af8d0263b2549081e9781c8" dependencies = [ "auto_impl", "enumn", @@ -5064,7 +5064,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll-alloy-consensus" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5080,7 +5080,7 @@ dependencies = [ [[package]] name = "scroll-alloy-evm" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5098,7 +5098,7 @@ dependencies = [ [[package]] name = "scroll-alloy-hardforks" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-hardforks", "auto_impl", @@ -5108,7 +5108,7 @@ dependencies = [ [[package]] name = "scroll-alloy-network" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-network", @@ -5123,7 +5123,7 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" version = "1.8.2" -source = "git+https://github.com/scroll-tech/reth?branch=scroll#414c692ddbdeba21293eb9b132ecb5d281711b0e" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#12160d7862d894998c8490dbd65eec365432ecb2" dependencies = [ "alloy-consensus", "alloy-eips", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 9c87f5a..e8d4add 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -45,4 +45,4 @@ tracing-subscriber.workspace = true [features] default = ["dev"] dev = ["dep:tracing", "sbv/dev", "dep:tracing-subscriber"] -scroll = ["sbv/scroll", "sbv/scroll-compress-ratio"] +scroll = ["sbv/scroll", "sbv/scroll-compress-info"] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 45db9f0..76e677e 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -46,7 +46,7 @@ scroll = [ "sbv-primitives/scroll-chainspec", "sbv-primitives/scroll-reth-evm-types", ] -scroll-compress-ratio = ["sbv-primitives/scroll-compress-ratio"] +scroll-compress-info = ["sbv-primitives/scroll-compress-info"] dev = ["dep:tracing", "sbv-primitives/dev", "sbv-trie/dev"] # sp1 related diff --git a/crates/core/src/executor/scroll.rs b/crates/core/src/executor/scroll.rs index db8a5c8..4519d09 100644 --- a/crates/core/src/executor/scroll.rs +++ b/crates/core/src/executor/scroll.rs @@ -16,7 +16,7 @@ pub struct EvmExecutor<'a> { chain_spec: Arc, db: WitnessDatabase<'a>, block: &'a RecoveredBlock, - compression_ratios: Option>, + compression_infos: Option>, } impl<'a> EvmExecutor<'a> { @@ -25,13 +25,13 @@ impl<'a> EvmExecutor<'a> { chain_spec: Arc, db: WitnessDatabase<'a>, block: &'a RecoveredBlock, - compression_ratios: Option>, + compression_infos: Option>, ) -> Self { Self { chain_spec, db, block, - compression_ratios, + compression_infos, } } } @@ -62,13 +62,13 @@ impl EvmExecutor<'_> { ScrollBlockExecutor::new(evm, ctx, factory.spec(), factory.receipt_builder()); let result = cycle_track!( - match self.compression_ratios { + match self.compression_infos { None => { executor.execute_block(self.block.transactions_recovered()) } - Some(compression_ratios) => executor.execute_block_with_compression_cache( + Some(compression_infos) => executor.execute_block_with_compression_cache( self.block.transactions_recovered(), - compression_ratios, + compression_infos, ), }, "handle_block" diff --git a/crates/core/src/verifier/mod.rs b/crates/core/src/verifier/mod.rs index fb08ec1..796fcc2 100644 --- a/crates/core/src/verifier/mod.rs +++ b/crates/core/src/verifier/mod.rs @@ -44,7 +44,7 @@ pub struct VerifyResult { pub fn run( witnesses: &[BlockWitness], chain_spec: Arc, - #[cfg(feature = "scroll")] compression_ratios: Vec>, + #[cfg(feature = "scroll")] compression_infos: Vec>, ) -> Result { if witnesses.is_empty() { return Err(StatelessValidationError::Custom("empty witnesses")); @@ -95,21 +95,21 @@ pub fn run( let mut gas_used = 0; #[cfg(not(feature = "scroll"))] - let compression_ratios = std::iter::repeat::>(vec![]).take(blocks.len()); + let compression_infos = std::iter::repeat::>(vec![]).take(blocks.len()); #[cfg(not(feature = "scroll"))] let block_hashes = import_block_hashes(witnesses); #[cfg(feature = "scroll")] let block_hashes = Default::default(); - for (block, _compression_ratios) in blocks.iter().zip_eq(compression_ratios) { + for (block, _compression_infos) in blocks.iter().zip_eq(compression_infos) { let db = WitnessDatabase::new(&trie, &bytecode, &block_hashes); #[cfg(not(feature = "scroll"))] let executor = EvmExecutor::new(chain_spec.clone(), db, block); #[cfg(feature = "scroll")] - let executor = EvmExecutor::new(chain_spec.clone(), db, block, Some(_compression_ratios)); + let executor = EvmExecutor::new(chain_spec.clone(), db, block, Some(_compression_infos)); let output = executor .execute() diff --git a/crates/core/src/verifier/scroll.rs b/crates/core/src/verifier/scroll.rs index aaaa80d..3ef6b6c 100644 --- a/crates/core/src/verifier/scroll.rs +++ b/crates/core/src/verifier/scroll.rs @@ -30,11 +30,11 @@ pub fn run_host( witnesses: &[BlockWitness], chain_spec: Arc, ) -> Result { - let compression_ratios = witnesses + let compression_infos = witnesses .iter() - .map(|block| block.compression_ratios()) + .map(|block| block.compression_infos()) .collect::>(); - run(witnesses, chain_spec, compression_ratios) + run(witnesses, chain_spec, compression_infos) } /// Get the withdrawal trie root of scroll. diff --git a/crates/core/src/witness.rs b/crates/core/src/witness.rs index b59606f..443134f 100644 --- a/crates/core/src/witness.rs +++ b/crates/core/src/witness.rs @@ -42,19 +42,24 @@ impl BlockWitness { /// /// # Panics /// - /// Panics if called without the "scroll-compress-ratio" feature enabled, as this + /// Panics if called without the "scroll-compress-info" feature enabled, as this /// functionality is not intended to be used in guest environments. - pub fn compression_ratios(&self) -> Vec { - #[cfg(feature = "scroll-compress-ratio")] + pub fn compression_infos(&self) -> Vec<(U256, usize)> { + #[cfg(feature = "scroll-compress-info")] { - use sbv_primitives::types::consensus::Transaction; + use sbv_primitives::types::{consensus::Transaction, eips::Encodable2718}; self.transactions .iter() - .map(|tx| sbv_primitives::types::evm::compute_compression_ratio(&tx.input())) + .map(|tx| { + ( + sbv_primitives::types::evm::compute_compression_ratio(&tx.input()), + sbv_primitives::types::evm::compute_compressed_size(&tx.encoded_2718()), + ) + }) .collect() } - #[cfg(not(feature = "scroll-compress-ratio"))] + #[cfg(not(feature = "scroll-compress-info"))] { unimplemented!("you should not build ChunkWitness in guest?"); } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 446ad03..ef1a47e 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -85,7 +85,7 @@ scroll = [ "dep:scroll-alloy-rpc-types", "reth-scroll-primitives/serde", ] -scroll-compress-ratio = [ +scroll-compress-info = [ "scroll", "scroll-evm-types", "dep:scroll-alloy-evm", diff --git a/crates/primitives/src/types.rs b/crates/primitives/src/types.rs index 2a991e7..675140b 100644 --- a/crates/primitives/src/types.rs +++ b/crates/primitives/src/types.rs @@ -29,12 +29,13 @@ pub mod evm { pub use alloy_evm::precompiles; #[cfg(feature = "scroll-evm-types")] - pub use scroll_alloy_evm::{ - ScrollBlockExecutor, ScrollPrecompilesFactory, ScrollTxCompressionRatios, - }; + pub use scroll_alloy_evm::{ScrollBlockExecutor, ScrollPrecompilesFactory}; + + #[cfg(feature = "scroll-compress-info")] + pub use scroll_alloy_evm::{compute_compressed_size, compute_compression_ratio}; - #[cfg(feature = "scroll-compress-ratio")] - pub use scroll_alloy_evm::compute_compression_ratio; + #[cfg(any(feature = "scroll-evm-types", feature = "scroll-compress-info"))] + pub use scroll_alloy_evm::{ScrollTxCompressionInfo, ScrollTxCompressionInfos}; } /// re-export types from alloy_network diff --git a/crates/sbv/Cargo.toml b/crates/sbv/Cargo.toml index a439fc1..f5fb9ad 100644 --- a/crates/sbv/Cargo.toml +++ b/crates/sbv/Cargo.toml @@ -23,7 +23,7 @@ c-kzg = ["sbv-primitives/c-kzg"] kzg-rs = ["sbv-primitives/kzg-rs"] scroll = ["sbv-core/scroll", "sbv-primitives/scroll-all", "sbv-utils/scroll"] -scroll-compress-ratio = ["sbv-core/scroll-compress-ratio"] +scroll-compress-info = ["sbv-core/scroll-compress-info"] dev = ["sbv-core/dev", "sbv-primitives/dev", "sbv-trie/dev"] # sp1 related diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index c8d6898..2906e95 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -28,6 +28,6 @@ sbv-core.workspace = true [features] scroll = [ "sbv-primitives/scroll-network-types", - "sbv-primitives/scroll-compress-ratio", + "sbv-primitives/scroll-compress-info", "sbv-core/scroll", ]