Merge branch 'rkhalil/op-compose' of github.com:risc0/zeth into rkhal…

…il/tidy-host
risc0 · Jan 23, 2024 · d5b4b1e · d5b4b1e
2 parents b1a1436 + 4c18859
commit d5b4b1e
Show file tree

Hide file tree

Showing 30 changed files with 1,913 additions and 1,900 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,6 @@
 [workspace]
 resolver = "2"
-members = [
-    "guests",
-    "host",
-    "lib",
-    "primitives",
-    "testing/ef-tests"
-]
+members = ["guests", "host", "lib", "primitives", "testing/ef-tests"]
 
 # Always optimize; building and running the guest takes much longer without optimization.
 [profile.dev]
@@ -24,7 +18,12 @@ opt-level = 3
 
 [workspace.dependencies]
 bonsai-sdk = "0.5"
-hashbrown = { version = "0.14", features = ["inline-more"] }
+hashbrown = { version = "0.14.3", features = ["inline-more"] }
 risc0-build = { git = "https://github.com/risc0/risc0.git", rev = "d2502d46270a1fe0f0b53059ce8de1fc662539c7" }
 risc0-zkvm = { git = "https://github.com/risc0/risc0.git", rev = "d2502d46270a1fe0f0b53059ce8de1fc662539c7", default-features = false }
-revm = { version = "3.5", default-features = false, features = ["std", "serde", "optional_no_base_fee", "optional_balance_check"] }
+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",
+] }