Merge pull request #141 from chainbound/chore/sidecar/bump-types-version

chore(sidecar): bump reth/alloy types, remove trace call manager
chainbound · Jul 22, 2024 · 6f724a9 · 6f724a9
2 parents db1ccf6 + 2b78f6e
commit 6f724a9
Show file tree

Hide file tree

Showing 25 changed files with 714 additions and 983 deletions.
diff --git a/bolt-sidecar/Cargo.lock b/bolt-sidecar/Cargo.lock
diff --git a/bolt-sidecar/Cargo.toml b/bolt-sidecar/Cargo.toml
@@ -19,32 +19,14 @@ tree_hash_derive = "0.5"
 secp256k1 = { version = "0.29.0", features = ["rand"] }
 
 # alloy
-alloy-rpc-client = { version = "0.1.2", features = ["reqwest", "ws", "pubsub"] }
-alloy-consensus = { version = "0.1.2", features = ["k256"] }
-alloy-provider = { version = "0.1.2", features = ["ws"] }
-alloy-signer = { version = "0.1.2" }
-alloy-signer-local = { version = "0.1.2" }
-alloy-transport = { version = "0.1.2" }
-alloy-eips = { version = "0.1.2" }
-alloy-transport-http = { version = "0.1.2" }
-alloy-transport-ws = { version = "0.1.2" }
-alloy-pubsub = { version = "0.1.2" }
-alloy-rpc-types = { version = "0.1.2" }
-alloy-rpc-types-engine = { version = "0.1.2" }
-alloy-rpc-types-beacon = { version = "0.1.2" }
-alloy-rpc-types-trace = { version = "0.1.2" }
-alloy-json-rpc = { version = "0.1.2" }
-alloy-network = { version = "0.1.2" }
-alloy-primitives = { version = "0.7.1" }
-alloy-rlp = { version = "0.3" }
-
+alloy = { version = "0.2.0", features = ["full", "provider-trace-api", "rpc-types-beacon", "rpc-types-engine"] }
 
 # alloy-rpc-types = { git = "https://github.com/chainbound/alloy", branch = "fix/account-override-serialize" }
 
 
 # reth
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "71c404d" }
-reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", rev = "6e146e1" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", version = "1.0.2" }
+reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", version = "1.0.2" }
 # reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "71c404d" }
 
 reqwest = "0.12"
@@ -77,7 +59,7 @@ cb-crypto = { git = "https://github.com/Commit-Boost/commit-boost-client" }
 cb-common = { git = "https://github.com/Commit-Boost/commit-boost-client" }
 
 [dev-dependencies]
-alloy-node-bindings = "0.1.1"
+alloy-node-bindings = "0.2.0"
 
 
 [[bin]]

diff --git a/bolt-sidecar/bin/sidecar.rs b/bolt-sidecar/bin/sidecar.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use alloy_rpc_types_beacon::events::HeadEvent;
+use alloy::rpc::types::beacon::events::HeadEvent;
 use tokio::sync::mpsc;
 
 use bolt_sidecar::{

diff --git a/bolt-sidecar/src/builder/call_trace_manager.rs b/bolt-sidecar/src/builder/call_trace_manager.rs
diff --git a/bolt-sidecar/src/builder/compat.rs b/bolt-sidecar/src/builder/compat.rs
@@ -1,8 +1,10 @@
-use alloy_eips::eip4895::Withdrawal;
-use alloy_primitives::{Address, Bloom, B256, U256};
-use alloy_rpc_types_engine::{
-    ExecutionPayload as AlloyExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV2,
-    ExecutionPayloadV3,
+use alloy::{
+    eips::eip4895::Withdrawal,
+    primitives::{Address, Bloom, B256, U256},
+    rpc::types::engine::{
+        ExecutionPayload as AlloyExecutionPayload, ExecutionPayloadV1, ExecutionPayloadV2,
+        ExecutionPayloadV3,
+    },
 };
 use ethereum_consensus::{
     bellatrix::mainnet::Transaction,