Skip to content

Commit

Permalink
hack scroll-hanlder in sbv
Browse files Browse the repository at this point in the history
Signed-off-by: noelwei <[email protected]>
  • Loading branch information
noel2004 committed Nov 21, 2024
1 parent a8df33e commit e431947
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 3 deletions.
48 changes: 47 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "
integration = { path = "integration" }
scroll-prover = { path = "prover" }

revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/feat/v49/sp1", features = ["negate-scroll-default-handler"] }

[patch.crates-io]
halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" }
ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
Expand Down Expand Up @@ -64,8 +66,8 @@ alloy-core = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8
alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.10" }
alloy-sol-types = {git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.10" }
# ========== revm patches, unify revm usage in sbv / zkevm-circuit
revm = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" }
revm-primitives = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" }
revm = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1"}
#revm-primitives = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" }


[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
Expand Down
1 change: 1 addition & 0 deletions integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ serde.workspace = true
serde_json.workspace = true
serde_derive.workspace = true
tokio.workspace = true
revm.workspace = true

snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
Expand Down

0 comments on commit e431947

Please sign in to comment.