From 410fc03553e5fe52ce620f1e57d63d1f0247a2e4 Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Wed, 17 Jul 2024 14:39:20 +0200 Subject: [PATCH 1/3] Remove OptimismEthApiError in favour of OpEthApiError --- bin/reth/Cargo.toml | 1 - crates/consensus/beacon/Cargo.toml | 1 - crates/engine/util/Cargo.toml | 5 +--- crates/optimism/node/Cargo.toml | 1 - crates/rpc/rpc/Cargo.toml | 13 --------- crates/rpc/rpc/src/eth/helpers/mod.rs | 2 -- crates/rpc/rpc/src/eth/helpers/optimism.rs | 31 ---------------------- 7 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 crates/rpc/rpc/src/eth/helpers/optimism.rs diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index d67436121e7c..5401cf3d6f47 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -136,7 +136,6 @@ optimism = [ "dep:reth-optimism-cli", "reth-optimism-cli?/optimism", "reth-primitives/optimism", - "reth-rpc/optimism", "reth-provider/optimism", "reth-beacon-consensus/optimism", "reth-blockchain-tree/optimism", diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index bf74df0f7598..77b941b60897 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -78,5 +78,4 @@ optimism = [ "reth-primitives/optimism", "reth-provider/optimism", "reth-blockchain-tree/optimism", - "reth-rpc/optimism", ] diff --git a/crates/engine/util/Cargo.toml b/crates/engine/util/Cargo.toml index 26d504a745af..eac313c4ba12 100644 --- a/crates/engine/util/Cargo.toml +++ b/crates/engine/util/Cargo.toml @@ -36,7 +36,4 @@ tracing.workspace = true futures.workspace = true [features] -optimism = [ - "reth-rpc/optimism", - "reth-beacon-consensus/optimism", -] +optimism = ["reth-beacon-consensus/optimism"] diff --git a/crates/optimism/node/Cargo.toml b/crates/optimism/node/Cargo.toml index ddbc4916671c..50c0f47bc2d7 100644 --- a/crates/optimism/node/Cargo.toml +++ b/crates/optimism/node/Cargo.toml @@ -74,7 +74,6 @@ optimism = [ "reth-primitives/optimism", "reth-provider/optimism", "reth-rpc-types-compat/optimism", - "reth-rpc/optimism", "reth-evm-optimism/optimism", "reth-optimism-payload-builder/optimism", "reth-beacon-consensus/optimism", diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index b6a0020dca33..99c8e78655db 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -54,7 +54,6 @@ http-body.workspace = true hyper.workspace = true jsonwebtoken.workspace = true serde_json.workspace = true -jsonrpsee-types = { workspace = true, optional = true } # async async-trait.workspace = true @@ -83,15 +82,3 @@ jsonrpsee-types.workspace = true jsonrpsee = { workspace = true, features = ["client"] } assert_matches.workspace = true tempfile.workspace = true - -[features] -optimism = [ - "reth-primitives/optimism", - "reth-rpc-types-compat/optimism", - "reth-provider/optimism", - "reth-rpc-api/optimism", - "reth-rpc-eth-api/optimism", - "reth-revm/optimism", - "jsonrpsee-types", - "reth-rpc-eth-types/optimism", -] diff --git a/crates/rpc/rpc/src/eth/helpers/mod.rs b/crates/rpc/rpc/src/eth/helpers/mod.rs index 175d72c7648c..f0a0cccb5536 100644 --- a/crates/rpc/rpc/src/eth/helpers/mod.rs +++ b/crates/rpc/rpc/src/eth/helpers/mod.rs @@ -6,8 +6,6 @@ pub mod signer; mod block; mod call; mod fees; -#[cfg(feature = "optimism")] -pub mod optimism; mod pending_block; mod receipt; mod spec; diff --git a/crates/rpc/rpc/src/eth/helpers/optimism.rs b/crates/rpc/rpc/src/eth/helpers/optimism.rs deleted file mode 100644 index 03d45dbe4709..000000000000 --- a/crates/rpc/rpc/src/eth/helpers/optimism.rs +++ /dev/null @@ -1,31 +0,0 @@ -//! Loads and formats OP transaction RPC response. - -use jsonrpsee_types::error::ErrorObject; -use reth_rpc_eth_types::EthApiError; -use reth_rpc_server_types::result::internal_rpc_err; -use reth_rpc_types::ToRpcError; - -/// Optimism specific errors, that extend [`EthApiError`]. -#[derive(Debug, thiserror::Error)] -pub enum OptimismEthApiError { - /// Thrown when calculating L1 gas fee. - #[error("failed to calculate l1 gas fee")] - L1BlockFeeError, - /// Thrown when calculating L1 gas used - #[error("failed to calculate l1 gas used")] - L1BlockGasError, -} - -impl ToRpcError for OptimismEthApiError { - fn to_rpc_error(&self) -> ErrorObject<'static> { - match self { - Self::L1BlockFeeError | Self::L1BlockGasError => internal_rpc_err(self.to_string()), - } - } -} - -impl From for EthApiError { - fn from(err: OptimismEthApiError) -> Self { - Self::other(err) - } -} From cbd2f56871f5574192298c2cbd3955d8bc033b1f Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Wed, 17 Jul 2024 15:10:02 +0200 Subject: [PATCH 2/3] Add back feature to enable feature in deps --- bin/reth/Cargo.toml | 1 + crates/consensus/beacon/Cargo.toml | 1 + crates/engine/util/Cargo.toml | 5 ++++- crates/optimism/node/Cargo.toml | 1 + crates/rpc/rpc/Cargo.toml | 13 +++++++++++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 5401cf3d6f47..d67436121e7c 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -136,6 +136,7 @@ optimism = [ "dep:reth-optimism-cli", "reth-optimism-cli?/optimism", "reth-primitives/optimism", + "reth-rpc/optimism", "reth-provider/optimism", "reth-beacon-consensus/optimism", "reth-blockchain-tree/optimism", diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index 77b941b60897..bf74df0f7598 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -78,4 +78,5 @@ optimism = [ "reth-primitives/optimism", "reth-provider/optimism", "reth-blockchain-tree/optimism", + "reth-rpc/optimism", ] diff --git a/crates/engine/util/Cargo.toml b/crates/engine/util/Cargo.toml index eac313c4ba12..26d504a745af 100644 --- a/crates/engine/util/Cargo.toml +++ b/crates/engine/util/Cargo.toml @@ -36,4 +36,7 @@ tracing.workspace = true futures.workspace = true [features] -optimism = ["reth-beacon-consensus/optimism"] +optimism = [ + "reth-rpc/optimism", + "reth-beacon-consensus/optimism", +] diff --git a/crates/optimism/node/Cargo.toml b/crates/optimism/node/Cargo.toml index 50c0f47bc2d7..ddbc4916671c 100644 --- a/crates/optimism/node/Cargo.toml +++ b/crates/optimism/node/Cargo.toml @@ -74,6 +74,7 @@ optimism = [ "reth-primitives/optimism", "reth-provider/optimism", "reth-rpc-types-compat/optimism", + "reth-rpc/optimism", "reth-evm-optimism/optimism", "reth-optimism-payload-builder/optimism", "reth-beacon-consensus/optimism", diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index 99c8e78655db..b6a0020dca33 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -54,6 +54,7 @@ http-body.workspace = true hyper.workspace = true jsonwebtoken.workspace = true serde_json.workspace = true +jsonrpsee-types = { workspace = true, optional = true } # async async-trait.workspace = true @@ -82,3 +83,15 @@ jsonrpsee-types.workspace = true jsonrpsee = { workspace = true, features = ["client"] } assert_matches.workspace = true tempfile.workspace = true + +[features] +optimism = [ + "reth-primitives/optimism", + "reth-rpc-types-compat/optimism", + "reth-provider/optimism", + "reth-rpc-api/optimism", + "reth-rpc-eth-api/optimism", + "reth-revm/optimism", + "jsonrpsee-types", + "reth-rpc-eth-types/optimism", +] From 117399d17ddf9d44dd1d717f98835a7ae89fdc0c Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Wed, 17 Jul 2024 15:16:11 +0200 Subject: [PATCH 3/3] fixup! Add back feature to enable feature in deps --- crates/rpc/rpc/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index b6a0020dca33..37b5c96fd540 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -54,7 +54,6 @@ http-body.workspace = true hyper.workspace = true jsonwebtoken.workspace = true serde_json.workspace = true -jsonrpsee-types = { workspace = true, optional = true } # async async-trait.workspace = true @@ -92,6 +91,5 @@ optimism = [ "reth-rpc-api/optimism", "reth-rpc-eth-api/optimism", "reth-revm/optimism", - "jsonrpsee-types", "reth-rpc-eth-types/optimism", ]