feat: add TransactionSigned::recover_signers (#4098)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
joshieDo
2023-08-08 10:53:12 +01:00
committed by GitHub
parent 62f39a5a15
commit 4b0b63766e
7 changed files with 37 additions and 19 deletions

1
Cargo.lock generated
View File

@@ -5820,6 +5820,7 @@ dependencies = [
"proptest",
"proptest-derive",
"rand 0.8.5",
"rayon",
"reth-codecs",
"reth-rlp",
"reth-rlp-derive",

View File

@@ -349,10 +349,8 @@ impl StorageInner {
let block = Block { header, body: transactions, ommers: vec![], withdrawals: None };
let senders =
block.body.iter().map(|tx| tx.recover_signer()).collect::<Option<Vec<_>>>().ok_or(
BlockExecutionError::Validation(BlockValidationError::SenderRecoveryError),
)?;
let senders = TransactionSigned::recover_signers(block.body.iter(), block.body.len())
.ok_or(BlockExecutionError::Validation(BlockValidationError::SenderRecoveryError))?;
trace!(target: "consensus::auto", transactions=?&block.body, "executing transactions");

View File

@@ -60,6 +60,7 @@ impl-serde = "0.4.0"
once_cell = "1.17.0"
zstd = { version = "0.12", features = ["experimental"] }
paste = "1.0"
rayon = "1.7"
# proof related
triehash = "0.8"

View File

@@ -163,7 +163,7 @@ impl SealedBlock {
/// Expensive operation that recovers transaction signer. See [SealedBlockWithSenders].
pub fn senders(&self) -> Option<Vec<Address>> {
self.body.iter().map(|tx| tx.recover_signer()).collect::<Option<Vec<Address>>>()
TransactionSigned::recover_signers(self.body.iter(), self.body.len())
}
/// Seal sealed block with recovered transaction senders.

View File

@@ -7,6 +7,7 @@ use bytes::{Buf, BytesMut};
use derive_more::{AsRef, Deref};
pub use error::InvalidTransactionError;
pub use meta::TransactionMeta;
use rayon::prelude::{ParallelBridge, ParallelIterator};
use reth_codecs::{add_arbitrary_tests, derive_arbitrary, Compact};
use reth_rlp::{
length_of_length, Decodable, DecodeError, Encodable, Header, EMPTY_LIST_CODE, EMPTY_STRING_CODE,
@@ -32,6 +33,10 @@ mod signature;
mod tx_type;
pub(crate) mod util;
// Expected number of transactions where we can expect a speed-up by recovering the senders in
// parallel.
const PARALLEL_SENDER_RECOVERY_THRESHOLD: usize = 10;
/// A raw transaction.
///
/// Transaction types were introduced in [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718).
@@ -937,6 +942,21 @@ impl TransactionSigned {
self.signature.recover_signer(signature_hash)
}
/// Recovers a list of signers from a transaction list iterator
///
/// Returns `None`, if some transaction's signature is invalid, see also
/// [Self::recover_signer].
pub fn recover_signers<'a>(
txes: impl Iterator<Item = &'a Self> + Send,
num_txes: usize,
) -> Option<Vec<Address>> {
if num_txes < PARALLEL_SENDER_RECOVERY_THRESHOLD {
txes.map(|tx| tx.recover_signer()).collect()
} else {
txes.cloned().par_bridge().map(|tx| tx.recover_signer()).collect()
}
}
/// Consumes the type, recover signer and return [`TransactionSignedEcRecovered`]
///
/// Returns `None` if the transaction's signature is invalid, see also [Self::recover_signer].

View File

@@ -84,11 +84,8 @@ where
Err(BlockValidationError::SenderRecoveryError.into())
}
} else {
body.iter()
.map(|tx| {
tx.recover_signer().ok_or(BlockValidationError::SenderRecoveryError.into())
})
.collect()
TransactionSigned::recover_signers(body.iter(), body.len())
.ok_or(BlockValidationError::SenderRecoveryError.into())
}
}

View File

@@ -22,7 +22,10 @@ use reth_db::{
transaction::{DbTx, DbTxMut},
BlockNumberList, DatabaseError,
};
use reth_interfaces::Result;
use reth_interfaces::{
executor::{BlockExecutionError, BlockValidationError},
Result,
};
use reth_primitives::{
keccak256,
stage::{StageCheckpoint, StageId},
@@ -1910,14 +1913,12 @@ impl<'this, TX: DbTxMut<'this> + DbTx<'this>> BlockWriter for DatabaseProvider<'
let tx_iter = if Some(block.body.len()) == senders_len {
block.body.into_iter().zip(senders.unwrap()).collect::<Vec<(_, _)>>()
} else {
block
.body
.into_iter()
.map(|tx| {
let signer = tx.recover_signer();
(tx, signer.unwrap_or_default())
})
.collect::<Vec<(_, _)>>()
let senders = TransactionSigned::recover_signers(block.body.iter(), block.body.len())
.ok_or(BlockExecutionError::Validation(
BlockValidationError::SenderRecoveryError,
))?;
block.body.into_iter().zip(senders).collect()
};
for (transaction, sender) in tx_iter {