Skip to content

Commit

Permalink
Merge remote-tracking branch 'risc0/main' into update-revm-no-std
Browse files Browse the repository at this point in the history
  • Loading branch information
CeciliaZ030 committed Jan 24, 2024
2 parents 1369d92 + 6867af4 commit 3af84ea
Show file tree
Hide file tree
Showing 21 changed files with 4,911 additions and 1,727 deletions.
922 changes: 422 additions & 500 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bonsai-sdk = "0.5"
hashbrown = { version = "0.14", features = ["inline-more"] }
risc0-build = "0.19"
risc0-zkvm = { version = "0.19", default-features = false }
revm-primitives = { git = "https://github.com/bluealloy/revm.git", rev = "5e6546e2a57bbc7661469fa606ea3c6569fe1838", default_features = false }
revm = { git = "https://github.com/bluealloy/revm.git", rev = "5e6546e2a57bbc7661469fa606ea3c6569fe1838", default-features = false, features = [
revm-primitives = { git = "https://github.com/bluealloy/revm.git", rev = "6cd0bfc96da64513affe01c1964dd80beeb8c620", default_features = false }
revm = { git = "https://github.com/bluealloy/revm.git", rev = "6cd0bfc96da64513affe01c1964dd80beeb8c620", default-features = false, features = [
"std",
"serde",
"optimism",
Expand Down
Loading

0 comments on commit 3af84ea

Please sign in to comment.