diff --git a/Cargo.lock b/Cargo.lock index 452b1f18..5c694c0a 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" dependencies = [ "zstd", ] @@ -4607,7 +4607,7 @@ dependencies = [ [[package]] name = "revm-scroll" version = "0.1.0" -source = "git+https://github.com/scroll-tech/scroll-revm#307f050ebe267492c483570356cc44990df42acf" +source = "git+https://github.com/scroll-tech/scroll-revm#d6b77e226ce20646d0ddf3dfe3b1fb3ec8a58cc3" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" 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#32019bcde9d08524caad5b359b693e8f0c3951b8" +source = "git+https://github.com/scroll-tech/reth?branch=scroll#5edac541f81be7271d6e0b74a8f13f74e9facbb9" dependencies = [ "alloy-consensus", "alloy-eips", diff --git a/crates/bin/README.md b/crates/bin/README.md index e9dce03f..29391824 100644 --- a/crates/bin/README.md +++ b/crates/bin/README.md @@ -45,17 +45,17 @@ Options: -h, --help Print help ``` -e.g. verify `./testdata/scroll_witness/euclid_v2/*.json` files. -``` -> $ ./target/release/sbv-cli run file ./testdata/scroll_witness/euclid_v2/*.json -2025-03-31T05:15:50.357835Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/1.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.369316Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/2.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.372989Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/3.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.376463Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/4.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.379678Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/5.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.382717Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/6.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.386070Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/7.json}: sbv_cli::commands::run::file: verified -2025-03-31T05:15:50.388808Z INFO run_witness{path=./testdata/scroll_witness/euclid_v2/8.json}: sbv_cli::commands::run::file: verified +e.g. verify `./testdata/scroll/euclid_v2/*.json` files. +``` +> $ ./target/release/sbv-cli run file ./testdata/scroll/euclid_v2/*.json +2025-03-31T05:15:50.357835Z INFO run_witness{path=./testdata/scroll/euclid_v2/1.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.369316Z INFO run_witness{path=./testdata/scroll/euclid_v2/2.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.372989Z INFO run_witness{path=./testdata/scroll/euclid_v2/3.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.376463Z INFO run_witness{path=./testdata/scroll/euclid_v2/4.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.379678Z INFO run_witness{path=./testdata/scroll/euclid_v2/5.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.382717Z INFO run_witness{path=./testdata/scroll/euclid_v2/6.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.386070Z INFO run_witness{path=./testdata/scroll/euclid_v2/7.json}: sbv_cli::commands::run::file: verified +2025-03-31T05:15:50.388808Z INFO run_witness{path=./testdata/scroll/euclid_v2/8.json}: sbv_cli::commands::run::file: verified ``` #### Continuous verify blocks from a rpc server diff --git a/crates/core/src/verifier/ethereum.rs b/crates/core/src/verifier/ethereum.rs index 9d8fc6f3..353e113e 100644 --- a/crates/core/src/verifier/ethereum.rs +++ b/crates/core/src/verifier/ethereum.rs @@ -28,22 +28,19 @@ pub(super) fn import_block_hashes(witnesses: &[BlockWitness]) -> BTreeMap