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

change transaction value fields from u128 to a wrapper-type of U256 (#4439)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Roberto Bayardo
2023-10-04 05:07:44 -07:00
committed by GitHub
parent d3cc4cc643
commit 081d71e1a2
23 changed files with 204 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/transaction-pool/src/test_utils/mock.rs
View File

@ -16,7 +16,7 @@ use reth_primitives::{
hex, Address, FromRecoveredPooledTransaction, FromRecoveredTransaction,
IntoRecoveredTransaction, PooledTransactionsElementEcRecovered, Signature, Transaction,
TransactionKind, TransactionSigned, TransactionSignedEcRecovered, TxEip1559, TxEip2930,
TxEip4844, TxHash, TxLegacy, TxType, B256, EIP1559_TX_TYPE_ID, EIP4844_TX_TYPE_ID,
TxEip4844, TxHash, TxLegacy, TxType, TxValue, B256, EIP1559_TX_TYPE_ID, EIP4844_TX_TYPE_ID,
LEGACY_TX_TYPE_ID, U128, U256,
};
use std::{ops::Range, sync::Arc, time::Instant};
@ -512,7 +512,7 @@ impl FromRecoveredTransaction for MockTransaction {
gas_price,
gas_limit,
to,
value: U256::from(value),
value: value.into(),
},
Transaction::Eip1559(TxEip1559 {
chain_id: _,
@ -532,7 +532,7 @@ impl FromRecoveredTransaction for MockTransaction {
max_priority_fee_per_gas,
gas_limit,
to,
value: U256::from(value),
value: value.into(),
},
Transaction::Eip4844(TxEip4844 {
chain_id: _,
@ -555,7 +555,7 @@ impl FromRecoveredTransaction for MockTransaction {
max_fee_per_blob_gas,
gas_limit,
to,
value: U256::from(value),
value: value.into(),
},
Transaction::Eip2930 { .. } => {
unimplemented!()
@ -626,7 +626,7 @@ impl proptest::arbitrary::Arbitrary for MockTransaction {
gas_price: *gas_price,
gas_limit: *gas_limit,
to: *to,
value: U256::from(*value),
value: (*value).into(),
},
Transaction::Eip1559(TxEip1559 {
nonce,
@ -645,7 +645,7 @@ impl proptest::arbitrary::Arbitrary for MockTransaction {
max_priority_fee_per_gas: *max_priority_fee_per_gas,
gas_limit: *gas_limit,
to: *to,
value: U256::from(*value),
value: (*value).into(),
},
Transaction::Eip4844(TxEip4844 {
nonce,
@ -666,7 +666,7 @@ impl proptest::arbitrary::Arbitrary for MockTransaction {
max_fee_per_blob_gas: *max_fee_per_blob_gas,
gas_limit: *gas_limit,
to: *to,
value: U256::from(*value),
value: (*value).into(),
},
})
.boxed()

3
crates/transaction-pool/src/traits.rs
View File

@ -811,7 +811,8 @@ impl EthPooledTransaction {
U256::from(t.max_fee_per_gas) * U256::from(t.gas_limit)
}
};
let mut cost = gas_cost + U256::from(transaction.value());
let mut cost: U256 = transaction.value().into();
cost += gas_cost;
if let Some(blob_tx) = transaction.as_eip4844() {
// add max blob cost