diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 76e9bfcaaa2..d17ebe3c176 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -76,7 +76,7 @@ body:
id: terms
attributes:
label: Code of Conduct
- description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/paradigmxyz/reth/blob/main/CONTRIBUTING.md#code-of-conduct)
+ description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/foundry-rs/reth/blob/main/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow the Code of Conduct
required: true
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index db26044dfa5..cd5b3f54d6a 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -5,6 +5,7 @@ on:
branches: [main]
env:
+ RUSTFLAGS: -D warnings
CARGO_TERM_COLOR: always
concurrency:
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
deleted file mode 100644
index e731a7a5692..00000000000
--- a/.github/workflows/dependencies.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Automatically run `cargo update` periodically
-
-name: Update Dependencies
-
-on:
- schedule:
- # Run weekly
- - cron: "0 0 * * SUN"
- workflow_dispatch:
- # Needed so we can run it manually
-
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BRANCH: cargo-update
- TITLE: "chore(deps): weekly `cargo update`"
- BODY: |
- Automation to keep dependencies in `Cargo.lock` current.
-
- cargo update log
-
-
- ```log
- $cargo_update_log
- ```
-
-
-
+$ reth db drop --help
-Arguments:
-
- The table name
+Usage: reth db drop [OPTIONS]
Options:
--datadir
@@ -189,11 +116,6 @@ Options:
[default: default]
- -s, --skip
- Skip first N entries
-
- [default: 0]
-
--chain
The chain this node is running.
@@ -206,17 +128,6 @@ Options:
[default: mainnet]
- -r, --reverse
- Reverse the order of the entries. If enabled last table entries are read
-
- -l, --len
- How many items to take from the walker
-
- [default: 5]
-
- -j, --json
- Dump as JSON instead of using TUI
-
-h, --help
Print help (see a summary with '-h')
@@ -327,14 +238,18 @@ Display:
Silence all log output
```
-## `reth db drop`
+## `reth db list`
-Deletes all database entries
+Lists the contents of a table
```bash
-$ reth db drop --help
+$ reth db list --help
-Usage: reth db drop [OPTIONS]
+Usage: reth db list [OPTIONS]
+
+Arguments:
+
+ The table name
Options:
--datadir
@@ -348,6 +263,11 @@ Options:
[default: default]
+ -s, --skip
+ Skip first N entries
+
+ [default: 0]
+
--chain
The chain this node is running.
@@ -360,6 +280,17 @@ Options:
[default: mainnet]
+ -r, --reverse
+ Reverse the order of the entries. If enabled last table entries are read
+
+ -l, --len
+ How many items to take from the walker
+
+ [default: 5]
+
+ -j, --json
+ Dump as JSON instead of using TUI
+
-h, --help
Print help (see a summary with '-h')
@@ -394,18 +325,14 @@ Display:
Silence all log output
```
-## `reth db clear`
+## `reth db path`
-Deletes all table entries
+Returns the full database path
```bash
-$ reth db clear --help
-
-Usage: reth db clear [OPTIONS]
+$ reth db path --help
-Arguments:
-
- Table name
+Usage: reth db path [OPTIONS]
Options:
--datadir
@@ -465,14 +392,14 @@ Display:
Silence all log output
```
-## `reth db version`
+## `reth db stats`
-Lists current and local database versions
+Lists all the tables, their entry count and their size
```bash
-$ reth db version --help
+$ reth db stats --help
-Usage: reth db version [OPTIONS]
+Usage: reth db stats [OPTIONS]
Options:
--datadir
@@ -532,14 +459,14 @@ Display:
Silence all log output
```
-## `reth db path`
+## `reth db version`
-Returns the full database path
+Lists current and local database versions
```bash
-$ reth db path --help
+$ reth db version --help
-Usage: reth db path [OPTIONS]
+Usage: reth db version [OPTIONS]
Options:
--datadir
diff --git a/crates/blockchain-tree/src/blockchain_tree.rs b/crates/blockchain-tree/src/blockchain_tree.rs
index 8edee773bad..ce92f48b283 100644
--- a/crates/blockchain-tree/src/blockchain_tree.rs
+++ b/crates/blockchain-tree/src/blockchain_tree.rs
@@ -1001,12 +1001,9 @@ impl BlockchainTree
old: Arc::new(old_canon_chain.clone()),
new: Arc::new(new_canon_chain.clone()),
};
- let reorg_depth = old_canon_chain.len();
-
// insert old canon chain
self.insert_chain(AppendableChain::new(old_canon_chain));
-
- self.update_reorg_metrics(reorg_depth as f64);
+ self.metrics.reorgs.increment(1);
} else {
// error here to confirm that we are reverting nothing from db.
error!(target: "blockchain_tree", "Reverting nothing from db on block: #{:?}", block_hash);
@@ -1097,11 +1094,6 @@ impl BlockchainTree
}
}
- fn update_reorg_metrics(&mut self, reorg_depth: f64) {
- self.metrics.reorgs.increment(1);
- self.metrics.latest_reorg_depth.set(reorg_depth);
- }
-
/// Update blockchain tree chains (canonical and sidechains) and sync metrics.
///
/// NOTE: this method should not be called during the pipeline sync, because otherwise the sync
diff --git a/crates/blockchain-tree/src/metrics.rs b/crates/blockchain-tree/src/metrics.rs
index b49ad3c5b92..fd48307d4be 100644
--- a/crates/blockchain-tree/src/metrics.rs
+++ b/crates/blockchain-tree/src/metrics.rs
@@ -13,8 +13,6 @@ pub struct TreeMetrics {
pub canonical_chain_height: Gauge,
/// The number of reorgs
pub reorgs: Counter,
- /// The latest reorg depth
- pub latest_reorg_depth: Gauge,
/// Longest sidechain height
pub longest_sidechain_height: Gauge,
}
diff --git a/crates/consensus/auto-seal/src/lib.rs b/crates/consensus/auto-seal/src/lib.rs
index 29cb6f49177..668a2117f6b 100644
--- a/crates/consensus/auto-seal/src/lib.rs
+++ b/crates/consensus/auto-seal/src/lib.rs
@@ -269,8 +269,6 @@ impl StorageInner {
nonce: 0,
base_fee_per_gas,
extra_data: Default::default(),
- blob_gas_used: None,
- excess_blob_gas: None,
};
header.transactions_root = if transactions.is_empty() {
diff --git a/crates/consensus/beacon/src/engine/message.rs b/crates/consensus/beacon/src/engine/message.rs
index 76808558595..2e5e542aab1 100644
--- a/crates/consensus/beacon/src/engine/message.rs
+++ b/crates/consensus/beacon/src/engine/message.rs
@@ -145,7 +145,6 @@ impl Future for PendingPayloadId {
/// A message for the beacon engine from other components of the node (engine RPC API invoked by the
/// consensus layer).
#[derive(Debug)]
-#[allow(clippy::large_enum_variant)]
pub enum BeaconEngineMessage {
/// Message with new payload.
NewPayload {
diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs
index 3aea32b5b45..5fffb7f2a2e 100644
--- a/crates/consensus/common/src/validation.rs
+++ b/crates/consensus/common/src/validation.rs
@@ -1,13 +1,8 @@
//! Collection of methods for block validation.
use reth_interfaces::{consensus::ConsensusError, Result as RethResult};
use reth_primitives::{
- blobfee::calculate_excess_blob_gas,
- constants::{
- self,
- eip4844::{DATA_GAS_PER_BLOB, MAX_DATA_GAS_PER_BLOCK},
- },
- BlockNumber, ChainSpec, Hardfork, Header, InvalidTransactionError, SealedBlock, SealedHeader,
- Transaction, TransactionSignedEcRecovered, TxEip1559, TxEip2930, TxLegacy,
+ constants, BlockNumber, ChainSpec, Hardfork, Header, InvalidTransactionError, SealedBlock,
+ SealedHeader, Transaction, TransactionSignedEcRecovered, TxEip1559, TxEip2930, TxLegacy,
};
use reth_provider::{AccountReader, HeaderProvider, WithdrawalsProvider};
use std::collections::{hash_map::Entry, HashMap};
@@ -46,15 +41,6 @@ pub fn validate_header_standalone(
return Err(ConsensusError::WithdrawalsRootUnexpected)
}
- // Ensures that EIP-4844 fields are valid once cancun is active.
- if chain_spec.fork(Hardfork::Cancun).active_at_timestamp(header.timestamp) {
- validate_4844_header_standalone(header)?;
- } else if header.blob_gas_used.is_some() {
- return Err(ConsensusError::BlobGasUsedUnexpected)
- } else if header.excess_blob_gas.is_some() {
- return Err(ConsensusError::ExcessBlobGasUnexpected)
- }
-
Ok(())
}
@@ -315,11 +301,6 @@ pub fn validate_header_regarding_parent(
}
}
- // ensure that the blob gas fields for this block
- if chain_spec.fork(Hardfork::Cancun).active_at_timestamp(child.timestamp) {
- validate_4844_header_with_parent(parent, child)?;
- }
-
Ok(())
}
@@ -405,72 +386,6 @@ pub fn full_validation Result<(), ConsensusError> {
- // From [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844#header-extension):
- //
- // > For the first post-fork block, both parent.blob_gas_used and parent.excess_blob_gas
- // > are evaluated as 0.
- //
- // This means in the first post-fork block, calculate_excess_blob_gas will return 0.
- let parent_blob_gas_used = parent.blob_gas_used.unwrap_or(0);
- let parent_excess_blob_gas = parent.excess_blob_gas.unwrap_or(0);
-
- if child.blob_gas_used.is_none() {
- return Err(ConsensusError::BlobGasUsedMissing)
- }
- let excess_blob_gas = child.excess_blob_gas.ok_or(ConsensusError::ExcessBlobGasMissing)?;
-
- let expected_excess_blob_gas =
- calculate_excess_blob_gas(parent_excess_blob_gas, parent_blob_gas_used);
- if expected_excess_blob_gas != excess_blob_gas {
- return Err(ConsensusError::ExcessBlobGasDiff {
- expected: expected_excess_blob_gas,
- got: excess_blob_gas,
- parent_excess_blob_gas,
- parent_blob_gas_used,
- })
- }
-
- Ok(())
-}
-
-/// Validates that the EIP-4844 header fields exist and conform to the spec. This ensures that:
-///
-/// * `blob_gas_used` exists as a header field
-/// * `excess_blob_gas` exists as a header field
-/// * `blob_gas_used` is less than or equal to `MAX_DATA_GAS_PER_BLOCK`
-/// * `blob_gas_used` is a multiple of `DATA_GAS_PER_BLOB`
-pub fn validate_4844_header_standalone(header: &SealedHeader) -> Result<(), ConsensusError> {
- let blob_gas_used = header.blob_gas_used.ok_or(ConsensusError::BlobGasUsedMissing)?;
-
- if header.excess_blob_gas.is_none() {
- return Err(ConsensusError::ExcessBlobGasMissing)
- }
-
- if blob_gas_used > MAX_DATA_GAS_PER_BLOCK {
- return Err(ConsensusError::BlobGasUsedExceedsMaxBlobGasPerBlock {
- blob_gas_used,
- max_blob_gas_per_block: MAX_DATA_GAS_PER_BLOCK,
- })
- }
-
- if blob_gas_used % DATA_GAS_PER_BLOB != 0 {
- return Err(ConsensusError::BlobGasUsedNotMultipleOfBlobGasPerBlob {
- blob_gas_used,
- blob_gas_per_blob: DATA_GAS_PER_BLOB,
- })
- }
-
- Ok(())
-}
-
#[cfg(test)]
mod tests {
use super::*;
@@ -625,8 +540,6 @@ mod tests {
nonce: 0x0000000000000000,
base_fee_per_gas: 0x28f0001df.into(),
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
};
// size: 0x9b5
diff --git a/crates/interfaces/src/consensus.rs b/crates/interfaces/src/consensus.rs
index 76c2175c9af..16f4d6c07ad 100644
--- a/crates/interfaces/src/consensus.rs
+++ b/crates/interfaces/src/consensus.rs
@@ -113,27 +113,6 @@ pub enum ConsensusError {
WithdrawalIndexInvalid { got: u64, expected: u64 },
#[error("Missing withdrawals")]
BodyWithdrawalsMissing,
- #[error("Missing blob gas used")]
- BlobGasUsedMissing,
- #[error("Unexpected blob gas used")]
- BlobGasUsedUnexpected,
- #[error("Missing excess blob gas")]
- ExcessBlobGasMissing,
- #[error("Unexpected excess blob gas")]
- ExcessBlobGasUnexpected,
- #[error("Blob gas used {blob_gas_used} exceeds maximum allowance {max_blob_gas_per_block}")]
- BlobGasUsedExceedsMaxBlobGasPerBlock { blob_gas_used: u64, max_blob_gas_per_block: u64 },
- #[error(
- "Blob gas used {blob_gas_used} is not a multiple of blob gas per blob {blob_gas_per_blob}"
- )]
- BlobGasUsedNotMultipleOfBlobGasPerBlob { blob_gas_used: u64, blob_gas_per_blob: u64 },
- #[error("Invalid excess blob gas. Expected: {expected}, got: {got}. Parent excess blob gas: {parent_excess_blob_gas}, parent blob gas used: {parent_blob_gas_used}.")]
- ExcessBlobGasDiff {
- expected: u64,
- got: u64,
- parent_excess_blob_gas: u64,
- parent_blob_gas_used: u64,
- },
/// Error for a transaction that violates consensus.
#[error(transparent)]
InvalidTransaction(#[from] InvalidTransactionError),
diff --git a/crates/net/downloaders/Cargo.toml b/crates/net/downloaders/Cargo.toml
index 281dbfc6c78..b5ca3d6b5b0 100644
--- a/crates/net/downloaders/Cargo.toml
+++ b/crates/net/downloaders/Cargo.toml
@@ -32,7 +32,7 @@ thiserror.workspace = true
# optional deps for the test-utils feature
reth-rlp = { workspace = true, optional = true }
tempfile = { version = "3.3", optional = true }
-itertools = { workspace = true, optional = true }
+itertools = { version = "0.10", optional = true }
[dev-dependencies]
reth-db = { path = "../../storage/db", features = ["test-utils"] }
@@ -42,7 +42,7 @@ reth-tracing = { path = "../../tracing" }
assert_matches = "1.5.0"
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
reth-rlp.workspace = true
-itertools.workspace = true
+itertools = "0.10"
tempfile = "3.3"
diff --git a/crates/net/eth-wire/src/types/blocks.rs b/crates/net/eth-wire/src/types/blocks.rs
index 808c8f4a460..47777cd71b1 100644
--- a/crates/net/eth-wire/src/types/blocks.rs
+++ b/crates/net/eth-wire/src/types/blocks.rs
@@ -258,8 +258,6 @@ mod test {
nonce: 0x0000000000000000u64,
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
},
]),
}.encode(&mut data);
@@ -291,8 +289,6 @@ mod test {
nonce: 0x0000000000000000u64,
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
},
]),
};
@@ -405,8 +401,6 @@ mod test {
nonce: 0x0000000000000000u64,
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
},
],
withdrawals: None,
@@ -491,8 +485,6 @@ mod test {
nonce: 0x0000000000000000u64,
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
},
],
withdrawals: None,
diff --git a/crates/net/network/src/eth_requests.rs b/crates/net/network/src/eth_requests.rs
index 10b53f61701..7cb4db72b37 100644
--- a/crates/net/network/src/eth_requests.rs
+++ b/crates/net/network/src/eth_requests.rs
@@ -8,7 +8,7 @@ use reth_eth_wire::{
};
use reth_interfaces::p2p::error::RequestResult;
use reth_primitives::{BlockBody, BlockHashOrNumber, Header, HeadersDirection, PeerId};
-use reth_provider::{BlockReader, HeaderProvider, ReceiptProvider};
+use reth_provider::{BlockReader, HeaderProvider};
use std::{
borrow::Borrow,
future::Future,
@@ -21,11 +21,6 @@ use tokio_stream::wrappers::ReceiverStream;
// Limits:
-/// Maximum number of receipts to serve.
-///
-/// Used to limit lookups.
-const MAX_RECEIPTS_SERVE: usize = 1024;
-
/// Maximum number of block headers to serve.
///
/// Used to limit lookups.
@@ -37,9 +32,6 @@ const MAX_HEADERS_SERVE: usize = 1024;
/// SOFT_RESPONSE_LIMIT.
const MAX_BODIES_SERVE: usize = 1024;
-/// Estimated size in bytes of an RLP encoded receipt.
-const APPROX_RECEIPT_SIZE: usize = 24 * 1024;
-
/// Estimated size in bytes of an RLP encoded body.
// TODO: check 24kb blocksize assumption
const APPROX_BODY_SIZE: usize = 24 * 1024;
@@ -78,7 +70,7 @@ impl EthRequestHandler {
impl EthRequestHandler
where
- C: BlockReader + HeaderProvider + ReceiptProvider,
+ C: BlockReader + HeaderProvider,
{
/// Returns the list of requested headers
fn get_headers_response(&self, request: GetBlockHeaders) -> Vec {
@@ -193,44 +185,6 @@ where
let _ = response.send(Ok(BlockBodies(bodies)));
}
-
- fn on_receipts_request(
- &mut self,
- _peer_id: PeerId,
- request: GetReceipts,
- response: oneshot::Sender>,
- ) {
- let mut receipts = Vec::new();
-
- let mut total_bytes = APPROX_RECEIPT_SIZE;
-
- for hash in request.0 {
- if let Some(receipts_by_block) =
- self.client.receipts_by_block(BlockHashOrNumber::Hash(hash)).unwrap_or_default()
- {
- receipts.push(
- receipts_by_block
- .into_iter()
- .map(|receipt| receipt.with_bloom())
- .collect::>(),
- );
-
- total_bytes += APPROX_RECEIPT_SIZE;
-
- if total_bytes > SOFT_RESPONSE_LIMIT {
- break
- }
-
- if receipts.len() >= MAX_RECEIPTS_SERVE {
- break
- }
- } else {
- break
- }
- }
-
- let _ = response.send(Ok(Receipts(receipts)));
- }
}
/// An endless future.
@@ -257,9 +211,7 @@ where
this.on_bodies_request(peer_id, request, response)
}
IncomingEthRequest::GetNodeData { .. } => {}
- IncomingEthRequest::GetReceipts { peer_id, request, response } => {
- this.on_receipts_request(peer_id, request, response)
- }
+ IncomingEthRequest::GetReceipts { .. } => {}
},
}
}
diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs
index 3ed0a6873ce..bf12796f2dd 100644
--- a/crates/payload/basic/src/lib.rs
+++ b/crates/payload/basic/src/lib.rs
@@ -716,8 +716,6 @@ fn build_payload(
difficulty: U256::ZERO,
gas_used: cumulative_gas_used,
extra_data: extra_data.into(),
- blob_gas_used: None,
- excess_blob_gas: None,
};
// seal the block
@@ -789,8 +787,6 @@ where
difficulty: U256::ZERO,
gas_used: 0,
extra_data: extra_data.into(),
- blob_gas_used: None,
- excess_blob_gas: None,
};
let block = Block { header, body: vec![], ommers: vec![], withdrawals };
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
index bfdfcc9c846..42570da25e2 100644
--- a/crates/primitives/Cargo.toml
+++ b/crates/primitives/Cargo.toml
@@ -22,7 +22,7 @@ crunchy = { version = "0.2.2", default-features = false, features = ["limit_256"
ruint = { version = "1.9.0", features = ["primitive-types", "rlp"] }
# Bloom
- fixed-hash = { version = "0.8", default-features = false, features = ["rustc-hex"] }
+fixed-hash = { version = "0.8", default-features = false, features = ["rustc-hex"] }
# crypto
secp256k1 = { workspace = true, default-features = false, features = [
diff --git a/crates/primitives/src/blobfee.rs b/crates/primitives/src/blobfee.rs
deleted file mode 100644
index e82b5d2f8c6..00000000000
--- a/crates/primitives/src/blobfee.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! Helpers for working with EIP-4844 blob fee
-
-use crate::constants::eip4844::TARGET_DATA_GAS_PER_BLOCK;
-
-/// Calculates the excess data gas for the next block, after applying the current set of blobs on
-/// top of the excess data gas.
-///
-/// Specified in [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844#header-extension)
-pub fn calculate_excess_blob_gas(parent_excess_blob_gas: u64, parent_blob_gas_used: u64) -> u64 {
- let excess_blob_gas = parent_excess_blob_gas + parent_blob_gas_used;
- excess_blob_gas.saturating_sub(TARGET_DATA_GAS_PER_BLOCK)
-}
diff --git a/crates/primitives/src/chain/spec.rs b/crates/primitives/src/chain/spec.rs
index 552c1017df2..86db32ba0db 100644
--- a/crates/primitives/src/chain/spec.rs
+++ b/crates/primitives/src/chain/spec.rs
@@ -359,15 +359,6 @@ impl ChainSpec {
.unwrap_or_else(|| self.is_fork_active_at_timestamp(Hardfork::Shanghai, timestamp))
}
- /// Convenience method to check if [Hardfork::Cancun] is active at a given timestamp.
- #[inline]
- pub fn is_cancun_activated_at_timestamp(&self, timestamp: u64) -> bool {
- self.fork_timestamps
- .cancun
- .map(|cancun| timestamp >= cancun)
- .unwrap_or_else(|| self.is_fork_active_at_timestamp(Hardfork::Cancun, timestamp))
- }
-
/// Creates a [`ForkFilter`](crate::ForkFilter) for the block described by [Head].
pub fn fork_filter(&self, head: Head) -> ForkFilter {
let forks = self.forks_iter().filter_map(|(_, condition)| {
@@ -497,8 +488,6 @@ impl From for ChainSpec {
pub struct ForkTimestamps {
/// The timestamp of the shanghai fork
pub shanghai: Option,
- /// The timestamp of the cancun fork
- pub cancun: Option,
}
impl ForkTimestamps {
@@ -508,9 +497,6 @@ impl ForkTimestamps {
if let Some(shanghai) = forks.get(&Hardfork::Shanghai).and_then(|f| f.as_timestamp()) {
timestamps = timestamps.shanghai(shanghai);
}
- if let Some(cancun) = forks.get(&Hardfork::Cancun).and_then(|f| f.as_timestamp()) {
- timestamps = timestamps.cancun(cancun);
- }
timestamps
}
@@ -519,12 +505,6 @@ impl ForkTimestamps {
self.shanghai = Some(shanghai);
self
}
-
- /// Sets the given cancun timestamp
- pub fn cancun(mut self, cancun: u64) -> Self {
- self.cancun = Some(cancun);
- self
- }
}
/// A helper type for compatibility with geth's config
@@ -693,13 +673,6 @@ impl ChainSpecBuilder {
self
}
- /// Enable Cancun at genesis.
- pub fn cancun_activated(mut self) -> Self {
- self = self.paris_activated();
- self.hardforks.insert(Hardfork::Cancun, ForkCondition::Timestamp(0));
- self
- }
-
/// Enable Bedrock at genesis
#[cfg(feature = "optimism")]
pub fn bedrock_activated(mut self) -> Self {
diff --git a/crates/primitives/src/hardfork.rs b/crates/primitives/src/hardfork.rs
index b0f5dfde04a..f772e8c6cc2 100644
--- a/crates/primitives/src/hardfork.rs
+++ b/crates/primitives/src/hardfork.rs
@@ -39,8 +39,6 @@ pub enum Hardfork {
Paris,
/// Shanghai.
Shanghai,
- /// Cancun.
- Cancun,
/// Bedrock.
#[cfg(feature = "optimism")]
Bedrock,
@@ -90,7 +88,6 @@ impl FromStr for Hardfork {
"grayglacier" => Hardfork::GrayGlacier,
"paris" => Hardfork::Paris,
"shanghai" => Hardfork::Shanghai,
- "cancun" => Hardfork::Cancun,
#[cfg(feature = "optimism")]
"bedrock" => Hardfork::Bedrock,
#[cfg(feature = "optimism")]
@@ -110,6 +107,7 @@ impl Display for Hardfork {
#[cfg(test)]
mod tests {
use super::*;
+
use crate::{Chain, Genesis};
use std::collections::BTreeMap;
@@ -132,7 +130,6 @@ mod tests {
"grayglacier",
"PARIS",
"ShAnGhAI",
- "CaNcUn",
];
let expected_hardforks = [
Hardfork::Frontier,
@@ -151,7 +148,6 @@ mod tests {
Hardfork::GrayGlacier,
Hardfork::Paris,
Hardfork::Shanghai,
- Hardfork::Cancun,
];
let hardforks: Vec =
diff --git a/crates/primitives/src/header.rs b/crates/primitives/src/header.rs
index e39c6a8287a..ba8e8f31deb 100644
--- a/crates/primitives/src/header.rs
+++ b/crates/primitives/src/header.rs
@@ -1,6 +1,5 @@
use crate::{
basefee::calculate_next_block_base_fee,
- blobfee::calculate_excess_blob_gas,
keccak256,
proofs::{EMPTY_LIST_HASH, EMPTY_ROOT},
BlockBodyRoots, BlockHash, BlockNumHash, BlockNumber, Bloom, Bytes, H160, H256, H64, U256,
@@ -8,7 +7,7 @@ use crate::{
use bytes::{Buf, BufMut, BytesMut};
use reth_codecs::{add_arbitrary_tests, derive_arbitrary, main_codec, Compact};
-use reth_rlp::{length_of_length, Decodable, Encodable, EMPTY_LIST_CODE, EMPTY_STRING_CODE};
+use reth_rlp::{length_of_length, Decodable, Encodable, EMPTY_STRING_CODE};
use serde::{Deserialize, Serialize};
use std::{
mem,
@@ -92,13 +91,6 @@ pub struct Header {
/// above the gas target, and decreasing when blocks are below the gas target. The base fee per
/// gas is burned.
pub base_fee_per_gas: Option,
- /// The total amount of blob gas consumed by the transactions within the block, added in
- /// EIP-4844.
- pub blob_gas_used: Option,
- /// A running total of blob gas consumed in excess of the target, prior to the block. Blocks
- /// with above-target blob gas consumption increase this value, blocks with below-target blob
- /// gas consumption decrease it (bounded at 0). This was added in EIP-4844.
- pub excess_blob_gas: Option,
/// An arbitrary byte array containing data relevant to this block. This must be 32 bytes or
/// fewer; formally Hx.
pub extra_data: Bytes,
@@ -124,8 +116,6 @@ impl Default for Header {
nonce: 0,
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
}
}
}
@@ -180,13 +170,6 @@ impl Header {
Some(calculate_next_block_base_fee(self.gas_used, self.gas_limit, self.base_fee_per_gas?))
}
- /// Calculate excess blob gas for the next block according to the EIP-4844 spec.
- ///
- /// Returns a `None` if no excess blob gas is set, no EIP-4844 support
- pub fn next_block_excess_blob_gas(&self) -> Option {
- Some(calculate_excess_blob_gas(self.excess_blob_gas?, self.blob_gas_used?))
- }
-
/// Seal the header with a known hash.
///
/// WARNING: This method does not perform validation whether the hash is correct.
@@ -219,8 +202,6 @@ impl Header {
mem::size_of::() + // mix hash
mem::size_of::() + // nonce
mem::size_of::>() + // base fee per gas
- mem::size_of::>() + // blob gas used
- mem::size_of::>() + // excess blob gas
self.extra_data.len() // extra data
}
@@ -244,34 +225,11 @@ impl Header {
if let Some(base_fee) = self.base_fee_per_gas {
length += U256::from(base_fee).length();
- } else if self.withdrawals_root.is_some() ||
- self.blob_gas_used.is_some() ||
- self.excess_blob_gas.is_some()
- {
- length += 1; // EMPTY STRING CODE
+ } else if self.withdrawals_root.is_some() {
+ length += 1; // EMTY STRING CODE
}
-
if let Some(root) = self.withdrawals_root {
length += root.length();
- } else if self.blob_gas_used.is_some() || self.excess_blob_gas.is_some() {
- length += 1; // EMPTY STRING CODE
- }
-
- if let Some(blob_gas_used) = self.blob_gas_used {
- length += U256::from(blob_gas_used).length();
- } else if self.excess_blob_gas.is_some() {
- length += 1; // EMPTY STRING CODE
- }
-
- // Encode excess blob gas length. If new fields are added, the above pattern will need to
- // be repeated and placeholder length added. Otherwise, it's impossible to tell _which_
- // fields are missing. This is mainly relevant for contrived cases where a header is
- // created at random, for example:
- // * A header is created with a withdrawals root, but no base fee. Shanghai blocks are
- // post-London, so this is technically not valid. However, a tool like proptest would
- // generate a block like this.
- if let Some(excess_blob_gas) = self.excess_blob_gas {
- length += U256::from(excess_blob_gas).length();
}
length
@@ -303,38 +261,12 @@ impl Encodable for Header {
// but withdrawals root is present.
if let Some(ref base_fee) = self.base_fee_per_gas {
U256::from(*base_fee).encode(out);
- } else if self.withdrawals_root.is_some() ||
- self.blob_gas_used.is_some() ||
- self.excess_blob_gas.is_some()
- {
+ } else if self.withdrawals_root.is_some() {
out.put_u8(EMPTY_STRING_CODE);
}
- // Encode withdrawals root. Put empty string if withdrawals root is missing,
- // but blob gas used is present.
if let Some(ref root) = self.withdrawals_root {
root.encode(out);
- } else if self.blob_gas_used.is_some() || self.excess_blob_gas.is_some() {
- out.put_u8(EMPTY_STRING_CODE);
- }
-
- // Encode blob gas used. Put empty string if blob gas used is missing,
- // but excess blob gas is present.
- if let Some(ref blob_gas_used) = self.blob_gas_used {
- U256::from(*blob_gas_used).encode(out);
- } else if self.excess_blob_gas.is_some() {
- out.put_u8(EMPTY_LIST_CODE);
- }
-
- // Encode excess blob gas. If new fields are added, the above pattern will need to be
- // repeated and placeholders added. Otherwise, it's impossible to tell _which_ fields
- // are missing. This is mainly relevant for contrived cases where a header is created
- // at random, for example:
- // * A header is created with a withdrawals root, but no base fee. Shanghai blocks are
- // post-London, so this is technically not valid. However, a tool like proptest would
- // generate a block like this.
- if let Some(ref excess_blob_gas) = self.excess_blob_gas {
- U256::from(*excess_blob_gas).encode(out);
}
}
@@ -371,10 +303,7 @@ impl Decodable for Header {
nonce: H64::decode(buf)?.to_low_u64_be(),
base_fee_per_gas: None,
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
};
-
if started_len - buf.len() < rlp_head.payload_length {
if buf.first().map(|b| *b == EMPTY_STRING_CODE).unwrap_or_default() {
buf.advance(1)
@@ -382,36 +311,9 @@ impl Decodable for Header {
this.base_fee_per_gas = Some(U256::decode(buf)?.to::());
}
}
-
- // Withdrawals root for post-shanghai headers
- if started_len - buf.len() < rlp_head.payload_length {
- if buf.first().map(|b| *b == EMPTY_STRING_CODE).unwrap_or_default() {
- buf.advance(1)
- } else {
- this.withdrawals_root = Some(Decodable::decode(buf)?);
- }
- }
-
- // Blob gas used and excess blob gas for post-cancun headers
- if started_len - buf.len() < rlp_head.payload_length {
- if buf.first().map(|b| *b == EMPTY_LIST_CODE).unwrap_or_default() {
- buf.advance(1)
- } else {
- this.blob_gas_used = Some(U256::decode(buf)?.to::());
- }
- }
-
- // Decode excess blob gas. If new fields are added, the above pattern will need to be
- // repeated and placeholders decoded. Otherwise, it's impossible to tell _which_ fields are
- // missing. This is mainly relevant for contrived cases where a header is created at
- // random, for example:
- // * A header is created with a withdrawals root, but no base fee. Shanghai blocks are
- // post-London, so this is technically not valid. However, a tool like proptest would
- // generate a block like this.
if started_len - buf.len() < rlp_head.payload_length {
- this.excess_blob_gas = Some(U256::decode(buf)?.to::());
+ this.withdrawals_root = Some(Decodable::decode(buf)?);
}
-
let consumed = started_len - buf.len();
if consumed != rlp_head.payload_length {
return Err(reth_rlp::DecodeError::ListLengthMismatch {
@@ -634,8 +536,6 @@ mod ethers_compat {
gas_used: block.gas_used.as_u64(),
withdrawals_root: None,
logs_bloom: block.logs_bloom.unwrap_or_default().0.into(),
- blob_gas_used: None,
- excess_blob_gas: None,
}
}
}
@@ -705,8 +605,6 @@ mod tests {
nonce: 0,
base_fee_per_gas: Some(0x036b_u64),
withdrawals_root: None,
- blob_gas_used: None,
- excess_blob_gas: None,
};
assert_eq!(header.hash_slow(), expected_hash);
}
@@ -785,120 +683,6 @@ mod tests {
assert_eq!(header.hash_slow(), expected_hash);
}
- // Test vector from: https://github.com/ethereum/tests/blob/7e9e0940c0fcdbead8af3078ede70f969109bd85/BlockchainTests/ValidBlocks/bcExample/cancunExample.json
- #[test]
- fn test_decode_block_header_with_blob_fields_ef_tests() {
- let data = hex::decode("f90221a03a9b485972e7353edd9152712492f0c58d89ef80623686b6bf947a4a6dce6cb6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c837fc158e3e93eafcaf2e658a02f5d8f99abc9f1c4c66cdea96c0ca26406aea04409cc4b699384ba5f8248d92b784713610c5ff9c1de51e9239da0dac76de9cea046cab26abf1047b5b119ecc2dda1296b071766c8b1307e1381fcecc90d513d86b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff8302a86582079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000009a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218302000080").unwrap();
- let expected = Header {
- parent_hash: H256::from_str(
- "3a9b485972e7353edd9152712492f0c58d89ef80623686b6bf947a4a6dce6cb6",
- )
- .unwrap(),
- ommers_hash: H256::from_str(
- "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
- )
- .unwrap(),
- beneficiary: Address::from_str("2adc25665018aa1fe0e6bc666dac8fc2697ff9ba").unwrap(),
- state_root: H256::from_str(
- "3c837fc158e3e93eafcaf2e658a02f5d8f99abc9f1c4c66cdea96c0ca26406ae",
- )
- .unwrap(),
- transactions_root: H256::from_str(
- "4409cc4b699384ba5f8248d92b784713610c5ff9c1de51e9239da0dac76de9ce",
- )
- .unwrap(),
- receipts_root: H256::from_str(
- "46cab26abf1047b5b119ecc2dda1296b071766c8b1307e1381fcecc90d513d86",
- )
- .unwrap(),
- logs_bloom: Default::default(),
- difficulty: U256::from(0),
- number: 0x1,
- gas_limit: 0x7fffffffffffffff,
- gas_used: 0x02a865,
- timestamp: 0x079e,
- extra_data: Bytes::from(vec![0x42]),
- mix_hash: H256::from_str(
- "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
- )
- .unwrap(),
- nonce: 0,
- base_fee_per_gas: Some(9),
- withdrawals_root: Some(
- H256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
- .unwrap(),
- ),
- blob_gas_used: Some(0x020000),
- excess_blob_gas: Some(0),
- };
-
- let header = Header::decode(&mut data.as_slice()).unwrap();
- assert_eq!(header, expected);
-
- let expected_hash =
- H256::from_str("0x10aca3ebb4cf6ddd9e945a5db19385f9c105ede7374380c50d56384c3d233785")
- .unwrap();
- assert_eq!(header.hash_slow(), expected_hash);
- }
-
- #[test]
- fn test_decode_block_header_with_blob_fields() {
- // Block from devnet-7
- let data = hex::decode("f90239a013a7ec98912f917b3e804654e37c9866092043c13eb8eab94eb64818e886cff5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794f97e180c050e5ab072211ad2c213eb5aee4df134a0ec229dbe85b0d3643ad0f471e6ec1a36bbc87deffbbd970762d22a53b35d068aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080830305988401c9c380808464c40d5499d883010c01846765746888676f312e32302e35856c696e7578a070ccadc40b16e2094954b1064749cc6fbac783c1712f1b271a8aac3eda2f232588000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421808401600000").unwrap();
- let expected = Header {
- parent_hash: H256::from_str(
- "13a7ec98912f917b3e804654e37c9866092043c13eb8eab94eb64818e886cff5",
- )
- .unwrap(),
- ommers_hash: H256::from_str(
- "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
- )
- .unwrap(),
- beneficiary: Address::from_str("f97e180c050e5ab072211ad2c213eb5aee4df134").unwrap(),
- state_root: H256::from_str(
- "ec229dbe85b0d3643ad0f471e6ec1a36bbc87deffbbd970762d22a53b35d068a",
- )
- .unwrap(),
- transactions_root: H256::from_str(
- "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
- )
- .unwrap(),
- receipts_root: H256::from_str(
- "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
- )
- .unwrap(),
- logs_bloom: Default::default(),
- difficulty: U256::from(0),
- number: 0x30598,
- gas_limit: 0x1c9c380,
- gas_used: 0,
- timestamp: 0x64c40d54,
- extra_data: Bytes::from(
- hex::decode("d883010c01846765746888676f312e32302e35856c696e7578").unwrap(),
- ),
- mix_hash: H256::from_str(
- "70ccadc40b16e2094954b1064749cc6fbac783c1712f1b271a8aac3eda2f2325",
- )
- .unwrap(),
- nonce: 0,
- base_fee_per_gas: Some(7),
- withdrawals_root: Some(
- H256::from_str("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
- .unwrap(),
- ),
- blob_gas_used: Some(0),
- excess_blob_gas: Some(0x1600000),
- };
-
- let header = Header::decode(&mut data.as_slice()).unwrap();
- assert_eq!(header, expected);
-
- let expected_hash =
- H256::from_str("0x539c9ea0a3ca49808799d3964b8b6607037227de26bc51073c6926963127087b")
- .unwrap();
- assert_eq!(header.hash_slow(), expected_hash);
- }
-
#[test]
fn sanity_direction() {
let reverse = true;
diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs
index 36c6ce3e58a..f8ae0d08350 100644
--- a/crates/primitives/src/lib.rs
+++ b/crates/primitives/src/lib.rs
@@ -23,7 +23,6 @@ pub mod abi;
mod account;
pub mod basefee;
mod bits;
-pub mod blobfee;
mod block;
pub mod bloom;
mod chain;
@@ -81,7 +80,7 @@ pub use net::{
SEPOLIA_BOOTNODES,
};
pub use peer::{PeerId, WithPeerId};
-pub use prune::{PruneCheckpoint, PruneMode, PruneModes, PrunePart, PrunePartError};
+pub use prune::{PruneCheckpoint, PruneMode, PruneModes, PrunePart};
pub use receipt::{Receipt, ReceiptWithBloom, ReceiptWithBloomRef};
pub use revm_primitives::JumpMap;
pub use serde_helper::JsonU256;
diff --git a/crates/primitives/src/prune/mod.rs b/crates/primitives/src/prune/mod.rs
index a3bcb959627..4dfc591bfcc 100644
--- a/crates/primitives/src/prune/mod.rs
+++ b/crates/primitives/src/prune/mod.rs
@@ -5,5 +5,5 @@ mod target;
pub use checkpoint::PruneCheckpoint;
pub use mode::PruneMode;
-pub use part::{PrunePart, PrunePartError};
+pub use part::PrunePart;
pub use target::PruneModes;
diff --git a/crates/primitives/src/prune/part.rs b/crates/primitives/src/prune/part.rs
index db49870735a..caa176b86a2 100644
--- a/crates/primitives/src/prune/part.rs
+++ b/crates/primitives/src/prune/part.rs
@@ -1,10 +1,8 @@
-use derive_more::Display;
use reth_codecs::{main_codec, Compact};
-use thiserror::Error;
/// Part of the data that can be pruned.
#[main_codec]
-#[derive(Debug, Display, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd)]
pub enum PrunePart {
/// Prune part responsible for the `TxSenders` table.
SenderRecovery,
@@ -18,14 +16,6 @@ pub enum PrunePart {
StorageHistory,
}
-/// PrunePart error type.
-#[derive(Debug, Error)]
-pub enum PrunePartError {
- /// Invalid configuration of a prune part.
- #[error("The configuration provided for {0} is invalid.")]
- Configuration(PrunePart),
-}
-
#[cfg(test)]
impl Default for PrunePart {
fn default() -> Self {
diff --git a/crates/primitives/src/prune/target.rs b/crates/primitives/src/prune/target.rs
index af6781897c2..b314ae9d038 100644
--- a/crates/primitives/src/prune/target.rs
+++ b/crates/primitives/src/prune/target.rs
@@ -1,7 +1,4 @@
-use crate::{
- prune::PrunePartError, serde_helper::deserialize_opt_prune_mode_with_min_blocks, BlockNumber,
- PruneMode, PrunePart,
-};
+use crate::{serde_helper::deserialize_opt_prune_mode_with_min_blocks, BlockNumber, PruneMode};
use paste::paste;
use serde::{Deserialize, Serialize};
@@ -22,16 +19,10 @@ pub struct PruneModes {
)]
pub receipts: Option,
/// Account History pruning configuration.
- #[serde(
- skip_serializing_if = "Option::is_none",
- deserialize_with = "deserialize_opt_prune_mode_with_min_blocks::<64, _>"
- )]
+ #[serde(skip_serializing_if = "Option::is_none")]
pub account_history: Option,
/// Storage History pruning configuration.
- #[serde(
- skip_serializing_if = "Option::is_none",
- deserialize_with = "deserialize_opt_prune_mode_with_min_blocks::<64, _>"
- )]
+ #[serde(skip_serializing_if = "Option::is_none")]
pub storage_history: Option,
}
@@ -60,15 +51,12 @@ macro_rules! impl_prune_parts {
$human_part,
" pruning needs to be done, inclusive, according to the provided tip."
)]
- pub fn [](&self, tip: BlockNumber) -> Result, PrunePartError> {
- match &self.$part {
- Some(mode) =>
- match self.prune_target_block(mode, tip, $min_blocks) {
- Some(block) => Ok(Some((block, *mode))),
- None => Err(PrunePartError::Configuration(PrunePart::[<$human_part>]))
- }
- None => Ok(None)
- }
+ pub fn [](&self, tip: BlockNumber) -> Option<(BlockNumber, PruneMode)> {
+ self.$part.as_ref().and_then(|mode| {
+ self.prune_target_block(mode, tip, $min_blocks).map(|block| {
+ (block, *mode)
+ })
+ })
}
}
)+
@@ -119,17 +107,17 @@ impl PruneModes {
Some(tip.saturating_sub(*distance))
}
PruneMode::Before(n) if tip.saturating_sub(*n) >= min_blocks.unwrap_or_default() => {
- Some(n.saturating_sub(1))
+ Some(*n)
}
_ => None,
}
}
impl_prune_parts!(
- (sender_recovery, "SenderRecovery", None),
- (transaction_lookup, "TransactionLookup", None),
+ (sender_recovery, "Sender Recovery", None),
+ (transaction_lookup, "Transaction Lookup", None),
(receipts, "Receipts", Some(64)),
- (account_history, "AccountHistory", Some(64)),
- (storage_history, "StorageHistory", Some(64))
+ (account_history, "Account History", None),
+ (storage_history, "Storage History", None)
);
}
diff --git a/crates/primitives/src/receipt.rs b/crates/primitives/src/receipt.rs
index 393b35f72be..85b286c1462 100644
--- a/crates/primitives/src/receipt.rs
+++ b/crates/primitives/src/receipt.rs
@@ -175,10 +175,6 @@ impl Decodable for ReceiptWithBloom {
buf.advance(1);
Self::decode_receipt(buf, TxType::EIP1559)
}
- 0x03 => {
- buf.advance(1);
- Self::decode_receipt(buf, TxType::EIP4844)
- }
#[cfg(feature = "optimism")]
0x7E => {
buf.advance(1);
@@ -287,9 +283,6 @@ impl<'a> ReceiptWithBloomEncoder<'a> {
TxType::EIP1559 => {
out.put_u8(0x02);
}
- TxType::EIP4844 => {
- out.put_u8(0x03);
- }
_ => unreachable!("legacy handled; qed."),
}
out.put_slice(payload.as_ref());
@@ -309,7 +302,7 @@ impl<'a> Encodable for ReceiptWithBloomEncoder<'a> {
fn length(&self) -> usize {
let mut payload_len = self.receipt_length();
// account for eip-2718 type prefix and set the list
- if matches!(self.receipt.tx_type, TxType::EIP1559 | TxType::EIP2930 | TxType::EIP4844) {
+ if matches!(self.receipt.tx_type, TxType::EIP1559 | TxType::EIP2930) {
payload_len += 1;
// we include a string header for typed receipts, so include the length here
payload_len += length_of_length(payload_len);
diff --git a/crates/primitives/src/transaction/eip1559.rs b/crates/primitives/src/transaction/eip1559.rs
deleted file mode 100644
index 3108c6e51e6..00000000000
--- a/crates/primitives/src/transaction/eip1559.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use super::access_list::AccessList;
-use crate::{Bytes, ChainId, TransactionKind};
-use reth_codecs::{main_codec, Compact};
-use std::mem;
-
-/// A transaction with a priority fee ([EIP-1559](https://eips.ethereum.org/EIPS/eip-1559)).
-#[main_codec]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
-pub struct TxEip1559 {
- /// Added as EIP-pub 155: Simple replay attack protection
- pub chain_id: u64,
- /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
- pub nonce: u64,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- pub gas_limit: u64,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- ///
- /// This is also known as `GasFeeCap`
- pub max_fee_per_gas: u128,
- /// Max Priority fee that transaction is paying
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- ///
- /// This is also known as `GasTipCap`
- pub max_priority_fee_per_gas: u128,
- /// The 160-bit address of the message call’s recipient or, for a contract creation
- /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
- pub to: TransactionKind,
- /// A scalar value equal to the number of Wei to
- /// be transferred to the message call’s recipient or,
- /// in the case of contract creation, as an endowment
- /// to the newly created account; formally Tv.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub value: u128,
- /// The accessList specifies a list of addresses and storage keys;
- /// these addresses and storage keys are added into the `accessed_addresses`
- /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
- /// A gas cost is charged, though at a discount relative to the cost of
- /// accessing outside the list.
- pub access_list: AccessList,
- /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
- /// Some). pub init: An unlimited size byte array specifying the
- /// EVM-code for the account initialisation procedure CREATE,
- /// data: An unlimited size byte array specifying the
- /// input data of the message call, formally Td.
- pub input: Bytes,
-}
-
-impl TxEip1559 {
- /// Calculates a heuristic for the in-memory size of the [TxEip1559] transaction.
- #[inline]
- pub fn size(&self) -> usize {
- mem::size_of::() + // chain_id
- mem::size_of::() + // nonce
- mem::size_of::() + // gas_limit
- mem::size_of::() + // max_fee_per_gas
- mem::size_of::() + // max_priority_fee_per_gas
- self.to.size() + // to
- mem::size_of::() + // value
- self.access_list.size() + // access_list
- self.input.len() // input
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::TxEip1559;
- use crate::{
- transaction::{signature::Signature, TransactionKind},
- AccessList, Address, Transaction, TransactionSigned, H256, U256,
- };
- use std::str::FromStr;
-
- #[test]
- fn recover_signer_eip1559() {
- use crate::hex_literal::hex;
-
- let signer: Address = hex!("dd6b8b3dc6b7ad97db52f08a275ff4483e024cea").into();
- let hash: H256 =
- hex!("0ec0b6a2df4d87424e5f6ad2a654e27aaeb7dac20ae9e8385cc09087ad532ee0").into();
-
- let tx = Transaction::Eip1559( TxEip1559 {
- chain_id: 1,
- nonce: 0x42,
- gas_limit: 44386,
- to: TransactionKind::Call( hex!("6069a6c32cf691f5982febae4faf8a6f3ab2f0f6").into()),
- value: 0,
- input: hex!("a22cb4650000000000000000000000005eee75727d804a2b13038928d36f8b188945a57a0000000000000000000000000000000000000000000000000000000000000000").into(),
- max_fee_per_gas: 0x4a817c800,
- max_priority_fee_per_gas: 0x3b9aca00,
- access_list: AccessList::default(),
- });
-
- let sig = Signature {
- r: U256::from_str("0x840cfc572845f5786e702984c2a582528cad4b49b2a10b9db1be7fca90058565")
- .unwrap(),
- s: U256::from_str("0x25e7109ceb98168d95b09b18bbf6b685130e0562f233877d492b94eee0c5b6d1")
- .unwrap(),
- odd_y_parity: false,
- };
-
- let signed_tx = TransactionSigned::from_transaction_and_signature(tx, sig);
- assert_eq!(signed_tx.hash(), hash, "Expected same hash");
- assert_eq!(signed_tx.recover_signer(), Some(signer), "Recovering signer should pass.");
- }
-}
diff --git a/crates/primitives/src/transaction/eip2930.rs b/crates/primitives/src/transaction/eip2930.rs
deleted file mode 100644
index ecd6ecb7ec2..00000000000
--- a/crates/primitives/src/transaction/eip2930.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use super::access_list::AccessList;
-use crate::{Bytes, ChainId, TransactionKind};
-use reth_codecs::{main_codec, Compact};
-use std::mem;
-
-/// Transaction with an [`AccessList`] ([EIP-2930](https://eips.ethereum.org/EIPS/eip-2930)).
-#[main_codec]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
-pub struct TxEip2930 {
- /// Added as EIP-pub 155: Simple replay attack protection
- pub chain_id: ChainId,
- /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
- pub nonce: u64,
- /// A scalar value equal to the number of
- /// Wei to be paid per unit of gas for all computation
- /// costs incurred as a result of the execution of this transaction; formally Tp.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub gas_price: u128,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- pub gas_limit: u64,
- /// The 160-bit address of the message call’s recipient or, for a contract creation
- /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
- pub to: TransactionKind,
- /// A scalar value equal to the number of Wei to
- /// be transferred to the message call’s recipient or,
- /// in the case of contract creation, as an endowment
- /// to the newly created account; formally Tv.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub value: u128,
- /// The accessList specifies a list of addresses and storage keys;
- /// these addresses and storage keys are added into the `accessed_addresses`
- /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
- /// A gas cost is charged, though at a discount relative to the cost of
- /// accessing outside the list.
- pub access_list: AccessList,
- /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
- /// Some). pub init: An unlimited size byte array specifying the
- /// EVM-code for the account initialisation procedure CREATE,
- /// data: An unlimited size byte array specifying the
- /// input data of the message call, formally Td.
- pub input: Bytes,
-}
-
-impl TxEip2930 {
- /// Calculates a heuristic for the in-memory size of the [TxEip2930] transaction.
- #[inline]
- pub fn size(&self) -> usize {
- mem::size_of::() + // chain_id
- mem::size_of::() + // nonce
- mem::size_of::() + // gas_price
- mem::size_of::() + // gas_limit
- self.to.size() + // to
- mem::size_of::() + // value
- self.access_list.size() + // access_list
- self.input.len() // input
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::TxEip2930;
- use crate::{
- transaction::{signature::Signature, TransactionKind},
- Address, Bytes, Transaction, TransactionSigned, U256,
- };
- use bytes::BytesMut;
- use reth_rlp::{Decodable, Encodable};
-
- #[test]
- fn test_decode_create() {
- // tests that a contract creation tx encodes and decodes properly
- let request = Transaction::Eip2930(TxEip2930 {
- chain_id: 1u64,
- nonce: 0,
- gas_price: 1,
- gas_limit: 2,
- to: TransactionKind::Create,
- value: 3,
- input: Bytes::from(vec![1, 2]),
- access_list: Default::default(),
- });
- let signature = Signature { odd_y_parity: true, r: U256::default(), s: U256::default() };
- let tx = TransactionSigned::from_transaction_and_signature(request, signature);
-
- let mut encoded = BytesMut::new();
- tx.encode(&mut encoded);
- assert_eq!(encoded.len(), tx.length());
-
- let decoded = TransactionSigned::decode(&mut &*encoded).unwrap();
- assert_eq!(decoded, tx);
- }
-
- #[test]
- fn test_decode_call() {
- let request = Transaction::Eip2930(TxEip2930 {
- chain_id: 1u64,
- nonce: 0,
- gas_price: 1,
- gas_limit: 2,
- to: TransactionKind::Call(Address::default()),
- value: 3,
- input: Bytes::from(vec![1, 2]),
- access_list: Default::default(),
- });
-
- let signature = Signature { odd_y_parity: true, r: U256::default(), s: U256::default() };
-
- let tx = TransactionSigned::from_transaction_and_signature(request, signature);
-
- let mut encoded = BytesMut::new();
- tx.encode(&mut encoded);
- assert_eq!(encoded.len(), tx.length());
-
- let decoded = TransactionSigned::decode(&mut &*encoded).unwrap();
- assert_eq!(decoded, tx);
- }
-}
diff --git a/crates/primitives/src/transaction/eip4844.rs b/crates/primitives/src/transaction/eip4844.rs
deleted file mode 100644
index 34b43e19bb6..00000000000
--- a/crates/primitives/src/transaction/eip4844.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use super::access_list::AccessList;
-use crate::{constants::eip4844::DATA_GAS_PER_BLOB, Bytes, ChainId, TransactionKind, H256};
-use reth_codecs::{main_codec, Compact};
-use std::mem;
-
-/// [EIP-4844 Blob Transaction](https://eips.ethereum.org/EIPS/eip-4844#blob-transaction)
-///
-/// A transaction with blob hashes and max blob fee
-#[main_codec]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
-pub struct TxEip4844 {
- /// Added as EIP-pub 155: Simple replay attack protection
- pub chain_id: u64,
- /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
- pub nonce: u64,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- pub gas_limit: u64,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- ///
- /// This is also known as `GasFeeCap`
- pub max_fee_per_gas: u128,
- /// Max Priority fee that transaction is paying
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- ///
- /// This is also known as `GasTipCap`
- pub max_priority_fee_per_gas: u128,
- /// The 160-bit address of the message call’s recipient or, for a contract creation
- /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
- pub to: TransactionKind,
- /// A scalar value equal to the number of Wei to
- /// be transferred to the message call’s recipient or,
- /// in the case of contract creation, as an endowment
- /// to the newly created account; formally Tv.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub value: u128,
- /// The accessList specifies a list of addresses and storage keys;
- /// these addresses and storage keys are added into the `accessed_addresses`
- /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
- /// A gas cost is charged, though at a discount relative to the cost of
- /// accessing outside the list.
- pub access_list: AccessList,
-
- /// It contains a vector of fixed size hash(32 bytes)
- pub blob_versioned_hashes: Vec,
-
- /// Max fee per data gas
- ///
- /// aka BlobFeeCap
- pub max_fee_per_blob_gas: u128,
-
- /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
- /// Some). pub init: An unlimited size byte array specifying the
- /// EVM-code for the account initialisation procedure CREATE,
- /// data: An unlimited size byte array specifying the
- /// input data of the message call, formally Td.
- pub input: Bytes,
-}
-
-impl TxEip4844 {
- /// Returns the effective gas price for the given `base_fee`.
- pub fn effective_gas_price(&self, base_fee: Option) -> u128 {
- match base_fee {
- None => self.max_fee_per_gas,
- Some(base_fee) => {
- // if the tip is greater than the max priority fee per gas, set it to the max
- // priority fee per gas + base fee
- let tip = self.max_fee_per_gas.saturating_sub(base_fee as u128);
- if tip > self.max_priority_fee_per_gas {
- self.max_priority_fee_per_gas + base_fee as u128
- } else {
- // otherwise return the max fee per gas
- self.max_fee_per_gas
- }
- }
- }
- }
-
- /// Returns the total gas for all blobs in this transaction.
- #[inline]
- pub fn blob_gas(&self) -> u64 {
- // SAFETY: we don't expect u64::MAX / DATA_GAS_PER_BLOB hashes in a single transaction
- self.blob_versioned_hashes.len() as u64 * DATA_GAS_PER_BLOB
- }
-
- /// Calculates a heuristic for the in-memory size of the [TxEip4844] transaction.
- #[inline]
- pub fn size(&self) -> usize {
- mem::size_of::() + // chain_id
- mem::size_of::() + // nonce
- mem::size_of::() + // gas_limit
- mem::size_of::() + // max_fee_per_gas
- mem::size_of::() + // max_priority_fee_per_gas
- self.to.size() + // to
- mem::size_of::() + // value
- self.access_list.size() + // access_list
- self.input.len() + // input
- self.blob_versioned_hashes.capacity() * mem::size_of::() + // blob hashes size
- mem::size_of::() // max_fee_per_data_gas
- }
-}
diff --git a/crates/primitives/src/transaction/legacy.rs b/crates/primitives/src/transaction/legacy.rs
deleted file mode 100644
index cd324732bd5..00000000000
--- a/crates/primitives/src/transaction/legacy.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use crate::{Bytes, ChainId, TransactionKind};
-use reth_codecs::{main_codec, Compact};
-use std::mem;
-
-/// Legacy transaction.
-#[main_codec]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
-pub struct TxLegacy {
- /// Added as EIP-155: Simple replay attack protection
- pub chain_id: Option,
- /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
- pub nonce: u64,
- /// A scalar value equal to the number of
- /// Wei to be paid per unit of gas for all computation
- /// costs incurred as a result of the execution of this transaction; formally Tp.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub gas_price: u128,
- /// A scalar value equal to the maximum
- /// amount of gas that should be used in executing
- /// this transaction. This is paid up-front, before any
- /// computation is done and may not be increased
- /// later; formally Tg.
- pub gas_limit: u64,
- /// The 160-bit address of the message call’s recipient or, for a contract creation
- /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
- pub to: TransactionKind,
- /// A scalar value equal to the number of Wei to
- /// be transferred to the message call’s recipient or,
- /// in the case of contract creation, as an endowment
- /// to the newly created account; formally Tv.
- ///
- /// As ethereum circulation is around 120mil eth as of 2022 that is around
- /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
- /// 340282366920938463463374607431768211455
- pub value: u128,
- /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
- /// Some). pub init: An unlimited size byte array specifying the
- /// EVM-code for the account initialisation procedure CREATE,
- /// data: An unlimited size byte array specifying the
- /// input data of the message call, formally Td.
- pub input: Bytes,
-}
-
-impl TxLegacy {
- /// Calculates a heuristic for the in-memory size of the [TxLegacy] transaction.
- #[inline]
- pub fn size(&self) -> usize {
- mem::size_of::>() + // chain_id
- mem::size_of::() + // nonce
- mem::size_of::() + // gas_price
- mem::size_of::() + // gas_limit
- self.to.size() + // to
- mem::size_of::() + // value
- self.input.len() // input
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::TxLegacy;
- use crate::{
- transaction::{signature::Signature, TransactionKind},
- Address, Transaction, TransactionSigned, H256, U256,
- };
-
- #[test]
- fn recover_signer_legacy() {
- use crate::hex_literal::hex;
-
- let signer: Address = hex!("398137383b3d25c92898c656696e41950e47316b").into();
- let hash: H256 =
- hex!("bb3a336e3f823ec18197f1e13ee875700f08f03e2cab75f0d0b118dabb44cba0").into();
-
- let tx = Transaction::Legacy(TxLegacy {
- chain_id: Some(1),
- nonce: 0x18,
- gas_price: 0xfa56ea00,
- gas_limit: 119902,
- to: TransactionKind::Call( hex!("06012c8cf97bead5deae237070f9587f8e7a266d").into()),
- value: 0x1c6bf526340000u64.into(),
- input: hex!("f7d8c88300000000000000000000000000000000000000000000000000000000000cee6100000000000000000000000000000000000000000000000000000000000ac3e1").into(),
- });
-
- let sig = Signature {
- r: U256::from_be_bytes(hex!(
- "2a378831cf81d99a3f06a18ae1b6ca366817ab4d88a70053c41d7a8f0368e031"
- )),
- s: U256::from_be_bytes(hex!(
- "450d831a05b6e418724436c05c155e0a1b7b921015d0fbc2f667aed709ac4fb5"
- )),
- odd_y_parity: false,
- };
-
- let signed_tx = TransactionSigned::from_transaction_and_signature(tx, sig);
- assert_eq!(signed_tx.hash(), hash, "Expected same hash");
- assert_eq!(signed_tx.recover_signer(), Some(signer), "Recovering signer should pass.");
- }
-}
diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
index 94aff3b17de..7c56a807752 100644
--- a/crates/primitives/src/transaction/mod.rs
+++ b/crates/primitives/src/transaction/mod.rs
@@ -1,41 +1,306 @@
+use std::mem;
+
use crate::{
compression::{TRANSACTION_COMPRESSOR, TRANSACTION_DECOMPRESSOR},
- keccak256, Address, Bytes, TxHash, H256,
+ keccak256, Address, Bytes, ChainId, TxHash, H256,
};
pub use access_list::{AccessList, AccessListItem, AccessListWithGasUsed};
use bytes::{Buf, BytesMut};
use derive_more::{AsRef, Deref};
pub use error::InvalidTransactionError;
pub use meta::TransactionMeta;
-use reth_codecs::{add_arbitrary_tests, derive_arbitrary, Compact};
+use reth_codecs::{add_arbitrary_tests, derive_arbitrary, main_codec, Compact};
use reth_rlp::{
length_of_length, Decodable, DecodeError, Encodable, Header, EMPTY_LIST_CODE, EMPTY_STRING_CODE,
};
use serde::{Deserialize, Serialize};
pub use signature::Signature;
-use std::mem;
pub use tx_type::{TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, LEGACY_TX_TYPE_ID};
-#[cfg(feature = "optimism")]
-pub use optimism::{TxDeposit, DEPOSIT_TX_TYPE, DEPOSIT_VERSION};
-pub use eip1559::TxEip1559;
-pub use eip2930::TxEip2930;
-pub use eip4844::TxEip4844;
-pub use legacy::TxLegacy;
-
-#[cfg(feature = "optimism")]
-mod optimism;
mod access_list;
-mod eip1559;
-mod eip2930;
-mod eip4844;
mod error;
-mod legacy;
mod meta;
mod signature;
mod tx_type;
pub(crate) mod util;
+#[cfg(feature = "optimism")]
+mod optimism;
+#[cfg(feature = "optimism")]
+pub use optimism::{TxDeposit, DEPOSIT_TX_TYPE, DEPOSIT_VERSION};
+
+/// Legacy transaction.
+#[main_codec]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+pub struct TxLegacy {
+ /// Added as EIP-155: Simple replay attack protection
+ pub chain_id: Option,
+ /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
+ pub nonce: u64,
+ /// A scalar value equal to the number of
+ /// Wei to be paid per unit of gas for all computation
+ /// costs incurred as a result of the execution of this transaction; formally Tp.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub gas_price: u128,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ pub gas_limit: u64,
+ /// The 160-bit address of the message call’s recipient or, for a contract creation
+ /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
+ pub to: TransactionKind,
+ /// A scalar value equal to the number of Wei to
+ /// be transferred to the message call’s recipient or,
+ /// in the case of contract creation, as an endowment
+ /// to the newly created account; formally Tv.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub value: u128,
+ /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
+ /// Some). pub init: An unlimited size byte array specifying the
+ /// EVM-code for the account initialisation procedure CREATE,
+ /// data: An unlimited size byte array specifying the
+ /// input data of the message call, formally Td.
+ pub input: Bytes,
+}
+
+impl TxLegacy {
+ /// Calculates a heuristic for the in-memory size of the [TxLegacy] transaction.
+ #[inline]
+ fn size(&self) -> usize {
+ mem::size_of::>() + // chain_id
+ mem::size_of::() + // nonce
+ mem::size_of::() + // gas_price
+ mem::size_of::() + // gas_limit
+ self.to.size() + // to
+ mem::size_of::() + // value
+ self.input.len() // input
+ }
+}
+
+/// Transaction with an [`AccessList`] ([EIP-2930](https://eips.ethereum.org/EIPS/eip-2930)).
+#[main_codec]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+pub struct TxEip2930 {
+ /// Added as EIP-pub 155: Simple replay attack protection
+ pub chain_id: ChainId,
+ /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
+ pub nonce: u64,
+ /// A scalar value equal to the number of
+ /// Wei to be paid per unit of gas for all computation
+ /// costs incurred as a result of the execution of this transaction; formally Tp.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub gas_price: u128,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ pub gas_limit: u64,
+ /// The 160-bit address of the message call’s recipient or, for a contract creation
+ /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
+ pub to: TransactionKind,
+ /// A scalar value equal to the number of Wei to
+ /// be transferred to the message call’s recipient or,
+ /// in the case of contract creation, as an endowment
+ /// to the newly created account; formally Tv.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub value: u128,
+ /// The accessList specifies a list of addresses and storage keys;
+ /// these addresses and storage keys are added into the `accessed_addresses`
+ /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
+ /// A gas cost is charged, though at a discount relative to the cost of
+ /// accessing outside the list.
+ pub access_list: AccessList,
+ /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
+ /// Some). pub init: An unlimited size byte array specifying the
+ /// EVM-code for the account initialisation procedure CREATE,
+ /// data: An unlimited size byte array specifying the
+ /// input data of the message call, formally Td.
+ pub input: Bytes,
+}
+
+impl TxEip2930 {
+ /// Calculates a heuristic for the in-memory size of the [TxEip2930] transaction.
+ #[inline]
+ pub fn size(&self) -> usize {
+ mem::size_of::() + // chain_id
+ mem::size_of::() + // nonce
+ mem::size_of::() + // gas_price
+ mem::size_of::() + // gas_limit
+ self.to.size() + // to
+ mem::size_of::() + // value
+ self.access_list.size() + // access_list
+ self.input.len() // input
+ }
+}
+
+/// A transaction with a priority fee ([EIP-1559](https://eips.ethereum.org/EIPS/eip-1559)).
+#[main_codec]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+pub struct TxEip1559 {
+ /// Added as EIP-pub 155: Simple replay attack protection
+ pub chain_id: u64,
+ /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
+ pub nonce: u64,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ pub gas_limit: u64,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub max_fee_per_gas: u128,
+ /// Max Priority fee that transaction is paying
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub max_priority_fee_per_gas: u128,
+ /// The 160-bit address of the message call’s recipient or, for a contract creation
+ /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
+ pub to: TransactionKind,
+ /// A scalar value equal to the number of Wei to
+ /// be transferred to the message call’s recipient or,
+ /// in the case of contract creation, as an endowment
+ /// to the newly created account; formally Tv.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub value: u128,
+ /// The accessList specifies a list of addresses and storage keys;
+ /// these addresses and storage keys are added into the `accessed_addresses`
+ /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
+ /// A gas cost is charged, though at a discount relative to the cost of
+ /// accessing outside the list.
+ pub access_list: AccessList,
+ /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
+ /// Some). pub init: An unlimited size byte array specifying the
+ /// EVM-code for the account initialisation procedure CREATE,
+ /// data: An unlimited size byte array specifying the
+ /// input data of the message call, formally Td.
+ pub input: Bytes,
+}
+
+impl TxEip1559 {
+ /// Calculates a heuristic for the in-memory size of the [TxEip1559] transaction.
+ #[inline]
+ pub fn size(&self) -> usize {
+ mem::size_of::() + // chain_id
+ mem::size_of::() + // nonce
+ mem::size_of::() + // gas_limit
+ mem::size_of::() + // max_fee_per_gas
+ mem::size_of::() + // max_priority_fee_per_gas
+ self.to.size() + // to
+ mem::size_of::() + // value
+ self.access_list.size() + // access_list
+ self.input.len() // input
+ }
+}
+
+/// A transaction with blob hashes and max blob fee
+#[main_codec]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+pub struct TxEip4844 {
+ /// Added as EIP-pub 155: Simple replay attack protection
+ pub chain_id: u64,
+ /// A scalar value equal to the number of transactions sent by the sender; formally Tn.
+ pub nonce: u64,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ pub gas_limit: u64,
+ /// A scalar value equal to the maximum
+ /// amount of gas that should be used in executing
+ /// this transaction. This is paid up-front, before any
+ /// computation is done and may not be increased
+ /// later; formally Tg.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub max_fee_per_gas: u128,
+ /// Max Priority fee that transaction is paying
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub max_priority_fee_per_gas: u128,
+ /// The 160-bit address of the message call’s recipient or, for a contract creation
+ /// transaction, ∅, used here to denote the only member of B0 ; formally Tt.
+ pub to: TransactionKind,
+ /// A scalar value equal to the number of Wei to
+ /// be transferred to the message call’s recipient or,
+ /// in the case of contract creation, as an endowment
+ /// to the newly created account; formally Tv.
+ ///
+ /// As ethereum circulation is around 120mil eth as of 2022 that is around
+ /// 120000000000000000000000000 wei we are safe to use u128 as its max number is:
+ /// 340282366920938463463374607431768211455
+ pub value: u128,
+ /// The accessList specifies a list of addresses and storage keys;
+ /// these addresses and storage keys are added into the `accessed_addresses`
+ /// and `accessed_storage_keys` global sets (introduced in EIP-2929).
+ /// A gas cost is charged, though at a discount relative to the cost of
+ /// accessing outside the list.
+ pub access_list: AccessList,
+
+ /// It contains a vector of fixed size hash(32 bytes)
+ pub blob_hashes: Vec,
+
+ /// Max fee per data gas
+ pub max_fee_per_blob: u128,
+
+ /// Input has two uses depending if transaction is Create or Call (if `to` field is None or
+ /// Some). pub init: An unlimited size byte array specifying the
+ /// EVM-code for the account initialisation procedure CREATE,
+ /// data: An unlimited size byte array specifying the
+ /// input data of the message call, formally Td.
+ pub input: Bytes,
+}
+
+impl TxEip4844 {
+ /// Calculates a heuristic for the in-memory size of the [TxEip4844] transaction.
+ #[inline]
+ pub fn size(&self) -> usize {
+ mem::size_of::() + // chain_id
+ mem::size_of::() + // nonce
+ mem::size_of::() + // gas_limit
+ mem::size_of::() + // max_fee_per_gas
+ mem::size_of::() + // max_priority_fee_per_gas
+ self.to.size() + // to
+ mem::size_of::() + // value
+ self.access_list.size() + // access_list
+ self.input.len() + // input
+ self.blob_hashes.capacity() * mem::size_of::() + // blob hashes size
+ mem::size_of::() // blob fee cap
+ }
+}
+
/// A raw transaction.
///
/// Transaction types were introduced in [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718).
@@ -715,7 +980,7 @@ impl TxEip1559 {
Some(base_fee) => {
// if the tip is greater than the max priority fee per gas, set it to the max
// priority fee per gas + base fee
- let tip = self.max_fee_per_gas.saturating_sub(base_fee as u128);
+ let tip = self.max_fee_per_gas - base_fee as u128;
if tip > self.max_priority_fee_per_gas {
self.max_priority_fee_per_gas + base_fee as u128
} else {
@@ -1394,8 +1659,9 @@ impl IntoRecoveredTransaction for TransactionSignedEcRecovered {
#[cfg(test)]
mod tests {
use crate::{
- transaction::{signature::Signature, TransactionKind, TxEip1559, TxLegacy},
- Address, Bytes, Transaction, TransactionSigned, TransactionSignedEcRecovered, H256, U256,
+ transaction::{signature::Signature, TransactionKind, TxEip1559, TxEip2930, TxLegacy},
+ AccessList, Address, Bytes, Transaction, TransactionSigned, TransactionSignedEcRecovered,
+ H256, U256,
};
use bytes::BytesMut;
use ethers_core::utils::hex;
@@ -1409,6 +1675,30 @@ mod tests {
assert_eq!(DecodeError::InputTooShort, res);
}
+ #[test]
+ fn test_decode_create() {
+ // tests that a contract creation tx encodes and decodes properly
+ let request = Transaction::Eip2930(TxEip2930 {
+ chain_id: 1u64,
+ nonce: 0,
+ gas_price: 1,
+ gas_limit: 2,
+ to: TransactionKind::Create,
+ value: 3,
+ input: Bytes::from(vec![1, 2]),
+ access_list: Default::default(),
+ });
+ let signature = Signature { odd_y_parity: true, r: U256::default(), s: U256::default() };
+ let tx = TransactionSigned::from_transaction_and_signature(request, signature);
+
+ let mut encoded = BytesMut::new();
+ tx.encode(&mut encoded);
+ assert_eq!(encoded.len(), tx.length());
+
+ let decoded = TransactionSigned::decode(&mut &*encoded).unwrap();
+ assert_eq!(decoded, tx);
+ }
+
#[test]
fn test_decode_create_goerli() {
// test that an example create tx from goerli decodes properly
@@ -1425,6 +1715,31 @@ mod tests {
assert_eq!(tx_bytes, encoded);
}
+ #[test]
+ fn test_decode_call() {
+ let request = Transaction::Eip2930(TxEip2930 {
+ chain_id: 1u64,
+ nonce: 0,
+ gas_price: 1,
+ gas_limit: 2,
+ to: TransactionKind::Call(Address::default()),
+ value: 3,
+ input: Bytes::from(vec![1, 2]),
+ access_list: Default::default(),
+ });
+
+ let signature = Signature { odd_y_parity: true, r: U256::default(), s: U256::default() };
+
+ let tx = TransactionSigned::from_transaction_and_signature(request, signature);
+
+ let mut encoded = BytesMut::new();
+ tx.encode(&mut encoded);
+ assert_eq!(encoded.len(), tx.length());
+
+ let decoded = TransactionSigned::decode(&mut &*encoded).unwrap();
+ assert_eq!(decoded, tx);
+ }
+
#[test]
fn decode_transaction_consumes_buffer() {
let bytes = &mut &hex::decode("b87502f872041a8459682f008459682f0d8252089461815774383099e24810ab832a5b2a5425c154d58829a2241af62c000080c001a059e6b67f48fb32e7e570dfb11e042b5ad2e55e3ce3ce9cd989c7e06e07feeafda0016b83f4f980694ed2eee4d10667242b1f40dc406901b34125b008d334d47469").unwrap()[..];
@@ -1586,6 +1901,72 @@ mod tests {
assert_eq!(tx.recover_signer(), Some(signer), "Recovering signer should pass.");
}
+ #[test]
+ fn recover_signer_legacy() {
+ use crate::hex_literal::hex;
+
+ let signer: Address = hex!("398137383b3d25c92898c656696e41950e47316b").into();
+ let hash: H256 =
+ hex!("bb3a336e3f823ec18197f1e13ee875700f08f03e2cab75f0d0b118dabb44cba0").into();
+
+ let tx = Transaction::Legacy(TxLegacy {
+ chain_id: Some(1),
+ nonce: 0x18,
+ gas_price: 0xfa56ea00,
+ gas_limit: 119902,
+ to: TransactionKind::Call( hex!("06012c8cf97bead5deae237070f9587f8e7a266d").into()),
+ value: 0x1c6bf526340000u64.into(),
+ input: hex!("f7d8c88300000000000000000000000000000000000000000000000000000000000cee6100000000000000000000000000000000000000000000000000000000000ac3e1").into(),
+ });
+
+ let sig = Signature {
+ r: U256::from_be_bytes(hex!(
+ "2a378831cf81d99a3f06a18ae1b6ca366817ab4d88a70053c41d7a8f0368e031"
+ )),
+ s: U256::from_be_bytes(hex!(
+ "450d831a05b6e418724436c05c155e0a1b7b921015d0fbc2f667aed709ac4fb5"
+ )),
+ odd_y_parity: false,
+ };
+
+ let signed_tx = TransactionSigned::from_transaction_and_signature(tx, sig);
+ assert_eq!(signed_tx.hash(), hash, "Expected same hash");
+ assert_eq!(signed_tx.recover_signer(), Some(signer), "Recovering signer should pass.");
+ }
+
+ #[test]
+ fn recover_signer_eip1559() {
+ use crate::hex_literal::hex;
+
+ let signer: Address = hex!("dd6b8b3dc6b7ad97db52f08a275ff4483e024cea").into();
+ let hash: H256 =
+ hex!("0ec0b6a2df4d87424e5f6ad2a654e27aaeb7dac20ae9e8385cc09087ad532ee0").into();
+
+ let tx = Transaction::Eip1559( TxEip1559 {
+ chain_id: 1,
+ nonce: 0x42,
+ gas_limit: 44386,
+ to: TransactionKind::Call( hex!("6069a6c32cf691f5982febae4faf8a6f3ab2f0f6").into()),
+ value: 0,
+ input: hex!("a22cb4650000000000000000000000005eee75727d804a2b13038928d36f8b188945a57a0000000000000000000000000000000000000000000000000000000000000000").into(),
+ max_fee_per_gas: 0x4a817c800,
+ max_priority_fee_per_gas: 0x3b9aca00,
+ access_list: AccessList::default(),
+ });
+
+ let sig = Signature {
+ r: U256::from_str("0x840cfc572845f5786e702984c2a582528cad4b49b2a10b9db1be7fca90058565")
+ .unwrap(),
+ s: U256::from_str("0x25e7109ceb98168d95b09b18bbf6b685130e0562f233877d492b94eee0c5b6d1")
+ .unwrap(),
+ odd_y_parity: false,
+ };
+
+ let signed_tx = TransactionSigned::from_transaction_and_signature(tx, sig);
+ assert_eq!(signed_tx.hash(), hash, "Expected same hash");
+ assert_eq!(signed_tx.recover_signer(), Some(signer), "Recovering signer should pass.");
+ }
+
#[test]
fn test_envelop_encode() {
// random tx:
diff --git a/crates/primitives/src/transaction/tx_type.rs b/crates/primitives/src/transaction/tx_type.rs
index 66b6db2524f..5b256c2d9c8 100644
--- a/crates/primitives/src/transaction/tx_type.rs
+++ b/crates/primitives/src/transaction/tx_type.rs
@@ -13,21 +13,11 @@ pub const EIP2930_TX_TYPE_ID: u8 = 1;
/// Identifier for [TxEip1559](crate::TxEip1559) transaction.
pub const EIP1559_TX_TYPE_ID: u8 = 2;
-/// Identifier for [TxEip4844](crate::TxEip4844) transaction.
-#[allow(unused)]
-pub(crate) const EIP4844_TX_TYPE_ID: u8 = 3;
-
/// Identifier for [TxDeposit](crate::TxDeposit) transaction.
#[cfg(feature = "optimism")]
use crate::DEPOSIT_TX_TYPE;
/// Transaction Type
-///
-/// Currently being used as 2-bit type when encoding it to [`Compact`] on
-/// [`crate::TransactionSignedNoHash`]. Adding more transaction types will break the codec and
-/// database format.
-///
-/// Other required changes when adding a new type can be seen on [PR#3953](https://github.com/paradigmxyz/reth/pull/3953/files).
#[derive_arbitrary(compact)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize)]
pub enum TxType {
@@ -38,8 +28,6 @@ pub enum TxType {
EIP2930 = 1_isize,
/// Transaction with Priority fee
EIP1559 = 2_isize,
- /// Shard Blob Transactions - EIP-4844
- EIP4844 = 3_isize,
/// OP Deposit transaction.
#[cfg(feature = "optimism")]
DEPOSIT = DEPOSIT_TX_TYPE as isize,
@@ -51,7 +39,6 @@ impl From for u8 {
TxType::Legacy => LEGACY_TX_TYPE_ID,
TxType::EIP2930 => EIP2930_TX_TYPE_ID,
TxType::EIP1559 => EIP1559_TX_TYPE_ID,
- TxType::EIP4844 => EIP4844_TX_TYPE_ID,
#[cfg(feature = "optimism")]
TxType::DEPOSIT => DEPOSIT_TX_TYPE,
}
@@ -76,10 +63,9 @@ impl Compact for TxType {
TxType::Legacy => LEGACY_TX_TYPE_ID as usize,
TxType::EIP2930 => EIP2930_TX_TYPE_ID as usize,
TxType::EIP1559 => EIP1559_TX_TYPE_ID as usize,
- TxType::EIP4844 => 3,
_ => {
buf.put_u8(self as u8);
- 4
+ 3
}
}
}
@@ -93,7 +79,6 @@ impl Compact for TxType {
0 => TxType::Legacy,
1 => TxType::EIP2930,
2 => TxType::EIP1559,
- 3 => TxType::EIP4844,
_ => {
let identifier = buf.get_u8() as usize;
match identifier {
diff --git a/crates/prune/Cargo.toml b/crates/prune/Cargo.toml
index 99a4901cb13..13d5ae4f916 100644
--- a/crates/prune/Cargo.toml
+++ b/crates/prune/Cargo.toml
@@ -20,8 +20,8 @@ reth-interfaces.workspace = true
# misc
tracing.workspace = true
thiserror.workspace = true
-itertools.workspace = true
-rayon.workspace = true
+itertools = "0.10"
+rayon = "1.6.0"
[dev-dependencies]
# reth
diff --git a/crates/prune/src/error.rs b/crates/prune/src/error.rs
index 1a31a039422..fdc0af4484a 100644
--- a/crates/prune/src/error.rs
+++ b/crates/prune/src/error.rs
@@ -4,9 +4,6 @@ use thiserror::Error;
#[derive(Error, Debug)]
pub enum PrunerError {
- #[error(transparent)]
- PrunePart(#[from] reth_primitives::PrunePartError),
-
#[error("Inconsistent data: {0}")]
InconsistentData(&'static str),
diff --git a/crates/prune/src/pruner.rs b/crates/prune/src/pruner.rs
index 3dae8bcb04f..de020dcd272 100644
--- a/crates/prune/src/pruner.rs
+++ b/crates/prune/src/pruner.rs
@@ -72,13 +72,13 @@ impl Pruner {
let provider = self.provider_factory.provider_rw()?;
if let Some((to_block, prune_mode)) =
- self.modes.prune_target_block_receipts(tip_block_number)?
+ self.modes.prune_target_block_receipts(tip_block_number)
{
self.prune_receipts(&provider, to_block, prune_mode)?;
}
if let Some((to_block, prune_mode)) =
- self.modes.prune_target_block_transaction_lookup(tip_block_number)?
+ self.modes.prune_target_block_transaction_lookup(tip_block_number)
{
self.prune_transaction_lookup(&provider, to_block, prune_mode)?;
}
@@ -160,18 +160,14 @@ impl Pruner {
return Ok(())
}
};
- let total = range.clone().count();
- let mut processed = 0;
provider.prune_table_in_batches::(
range,
self.batch_sizes.receipts,
- |entries| {
- processed += entries;
+ |receipts| {
trace!(
target: "pruner",
- %entries,
- progress = format!("{:.1}%", 100.0 * processed as f64 / total as f64),
+ %receipts,
"Pruned receipts"
);
},
@@ -205,8 +201,6 @@ impl Pruner {
}
};
let last_tx_num = *range.end();
- let total = range.clone().count();
- let mut processed = 0;
for i in range.step_by(self.batch_sizes.transaction_lookup) {
// The `min` ensures that the transaction range doesn't exceed the last transaction
@@ -229,16 +223,19 @@ impl Pruner {
}
// Pre-sort hashes to prune them in order
- hashes.sort_unstable();
-
- let entries = provider.prune_table::(hashes)?;
- processed += entries;
- trace!(
- target: "pruner",
- %entries,
- progress = format!("{:.1}%", 100.0 * processed as f64 / total as f64),
- "Pruned transaction lookup"
- );
+ hashes.sort();
+
+ provider.prune_table_in_batches::(
+ hashes,
+ self.batch_sizes.transaction_lookup,
+ |entries| {
+ trace!(
+ target: "pruner",
+ %entries,
+ "Pruned transaction lookup"
+ );
+ },
+ )?;
}
provider.save_prune_checkpoint(
diff --git a/crates/revm/revm-inspectors/src/tracing/builder/geth.rs b/crates/revm/revm-inspectors/src/tracing/builder/geth.rs
index 2f02b32cfa6..a3eaa3233fd 100644
--- a/crates/revm/revm-inspectors/src/tracing/builder/geth.rs
+++ b/crates/revm/revm-inspectors/src/tracing/builder/geth.rs
@@ -4,12 +4,8 @@ use crate::tracing::{
types::{CallTraceNode, CallTraceStepStackItem},
TracingInspectorConfig,
};
-use reth_primitives::{Address, Bytes, H256, U256};
-use reth_rpc_types::trace::geth::{
- AccountState, CallConfig, CallFrame, DefaultFrame, DiffMode, GethDefaultTracingOptions,
- PreStateConfig, PreStateFrame, PreStateMode, StructLog,
-};
-use revm::{db::DatabaseRef, primitives::ResultAndState};
+use reth_primitives::{Address, Bytes, H256};
+use reth_rpc_types::trace::geth::*;
use std::collections::{BTreeMap, HashMap, VecDeque};
/// A type for creating geth style traces
@@ -151,75 +147,4 @@ impl GethTraceBuilder {
}
}
}
-
- /// Returns the accounts necessary for transaction execution.
- ///
- /// The prestate mode returns the accounts necessary to execute a given transaction.
- /// diff_mode returns the differences between the transaction's pre and post-state.
- ///
- /// * `state` - The state post-transaction execution.
- /// * `diff_mode` - if prestate is in diff or prestate mode.
- /// * `db` - The database to fetch state pre-transaction execution.
- pub fn geth_prestate_traces(
- &self,
- ResultAndState { state, .. }: &ResultAndState,
- prestate_config: PreStateConfig,
- db: DB,
- ) -> Result
- where
- DB: DatabaseRef,
- {
- let account_diffs: Vec<_> =
- state.into_iter().map(|(addr, acc)| (*addr, &acc.info)).collect();
-
- if prestate_config.is_diff_mode() {
- let mut prestate = PreStateMode::default();
- for (addr, _) in account_diffs {
- let db_acc = db.basic(addr)?.unwrap_or_default();
- prestate.0.insert(
- addr,
- AccountState {
- balance: Some(db_acc.balance),
- nonce: Some(U256::from(db_acc.nonce)),
- code: db_acc.code.as_ref().map(|code| Bytes::from(code.original_bytes())),
- storage: None,
- },
- );
- }
- self.update_storage_from_trace(&mut prestate.0, false);
- Ok(PreStateFrame::Default(prestate))
- } else {
- let mut state_diff = DiffMode::default();
- for (addr, changed_acc) in account_diffs {
- let db_acc = db.basic(addr)?.unwrap_or_default();
- let pre_state = AccountState {
- balance: Some(db_acc.balance),
- nonce: Some(U256::from(db_acc.nonce)),
- code: db_acc.code.as_ref().map(|code| Bytes::from(code.original_bytes())),
- storage: None,
- };
- let post_state = AccountState {
- balance: Some(changed_acc.balance),
- nonce: Some(U256::from(changed_acc.nonce)),
- code: changed_acc.code.as_ref().map(|code| Bytes::from(code.original_bytes())),
- storage: None,
- };
- state_diff.pre.insert(addr, pre_state);
- state_diff.post.insert(addr, post_state);
- }
- self.update_storage_from_trace(&mut state_diff.pre, false);
- self.update_storage_from_trace(&mut state_diff.post, true);
- Ok(PreStateFrame::Diff(state_diff))
- }
- }
-
- fn update_storage_from_trace(
- &self,
- account_states: &mut BTreeMap,
- post_value: bool,
- ) {
- for node in self.nodes.iter() {
- node.geth_update_account_storage(account_states, post_value);
- }
- }
}
diff --git a/crates/revm/revm-inspectors/src/tracing/builder/parity.rs b/crates/revm/revm-inspectors/src/tracing/builder/parity.rs
index 7c3720621bc..cce86c43445 100644
--- a/crates/revm/revm-inspectors/src/tracing/builder/parity.rs
+++ b/crates/revm/revm-inspectors/src/tracing/builder/parity.rs
@@ -330,7 +330,7 @@ impl ParityTraceBuilder {
let maybe_execution = Some(VmExecutedOperation {
used: step.gas_cost,
- push: step.new_stack.into_iter().map(|new_stack| new_stack.into()).collect(),
+ push: step.new_stack.map(|new_stack| new_stack.into()),
mem: maybe_memory,
store: maybe_storage,
});
diff --git a/crates/revm/revm-inspectors/src/tracing/mod.rs b/crates/revm/revm-inspectors/src/tracing/mod.rs
index de8a3b3b24a..fe6c5b8609d 100644
--- a/crates/revm/revm-inspectors/src/tracing/mod.rs
+++ b/crates/revm/revm-inspectors/src/tracing/mod.rs
@@ -395,6 +395,7 @@ where
if self.config.record_steps {
self.gas_inspector.step_end(interp, data, is_static, eval);
self.fill_step_on_step_end(interp, data, eval);
+ return eval
}
InstructionResult::Continue
}
diff --git a/crates/revm/revm-inspectors/src/tracing/types.rs b/crates/revm/revm-inspectors/src/tracing/types.rs
index 83c720dd281..22bebdbb247 100644
--- a/crates/revm/revm-inspectors/src/tracing/types.rs
+++ b/crates/revm/revm-inspectors/src/tracing/types.rs
@@ -3,7 +3,7 @@
use crate::tracing::{config::TraceStyle, utils::convert_memory};
use reth_primitives::{abi::decode_revert_reason, bytes::Bytes, Address, H256, U256};
use reth_rpc_types::trace::{
- geth::{AccountState, CallFrame, CallLogFrame, GethDefaultTracingOptions, StructLog},
+ geth::{CallFrame, CallLogFrame, GethDefaultTracingOptions, StructLog},
parity::{
Action, ActionType, CallAction, CallOutput, CallType, ChangedType, CreateAction,
CreateOutput, Delta, SelfdestructAction, StateDiff, TraceOutput, TransactionTrace,
@@ -13,7 +13,7 @@ use revm::interpreter::{
opcode, CallContext, CallScheme, CreateScheme, InstructionResult, Memory, OpCode, Stack,
};
use serde::{Deserialize, Serialize};
-use std::collections::{btree_map::Entry, BTreeMap, VecDeque};
+use std::collections::{btree_map::Entry, VecDeque};
/// A unified representation of a call
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
@@ -267,12 +267,9 @@ impl CallTraceNode {
opcode::CALL |
opcode::STATICCALL |
opcode::CALLCODE => {
- // The opcode of this step is a call but it's possible that this step resulted
- // in a revert or out of gas error in which case there's no actual child call executed and recorded:
- if let Some(call_id) = self.children.get(child_id).copied() {
- item.call_child_id = Some(call_id);
- child_id += 1;
- }
+ let call_id = self.children[child_id];
+ item.call_child_id = Some(call_id);
+ child_id += 1;
}
_ => {}
}
@@ -446,34 +443,6 @@ impl CallTraceNode {
call_frame
}
-
- /// Adds storage in-place to account state for all accounts that were touched in the trace
- /// [CallTrace] execution.
- ///
- /// * `account_states` - the account map updated in place.
- /// * `post_value` - if true, it adds storage values after trace transaction execution, if
- /// false, returns the storage values before trace execution.
- pub(crate) fn geth_update_account_storage(
- &self,
- account_states: &mut BTreeMap,
- post_value: bool,
- ) {
- let addr = self.trace.address;
- let acc_state = account_states.entry(addr).or_insert_with(AccountState::default);
- for change in self.trace.steps.iter().filter_map(|s| s.storage_change) {
- let StorageChange { key, value, had_value } = change;
- let storage_map = acc_state.storage.get_or_insert_with(BTreeMap::new);
- let value_to_insert = if post_value {
- H256::from(value)
- } else {
- match had_value {
- Some(had_value) => H256::from(had_value),
- None => continue,
- }
- };
- storage_map.insert(key.into(), value_to_insert);
- }
- }
}
pub(crate) struct CallTraceStepStackItem<'a> {
@@ -535,9 +504,7 @@ pub(crate) struct CallTraceStep {
pub(crate) gas_cost: u64,
/// Change of the contract state after step execution (effect of the SLOAD/SSTORE instructions)
pub(crate) storage_change: Option