jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: relax BodyStage bounds (#12539)

Browse Source
This commit is contained in:
Arsenii Kulikov
2024-11-14 19:23:15 +04:00
committed by GitHub
parent 3154a4f66c
commit 77e687c28c
9 changed files with 47 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
crates/primitives-traits/src/block/body.rs
View File

@ -1,10 +1,8 @@
//! Block body abstraction.
use alloc::{fmt, vec::Vec};
use alloc::fmt;
use alloy_consensus::{BlockHeader, Transaction, TxType};
use alloy_eips::{eip4895::Withdrawal, eip7685::Requests};
use alloy_primitives::{Address, B256};
use alloy_consensus::Transaction;
use crate::InMemorySize;
@ -26,67 +24,8 @@ pub trait BlockBody:
{
/// Ordered list of signed transactions as committed in block.
// todo: requires trait for signed transaction
type SignedTransaction: Transaction;
/// Header type (uncle blocks).
type Header: BlockHeader;
/// Withdrawals in block.
type Withdrawals: Iterator<Item = Withdrawal>;
type Transaction: Transaction;
/// Returns reference to transactions in block.
fn transactions(&self) -> &[Self::SignedTransaction];
/// Returns `Withdrawals` in the block, if any.
// todo: branch out into extension trait
fn withdrawals(&self) -> Option<&Self::Withdrawals>;
/// Returns reference to uncle block headers.
fn ommers(&self) -> &[Self::Header];
/// Returns [`Requests`] in block, if any.
fn requests(&self) -> Option<&Requests>;
/// Calculate the transaction root for the block body.
fn calculate_tx_root(&self) -> B256;
/// Calculate the ommers root for the block body.
fn calculate_ommers_root(&self) -> B256;
/// Calculate the withdrawals root for the block body, if withdrawals exist. If there are no
/// withdrawals, this will return `None`.
// todo: can be default impl if `calculate_withdrawals_root` made into a method on
// `Withdrawals` and `Withdrawals` moved to alloy
fn calculate_withdrawals_root(&self) -> Option<B256>;
/// Recover signer addresses for all transactions in the block body.
fn recover_signers(&self) -> Option<Vec<Address>>;
/// Returns whether or not the block body contains any blob transactions.
fn has_blob_transactions(&self) -> bool {
self.transactions().iter().any(|tx| tx.ty() == TxType::Eip4844 as u8)
}
/// Returns whether or not the block body contains any EIP-7702 transactions.
fn has_eip7702_transactions(&self) -> bool {
self.transactions().iter().any(|tx| tx.ty() == TxType::Eip7702 as u8)
}
/// Returns an iterator over all blob transactions of the block
fn blob_transactions_iter(&self) -> impl Iterator<Item = &Self::SignedTransaction> + '_ {
self.transactions().iter().filter(|tx| tx.ty() == TxType::Eip4844 as u8)
}
/// Returns only the blob transactions, if any, from the block body.
fn blob_transactions(&self) -> Vec<&Self::SignedTransaction> {
self.blob_transactions_iter().collect()
}
/// Returns an iterator over all blob versioned hashes from the block body.
fn blob_versioned_hashes_iter(&self) -> impl Iterator<Item = &B256> + '_;
/// Returns all blob versioned hashes from the block body.
fn blob_versioned_hashes(&self) -> Vec<&B256> {
self.blob_versioned_hashes_iter().collect()
}
fn transactions(&self) -> &[Self::Transaction];
}

2
crates/primitives-traits/src/node.rs
View File

@ -24,7 +24,7 @@ impl NodePrimitives for () {
/// Helper trait that sets trait bounds on [`NodePrimitives`].
pub trait FullNodePrimitives: Send + Sync + Unpin + Clone + Default + fmt::Debug {
/// Block primitive.
type Block: FullBlock<Body: BlockBody<SignedTransaction = Self::SignedTx>>;
type Block: FullBlock<Body: BlockBody<Transaction = Self::SignedTx>>;
/// Signed version of the transaction type.
type SignedTx: FullSignedTx;
/// Transaction envelope type ID.