Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit 3ddc25f

Browse files
committed
Merge remote-tracking branch 'scroll/develop' into tmp/new-l2geth
2 parents d2600e5 + 47e4cb7 commit 3ddc25f

File tree

125 files changed

+4731
-1129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+4731
-1129
lines changed

Cargo.lock

+58-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ members = [
1717
resolver = "2"
1818

1919
[workspace.package]
20-
version = "0.11.0"
20+
version = "0.12.0"
2121
edition = "2021"
2222
license = "MIT OR Apache-2.0"
2323

2424
[workspace.dependencies]
2525
anyhow = "1.0"
2626
ark-std = "0.3"
2727
base64 = "0.13.0"
28+
bincode = "1"
2829
ctor = "0.1"
2930
env_logger = "0.10"
3031
ethers = { version = "=2.0.7", features = ["ethers-solc"] }
@@ -63,8 +64,8 @@ strum_macros = "0.25"
6364
subtle = "2.4"
6465
tokio = { version = "1.13", features = ["macros", "rt-multi-thread"] }
6566
url = "2.2"
66-
revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v36", default-features = false, features = ["std"] } # v36
67-
revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v36", default-features = false, features = ["std"] } # v36
67+
revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = ["std"] } # v40
68+
revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = ["std"] } # v40
6869
c-kzg = "1.0.2"
6970

7071
[patch.crates-io]

aggregator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ csv = "1.1"
4646
[features]
4747
default = ["revm-precompile/c-kzg"]
4848
print-trace = ["ark-std/print-trace"]
49-
# This feature is useful for unit tests where we check the SAT of pi aggregation circuit
49+
# This feature is useful for unit tests where we check the SAT of pi batch circuit
5050
disable_proof_aggregation = []

0 commit comments

Comments
 (0)