chore: rename miner to payload builder (#2217)

Cargo.lock

@@ -4443,10 +4443,10 @@ dependencies = [
  "reth-downloaders",
  "reth-executor",
  "reth-interfaces",
- "reth-miner",
  "reth-net-nat",
  "reth-network",
  "reth-network-api",
+ "reth-payload-builder",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
@@ -4496,7 +4496,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "reth-consensus-common",
- "reth-miner",
+ "reth-payload-builder",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
@@ -4520,7 +4520,7 @@ dependencies = [
  "reth-executor",
  "reth-interfaces",
  "reth-metrics-derive",
- "reth-miner",
+ "reth-payload-builder",
  "reth-primitives",
  "reth-provider",
  "reth-rpc-types",
@@ -4852,25 +4852,6 @@ dependencies = [
  "trybuild",
 ]
 
-[[package]]
-name = "reth-miner"
-version = "0.1.0"
-dependencies = [
- "futures-core",
- "futures-util",
- "parking_lot 0.12.1",
- "reth-interfaces",
- "reth-primitives",
- "reth-rlp",
- "reth-rpc-types",
- "revm-primitives",
- "sha2 0.10.6",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
-]
-
 [[package]]
 name = "reth-net-common"
 version = "0.1.0"
@@ -4957,6 +4938,25 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "reth-payload-builder"
+version = "0.1.0"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "parking_lot 0.12.1",
+ "reth-interfaces",
+ "reth-primitives",
+ "reth-rlp",
+ "reth-rpc-types",
+ "revm-primitives",
+ "sha2 0.10.6",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+]
+
 [[package]]
 name = "reth-primitives"
 version = "0.1.0"

Cargo.toml

@@ -6,7 +6,7 @@ members = [
     "crates/consensus/common",
     "crates/executor",
     "crates/interfaces",
-    "crates/miner",
+    "crates/payload/builder",
     "crates/metrics/metrics-derive",
     "crates/metrics/common",
     "crates/net/common",

bin/reth/Cargo.toml

@@ -31,7 +31,7 @@ reth-downloaders = { path = "../../crates/net/downloaders", features = ["test-ut
 reth-tracing = { path = "../../crates/tracing" }
 reth-tasks = { path = "../../crates/tasks" }
 reth-net-nat = { path = "../../crates/net/nat" }
-reth-miner = { path = "../../crates/miner" }
+reth-payload-builder = { path = "../../crates/payload/builder" }
 reth-discv4 = { path = "../../crates/net/discv4" }
 
 # crypto

bin/reth/src/node/mod.rs

@@ -36,9 +36,9 @@ use reth_interfaces::{
     },
     sync::SyncStateUpdater,
 };
-use reth_miner::TestPayloadStore;
 use reth_network::{error::NetworkError, NetworkConfig, NetworkHandle, NetworkManager};
 use reth_network_api::NetworkInfo;
+use reth_payload_builder::TestPayloadStore;
 use reth_primitives::{BlockHashOrNumber, Chain, ChainSpec, Head, Header, SealedHeader, H256};
 use reth_provider::{BlockProvider, HeaderProvider, ShareableDatabase};
 use reth_revm::Factory;

crates/consensus/beacon/Cargo.toml

@@ -15,7 +15,7 @@ reth-stages = { path = "../../stages" }
 reth-db = { path = "../../storage/db" }
 reth-rpc-types = { path = "../../rpc/rpc-types" }
 reth-tasks = { path = "../../tasks" }
-reth-miner = { path = "../../miner" }
+reth-payload-builder = { path = "../../payload/builder" }
 reth-metrics-derive = { path = "../../metrics/metrics-derive" }
 
 # async

crates/consensus/beacon/src/engine/error.rs

@@ -1,4 +1,4 @@
-use reth_miner::error::PayloadBuilderError;
+use reth_payload_builder::error::PayloadBuilderError;
 use reth_rpc_types::engine::{EngineRpcError, PayloadError};
 use reth_stages::PipelineError;
 use thiserror::Error;

crates/consensus/beacon/src/engine/mod.rs

@@ -9,7 +9,7 @@ use reth_interfaces::{
     Error,
 };
 use reth_metrics_derive::Metrics;
-use reth_miner::PayloadStore;
+use reth_payload_builder::PayloadStore;
 use reth_primitives::{BlockNumber, Header, SealedBlock, H256};
 use reth_rpc_types::engine::{
     EngineRpcError, ExecutionPayload, ExecutionPayloadEnvelope, ForkchoiceUpdated,
@@ -602,7 +602,7 @@ mod tests {
         test_utils::TestExecutorFactory,
     };
     use reth_interfaces::{sync::NoopSyncStateUpdate, test_utils::TestConsensus};
-    use reth_miner::TestPayloadStore;
+    use reth_payload_builder::TestPayloadStore;
     use reth_primitives::{ChainSpec, ChainSpecBuilder, SealedBlockWithSenders, H256, MAINNET};
     use reth_provider::Transaction;
     use reth_stages::{test_utils::TestStages, ExecOutput, PipelineError, StageError};

crates/payload/basic/Cargo.toml

@@ -15,7 +15,7 @@ reth-revm = { path = "../../revm" }
 reth-transaction-pool = { path = "../../transaction-pool" }
 reth-rlp = { path = "../../rlp" }
 reth-provider = { path = "../../storage/provider" }
-reth-miner = { path = "../../miner" }
+reth-payload-builder = { path = "../builder" }
 reth-tasks = { path = "../../tasks" }
 
 ## ethereum

crates/payload/basic/src/lib.rs

@@ -12,7 +12,7 @@
 use futures_core::{ready, Stream};
 use futures_util::FutureExt;
 use reth_consensus_common::validation::calculate_next_block_base_fee;
-use reth_miner::{
+use reth_payload_builder::{
     error::PayloadBuilderError, BuiltPayload, PayloadBuilderAttributes, PayloadJob,
     PayloadJobGenerator,
 };

crates/payload/builder/Cargo.toml

@@ -1,18 +1,18 @@
 [package]
-name = "reth-miner"
+name = "reth-payload-builder"
 version = "0.1.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/paradigmxyz/reth"
 readme = "README.md"
-description = "Block production"
+description = "reth payload builder"
 
 [dependencies]
 ## reth
-reth-primitives = { path = "../primitives" }
+reth-primitives = { path = "../../primitives" }
-reth-rpc-types = { path = "../rpc/rpc-types" }
+reth-rpc-types = { path = "../../rpc/rpc-types" }
-reth-rlp = { path = "../rlp" }
+reth-rlp = { path = "../../rlp" }
-reth-interfaces = { path = "../interfaces" }
+reth-interfaces = { path = "../../interfaces" }
 
 ## ethereum
 revm-primitives = "1"