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: add TransactionSigned::new fns (#12768)

Browse Source
This commit is contained in:
Matthias Seitz
2024-11-22 11:37:34 +01:00
committed by GitHub
parent 7d24aa40e8
commit 3765ae2444
14 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/primitives/src/transaction/mod.rs
View File

@ -914,7 +914,7 @@ impl TransactionSignedNoHash {
#[inline]
pub fn with_hash(self) -> TransactionSigned {
let Self { signature, transaction } = self;
TransactionSigned::from_transaction_and_signature(transaction, signature)
TransactionSigned::new_unhashed(transaction, signature)
}
/// Recovers a list of signers from a transaction list iterator
@ -1105,6 +1105,18 @@ impl PartialEq for TransactionSigned {
// === impl TransactionSigned ===
impl TransactionSigned {
/// Creates a new signed transaction from the given parts.
pub fn new(transaction: Transaction, signature: Signature, hash: B256) -> Self {
Self { hash: hash.into(), signature, transaction }
}
/// Creates a new signed transaction from the given transaction and signature without the hash.
///
/// Note: this only calculates the hash on the first [`TransactionSigned::hash`] call.
pub fn new_unhashed(transaction: Transaction, signature: Signature) -> Self {
Self { hash: Default::default(), signature, transaction }
}
/// Transaction signature.
pub const fn signature(&self) -> &Signature {
&self.signature
@ -1251,13 +1263,6 @@ impl TransactionSigned {
keccak256(self.encoded_2718())
}
/// Create a new signed transaction from a transaction and its signature.
///
/// This will also calculate the transaction hash using its encoding.
pub fn from_transaction_and_signature(transaction: Transaction, signature: Signature) -> Self {
Self { transaction, signature, hash: Default::default() }
}
/// Decodes legacy transaction from the data buffer into a tuple.
///
/// This expects `rlp(legacy_tx)`
@ -1614,7 +1619,7 @@ impl Decodable2718 for TransactionSigned {
Ok(Self { transaction: Transaction::Eip4844(tx), signature, hash: hash.into() })
}
#[cfg(feature = "optimism")]
TxType::Deposit => Ok(Self::from_transaction_and_signature(
TxType::Deposit => Ok(Self::new_unhashed(
Transaction::Deposit(TxDeposit::rlp_decode(buf)?),
TxDeposit::signature(),
)),
@ -1652,7 +1657,7 @@ impl<'a> arbitrary::Arbitrary<'a> for TransactionSigned {
#[cfg(feature = "optimism")]
let signature = if transaction.is_deposit() { TxDeposit::signature() } else { signature };
Ok(Self::from_transaction_and_signature(transaction, signature))
Ok(Self::new_unhashed(transaction, signature))
}
}
@ -2191,7 +2196,7 @@ mod tests {
signature: Signature,
hash: Option<B256>,
) {
let expected = TransactionSigned::from_transaction_and_signature(transaction, signature);
let expected = TransactionSigned::new_unhashed(transaction, signature);
if let Some(hash) = hash {
assert_eq!(hash, expected.hash());
}
@ -2288,7 +2293,7 @@ mod tests {
let signature =
crate::sign_message(B256::from_slice(&key_pair.secret_bytes()[..]), tx.signature_hash()).unwrap();
TransactionSigned::from_transaction_and_signature(tx, signature)
TransactionSigned::new_unhashed(tx, signature)
}).collect();
let parallel_senders = TransactionSigned::recover_signers(&txes, txes.len()).unwrap();