bump alloy/revm/reth, switch to stable toolchain

Author: dexloom

Cargo.toml

@@ -2,7 +2,7 @@
 
 [workspace]
 members = [
-    "bin/loom", "bin/keys", "bin/loom_anvil", "bin/gasbench", "bin/nodebench", 
+    "bin/loom", "bin/keys", "bin/loom_anvil", "bin/gasbench", "bin/nodebench",
     "crates/defi-abi", "crates/defi-actors", "crates/defi-entities", "crates/defi-events", "crates/defi-pools", "crates/multicaller", "crates/topology", "crates/types", "crates/utils", "crates/flashbots", "crates/debug-provider", "bin/gasbench", "bin/nodebench"]
 default-members = ["bin/loom", "bin/keys", "bin/loom_anvil", "bin/gasbench", "bin/nodebench"]
 resolver = "2"
@@ -60,12 +60,12 @@ colored = "2.0.4"
 
 
 
-#alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc", default-features = false, features = ["pubsub",
-#    "sol-types", "dyn-abi", "json-abi", "contract", "providers", "provider-ws", "provider-ipc", "provider-http", "consensus", "genesis", "reqwest", "hyper", "serde",
-#    "signers", "signer-local", "transports", "transport-http", "transport-ipc", "transport-ws",
-#    "network", "node-bindings", "rpc-client", "json-rpc", "rpc-types", "rpc-types-trace", "rpc-types-admin", "rpc-types-txpool", "rpc-types-anvil", "rpc-types-json"] }
+alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc", default-features = false, features = ["pubsub",
+    "sol-types", "dyn-abi", "json-abi", "contract", "providers", "provider-ws", "provider-ipc", "provider-http", "consensus", "genesis", "reqwest", "hyper", "serde",
+    "signers", "signer-local", "transports", "transport-http", "transport-ipc", "transport-ws",
+    "network", "node-bindings", "rpc-client", "json-rpc", "rpc-types", "rpc-types-trace", "rpc-types-admin", "rpc-types-txpool", "rpc-types-anvil", "rpc-types-json"] }
 
-alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc", features = ["full"] }
+#alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc", features = ["full"] }
 
 revm = { version = "9.0.0", features = [
     "std",
@@ -87,8 +87,6 @@ alloy-rlp = "0.3.5"
 alloy-trie = "0.4.1"
 
 
-
-
 alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy.git", features = ["ws", "reqwest", "pubsub"], rev = "61921bc" }
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
@@ -114,15 +112,16 @@ alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "61921b
 alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy.git", rev = "61921bc" }
 
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
-reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
-reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "87d6bcd" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
 
 
-uniswap_v3_math = { git = "https://github.com/0xKitsune/uniswap-v3-math", rev = "b7b2e87" }
+#uniswap_v3_math = { git = "https://github.com/0xKitsune/uniswap-v3-math", rev = "b7b2e87" }
+uniswap_v3_math = { path = "../uniswap-v3-math" }
 
 
 [patch.crates-io]
@@ -136,7 +135,7 @@ revm-primitives = { git = "https://github.com/bluealloy/revm", rev = "41e2f7f" }
 alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 
-alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc", features = ["full"] }
+#alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "61921bc" }
 
 
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
@@ -146,5 +145,12 @@ alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "6192
 alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
+alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
+alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "61921bc" }
 
-
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "d786b45" }

bin/nodebench/Cargo.toml

@@ -15,7 +15,6 @@ eyre.workspace = true
 chrono.workspace = true
 futures.workspace = true
 
-[dependencies.alloy]
-workspace = true
-features = ["full"]
+alloy.workspace = true
+
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-06-20"
+channel = "stable"
 profile = "default"