Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
808 changes: 120 additions & 688 deletions Cargo.lock

Large diffs are not rendered by default.

104 changes: 55 additions & 49 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ members = [
"crates/consensus",
"crates/db",
"crates/evm",
"crates/network",
"crates/node",
"crates/node-builder",
"crates/payload",
Expand Down Expand Up @@ -52,9 +51,11 @@ alloy-sol-types = { version = "1.5.6", default-features = false }
arbitrary = "1.3"
async-trait = "0.1.68"
auto_impl = "1"
bincode = { version = "2.0.1", default-features = false }
clap = "4"
derive_more = { version = "2", default-features = false, features = ["full"] }
eyre = "0.6"
rand = "0.9"

# rpc
jsonrpsee = "0.26.0"
Expand All @@ -71,54 +72,59 @@ flate2 = "1.1.5"
parity-scale-codec = "3.2.1"

# reth
reth = { git = "https://github.com/paradigmxyz/reth", package = "reth", tag = "v1.11.0" }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false, features = [
"std",
] }
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
reth = { git = "https://github.com/paradigmxyz/reth", package = "reth", tag = "v1.11.0", default-features = false }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0", default-features = false }

# revm
revm-database-interface = { version = "9.0.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion bin/alethia-reth/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![cfg_attr(not(test), deny(missing_docs, clippy::missing_docs_in_private_items))]
#![cfg_attr(test, allow(missing_docs, clippy::missing_docs_in_private_items))]
//! Rust Taiko node (alethia-reth) binary executable.
use alethia_reth_cli::{TaikoChainSpecParser, TaikoCli, TaikoCliExtArgs};
use alethia_reth_cli::{TaikoCli, TaikoCliExtArgs, parser::TaikoChainSpecParser};
use alethia_reth_node::{
TaikoNode,
rpc::eth::{
Expand Down
18 changes: 11 additions & 7 deletions crates/block/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,27 @@ path = "src/lib.rs"
default = ["net"]
prover = []
net = [
"dep:alethia-reth-primitives",
"alethia-reth-primitives?/net",
"dep:reth-payload-primitives",
"dep:reth-rpc-eth-api",
"alethia-reth-primitives/net",
"reth-codec",
]
serde = ["dep:alethia-reth-primitives", "alethia-reth-primitives?/serde"]
serde = ["alethia-reth-primitives/serde"]
reth-codec = ["alethia-reth-primitives/reth-codec"]

[dependencies]
alethia-reth-chainspec = { path = "../chainspec", default-features = false }
alethia-reth-consensus = { path = "../consensus", default-features = false }
alethia-reth-evm = { path = "../evm" }
alethia-reth-primitives = { path = "../primitives", default-features = false, optional = true }
alethia-reth-primitives = { path = "../primitives", default-features = false, features = [
"serde",
"serde-bincode-compat",
] }
alloy-consensus = { workspace = true }
alloy-eips = { workspace = true }
alloy-evm = { workspace = true }
alloy-hardforks = { workspace = true }
alloy-primitives = { workspace = true }
alloy-primitives = { workspace = true, features = ["rand"] }
alloy-rlp = { workspace = true }
alloy-rpc-types-eth = { workspace = true }
flate2 = { workspace = true }
Expand All @@ -37,13 +42,12 @@ reth-ethereum = { workspace = true }
reth-ethereum-forks = { workspace = true }
reth-evm = { workspace = true }
reth-evm-ethereum = { workspace = true }
reth-execution-types = { workspace = true }
reth-payload-primitives = { workspace = true, optional = true }
reth-primitives = { workspace = true }
reth-primitives-traits = { workspace = true }
reth-revm = { workspace = true }
reth-rpc-eth-api = { workspace = true, optional = true }
reth-storage-errors = { workspace = true }
reth-transaction-pool = { workspace = true }
reth-revm = { workspace = true }
revm-database-interface = { workspace = true }
tracing = { workspace = true }
10 changes: 5 additions & 5 deletions crates/block/src/assembler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ use alloy_consensus::{
use alloy_eips::merge::BEACON_NONCE;
use alloy_primitives::logs_bloom;
use alloy_rpc_types_eth::Withdrawals;
use reth_ethereum::{Receipt, TransactionSigned};
use reth_ethereum::Receipt;
use reth_evm::{
block::{BlockExecutionError, BlockExecutorFactory},
block::{BlockExecutionError, BlockExecutionResult, BlockExecutorFactory},
execute::{BlockAssembler, BlockAssemblerInput},
};
use reth_evm_ethereum::EthBlockAssembler;
use reth_execution_types::BlockExecutionResult;
use reth_primitives::Block;
use reth_primitives_traits::SignedTransaction;
use reth_revm::context::Block as _;

use crate::factory::TaikoBlockExecutionCtx;
Expand Down Expand Up @@ -43,12 +43,12 @@ impl<F> BlockAssembler<F> for TaikoBlockAssembler
where
F: for<'a> BlockExecutorFactory<
ExecutionCtx<'a> = TaikoBlockExecutionCtx<'a>,
Transaction = TransactionSigned,
Transaction: SignedTransaction,
Receipt = Receipt,
>,
{
/// The block type produced by the assembler.
type Block = Block;
type Block = Block<F::Transaction>;

/// Builds a Taiko network block.
fn assemble_block(
Expand Down
Loading