refactor: break e2hs-writer and portal-bridge dependency (#1831)

Author: Arya-A-Nair

.circleci/config.yml

@@ -235,7 +235,7 @@ jobs:
     # parallelism level should be set to the amount of simulators we have or greater
     # The reason for this is the CI code currently only supports 1 input at a time
     # if we have a parallelism level of 5 and 6 sims one test runner will get 2 test sims and fail
-    parallelism: 20
+    parallelism: 21
     steps:
       - checkout
       - run:

Cargo.lock

@@ -4,16 +4,17 @@ members = [
     "bin/portal-bridge",
     "bin/trin", 
     "bin/trin-execution",
-    "crates/ethportal-api",
     "crates/e2store",
+    "crates/ethereum-rpc-client",
+    "crates/ethportal-api",
     "crates/evm",
     "crates/light-client",
     "crates/metrics",
     "crates/portalnet",
     "crates/rpc",
     "crates/storage",
     "crates/subnetworks/beacon",
-    "crates/subnetworks/history",
+    "crates/subnetworks/history", 
     "crates/subnetworks/state",
     "crates/utils",
     "crates/validation",    
@@ -104,6 +105,7 @@ utp-rs = "0.1.0-alpha.17"
 
 # Trin workspace crates
 e2store = { path = "crates/e2store" }
+ethereum-rpc-client = { path = "crates/ethereum-rpc-client" }
 ethportal-api = { path = "crates/ethportal-api" }
 light-client = { path = "crates/light-client" }
 portal-bridge = { path = "bin/portal-bridge" }

Cargo.toml

@@ -20,11 +20,11 @@ aws-config = { version = "1.6", features = ["behavior-version-latest"] }
 aws-sdk-s3 = "1.83.0"
 clap.workspace = true
 e2store.workspace = true
+ethereum-rpc-client.workspace = true
 ethereum_ssz.workspace = true
 ethportal-api.workspace = true
 futures.workspace = true
 humanize-duration.workspace = true
-portal-bridge.workspace = true
 reqwest.workspace = true
 rstest.workspace = true
 serde_yaml.workspace = true

bin/e2hs-writer/Cargo.toml

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use clap::{Args, Parser, Subcommand};
-use portal_bridge::{constants::DEFAULT_TOTAL_REQUEST_TIMEOUT, DEFAULT_BASE_EL_ENDPOINT};
+use ethereum_rpc_client::constants::{DEFAULT_BASE_EL_ENDPOINT, DEFAULT_TOTAL_REQUEST_TIMEOUT};
 use url::Url;
 
 pub const DEFAULT_PORTAL_ACCUMULATOR_PATH: &str = "./portal-accumulators";

bin/e2hs-writer/src/cli.rs

@@ -1,12 +1,12 @@
 use anyhow::{anyhow, bail, ensure};
+use ethereum_rpc_client::{consensus::ConsensusApi, execution::ExecutionApi};
 use ethportal_api::{
     consensus::{
         beacon_block::SignedBeaconBlockElectra, beacon_state::BeaconStateElectra,
         constants::SLOTS_PER_HISTORICAL_ROOT,
     },
     Receipts,
 };
-use portal_bridge::api::{consensus::ConsensusApi, execution::ExecutionApi};
 use tracing::warn;
 use url::Url;
 

bin/e2hs-writer/src/subcommands/head_generator/ethereum_api.rs

@@ -10,6 +10,7 @@ use alloy_hardforks::EthereumHardforks;
 use anyhow::{anyhow, bail, ensure};
 use async_stream::stream;
 use e2store::e2hs::{E2HSWriter, BLOCKS_PER_E2HS};
+use ethereum_rpc_client::execution::ExecutionApi;
 use ethportal_api::{
     types::{
         execution::{
@@ -24,7 +25,6 @@ use ethportal_api::{
     Receipts,
 };
 use futures::{Stream, StreamExt};
-use portal_bridge::api::execution::ExecutionApi;
 use ssz::Decode;
 use tokio::try_join;
 use tracing::info;

bin/e2hs-writer/src/subcommands/single_generator/e2hs_builder.rs

@@ -13,7 +13,6 @@ version.workspace = true
 
 [dependencies]
 alloy.workspace = true
-alloy-hardforks.workspace = true
 anyhow.workspace = true
 bytes.workspace = true
 chrono.workspace = true
@@ -22,37 +21,21 @@ delay_map.workspace = true
 discv5.workspace = true
 e2store.workspace = true
 eth_trie.workspace = true
-ethereum_ssz.workspace = true
-ethereum_ssz_derive.workspace = true
+ethereum-rpc-client.workspace = true
 ethportal-api.workspace = true
 futures.workspace = true
 humanize-duration.workspace = true
 itertools.workspace = true
-jsonrpsee = { workspace = true, features = [
-  "async-client",
-  "client",
-  "macros",
-  "server",
-] }
 portalnet.workspace = true
 prometheus_exporter.workspace = true
 rand.workspace = true
-regex = "1.10.2"
 reqwest.workspace = true
-reqwest-middleware = { version = "0.3.3", features = ["json"] }
-reqwest-retry = "0.6.1"
-reth-ipc.workspace = true
 revm.workspace = true
 revm-primitives.workspace = true
-scraper.workspace = true
-serde = { workspace = true, features = ["rc"] }
-serde_json.workspace = true
 ssz_types.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-tracing-subscriber.workspace = true
-tree_hash.workspace = true
 trin.workspace = true
 trin-beacon.workspace = true
 trin-history.workspace = true
@@ -64,7 +47,6 @@ trin-metrics.workspace = true
 trin-utils.workspace = true
 trin-validation.workspace = true
 url.workspace = true
-utp-rs.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true

bin/portal-bridge/Cargo.toml

@@ -6,6 +6,7 @@ use std::{
 
 use alloy::primitives::B256;
 use anyhow::bail;
+use ethereum_rpc_client::consensus::ConsensusApi;
 use ethportal_api::{
     consensus::{
         constants::{SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT},
@@ -37,7 +38,6 @@ use trin_metrics::bridge::BridgeMetricsReporter;
 
 use super::{constants::SERVE_BLOCK_TIMEOUT, offer_report::OfferReport};
 use crate::{
-    api::consensus::ConsensusApi,
     census::Census,
     constants::BEACON_GENESIS_TIME,
     types::mode::BridgeMode,