feat(primitives): remove TxValue wrapper (#6874)

paradigmxyz · Feb 29, 2024 · e0fc334 · e0fc334
1 parent d47171b
commit e0fc334
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 227 deletions.
diff --git a/bin/reth/src/commands/db/static_files/mod.rs b/bin/reth/src/commands/db/static_files/mod.rs
@@ -183,7 +183,7 @@ impl Command {
     fn generate_static_file<DB: Database>(
         &self,
         factory: Arc<ProviderFactory<DB>>,
-        segment: impl Segment<DB> + Send + Sync,
+        segment: impl Segment<DB>,
         config: SegmentConfig,
     ) -> eyre::Result<()> {
         let dir = PathBuf::default();

diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs
@@ -439,7 +439,7 @@ mod tests {
             gas_price: 0x28f000fff,
             gas_limit: 10,
             to: TransactionKind::Call(Address::default()),
-            value: 3_u64.into(),
+            value: U256::from(3_u64),
             input: Bytes::from(vec![1, 2]),
             access_list: Default::default(),
         });
@@ -461,7 +461,7 @@ mod tests {
             max_fee_per_blob_gas: 0x7,
             gas_limit: 10,
             to: TransactionKind::Call(Address::default()),
-            value: 3_u64.into(),
+            value: U256::from(3_u64),
             input: Bytes::from(vec![1, 2]),
             access_list: Default::default(),
             blob_versioned_hashes: std::iter::repeat_with(|| rng.gen()).take(num_blobs).collect(),

diff --git a/crates/interfaces/src/test_utils/generators.rs b/crates/interfaces/src/test_utils/generators.rs
@@ -80,7 +80,7 @@ pub fn random_tx<R: Rng>(rng: &mut R) -> Transaction {
         gas_price: rng.gen::<u16>().into(),
         gas_limit: rng.gen::<u16>().into(),
         to: TransactionKind::Call(rng.gen()),
-        value: U256::from(rng.gen::<u16>()).into(),
+        value: U256::from(rng.gen::<u16>()),
         input: Bytes::default(),
     })
 }
@@ -396,7 +396,7 @@ mod tests {
             nonce: 0x42,
             gas_limit: 44386,
             to: TransactionKind::Call(hex!("6069a6c32cf691f5982febae4faf8a6f3ab2f0f6").into()),
-            value: 0_u64.into(),
+            value: U256::from(0_u64),
             input:  hex!("a22cb4650000000000000000000000005eee75727d804a2b13038928d36f8b188945a57a0000000000000000000000000000000000000000000000000000000000000000").into(),
             max_fee_per_gas: 0x4a817c800,
             max_priority_fee_per_gas: 0x3b9aca00,
@@ -428,7 +428,7 @@ mod tests {
             gas_price: 20 * 10_u128.pow(9),
             gas_limit: 21000,
             to: TransactionKind::Call(hex!("3535353535353535353535353535353535353535").into()),
-            value: 10_u128.pow(18).into(),
+            value: U256::from(10_u128.pow(18)),
             input: Bytes::default(),
         });
 

diff --git a/crates/net/eth-wire/src/types/blocks.rs b/crates/net/eth-wire/src/types/blocks.rs
@@ -386,7 +386,7 @@ mod tests {
                             gas_price: 0x4a817c808,
                             gas_limit: 0x2e248u64,
                             to: TransactionKind::Call(hex!("3535353535353535353535353535353535353535").into()),
-                            value: 0x200u64.into(),
+                            value: U256::from(0x200u64),
                             input: Default::default(),
                         }),
                         Signature {
@@ -401,7 +401,7 @@ mod tests {
                             gas_price: 0x4a817c809,
                             gas_limit: 0x33450u64,
                             to: TransactionKind::Call(hex!("3535353535353535353535353535353535353535").into()),
-                            value: 0x2d9u64.into(),
+                            value: U256::from(0x2d9u64),
                             input: Default::default(),
                         }), Signature {
                                 odd_y_parity: false,
@@ -458,7 +458,7 @@ mod tests {
                                 gas_price: 0x4a817c808,
                                 gas_limit: 0x2e248u64,
                                 to: TransactionKind::Call(hex!("3535353535353535353535353535353535353535").into()),
-                                value: 0x200u64.into(),
+                                value: U256::from(0x200u64),
                                 input: Default::default(),
                             }),
                             Signature {
@@ -474,7 +474,7 @@ mod tests {
                                 gas_price: 0x4a817c809,
                                 gas_limit: 0x33450u64,
                                 to: TransactionKind::Call(hex!("3535353535353535353535353535353535353535").into()),
-                                value: 0x2d9u64.into(),
+                                value: U256::from(0x2d9u64),
                                 input: Default::default(),
                             }),
                             Signature {

diff --git a/crates/net/eth-wire/src/types/transactions.rs b/crates/net/eth-wire/src/types/transactions.rs
@@ -130,7 +130,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("3535353535353535353535353535353535353535").into(),
                         ),
-                        value: 0x200u64.into(),
+                        value: U256::from(0x200u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -154,7 +154,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("3535353535353535353535353535353535353535").into(),
                         ),
-                        value: 0x2d9u64.into(),
+                        value: U256::from(0x2d9u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -192,7 +192,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("3535353535353535353535353535353535353535").into(),
                         ),
-                        value: 0x200u64.into(),
+                        value: U256::from(0x200u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -216,7 +216,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("3535353535353535353535353535353535353535").into(),
                         ),
-                        value: 0x2d9u64.into(),
+                        value: U256::from(0x2d9u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -257,7 +257,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("cf7f9e66af820a19257a2108375b180b0ec49167").into(),
                         ),
-                        value: 1234u64.into(),
+                        value: U256::from(1234u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -282,7 +282,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("61815774383099e24810ab832a5b2a5425c154d5").into(),
                         ),
-                        value: 3000000000000000000u64.into(),
+                        value: U256::from(3000000000000000000u64),
                         input: Default::default(),
                         access_list: Default::default(),
                     }),
@@ -307,7 +307,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 1000000000000000u64.into(),
+                        value: U256::from(1000000000000000u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -331,7 +331,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 693361000000000u64.into(),
+                        value: U256::from(693361000000000u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -355,7 +355,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 1000000000000000u64.into(),
+                        value: U256::from(1000000000000000u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -400,7 +400,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("cf7f9e66af820a19257a2108375b180b0ec49167").into(),
                         ),
-                        value: 1234u64.into(),
+                        value: U256::from(1234u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -425,7 +425,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("61815774383099e24810ab832a5b2a5425c154d5").into(),
                         ),
-                        value: 3000000000000000000u64.into(),
+                        value: U256::from(3000000000000000000u64),
                         input: Default::default(),
                         access_list: Default::default(),
                     }),
@@ -450,7 +450,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 1000000000000000u64.into(),
+                        value: U256::from(1000000000000000u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -474,7 +474,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 693361000000000u64.into(),
+                        value: U256::from(693361000000000u64),
                         input: Default::default(),
                     }),
                     Signature {
@@ -498,7 +498,7 @@ mod tests {
                         to: TransactionKind::Call(
                             hex!("d3e8763675e4c425df46cc3b5c0f6cbdac396046").into(),
                         ),
-                        value: 1000000000000000u64.into(),
+                        value: U256::from(1000000000000000u64),
                         input: Default::default(),
                     }),
                     Signature {

diff --git a/crates/net/network/tests/it/requests.rs b/crates/net/network/tests/it/requests.rs
@@ -26,7 +26,7 @@ pub fn rng_transaction(rng: &mut impl rand::RngCore) -> TransactionSigned {
         gas_price: rng.gen(),
         gas_limit: rng.gen(),
         to: TransactionKind::Create,
-        value: rng.gen::<u128>().into(),
+        value: U256::from(rng.gen::<u128>()),
         input: Bytes::from(vec![1, 2]),
         access_list: Default::default(),
     });

diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs
@@ -92,7 +92,7 @@ pub use transaction::{
     AccessList, AccessListItem, FromRecoveredTransaction, IntoRecoveredTransaction,
     InvalidTransactionError, Signature, Transaction, TransactionKind, TransactionMeta,
     TransactionSigned, TransactionSignedEcRecovered, TransactionSignedNoHash, TxEip1559, TxEip2930,
-    TxEip4844, TxHashOrNumber, TxLegacy, TxType, TxValue, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID,
+    TxEip4844, TxHashOrNumber, TxLegacy, TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID,
     EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID,
 };
 pub use withdrawal::{Withdrawal, Withdrawals};

diff --git a/crates/primitives/src/proofs.rs b/crates/primitives/src/proofs.rs
@@ -5,9 +5,8 @@ use crate::{
     keccak256,
     trie::{HashBuilder, Nibbles, TrieAccount},
     Address, Header, Receipt, ReceiptWithBloom, ReceiptWithBloomRef, TransactionSigned, Withdrawal,
-    B256,
+    B256, U256,
 };
-use alloy_primitives::U256;
 use alloy_rlp::Encodable;
 use bytes::{BufMut, BytesMut};
 use itertools::Itertools;

diff --git a/crates/primitives/src/revm/env.rs b/crates/primitives/src/revm/env.rs
@@ -200,7 +200,7 @@ where
                 TransactionKind::Call(to) => TransactTo::Call(to),
                 TransactionKind::Create => TransactTo::create(),
             };
-            tx_env.value = tx.value.into();
+            tx_env.value = tx.value;
             tx_env.data = tx.input.clone();
             tx_env.chain_id = tx.chain_id;
             tx_env.nonce = Some(tx.nonce);
@@ -216,7 +216,7 @@ where
                 TransactionKind::Call(to) => TransactTo::Call(to),
                 TransactionKind::Create => TransactTo::create(),
             };
-            tx_env.value = tx.value.into();
+            tx_env.value = tx.value;
             tx_env.data = tx.input.clone();
             tx_env.chain_id = Some(tx.chain_id);
             tx_env.nonce = Some(tx.nonce);
@@ -239,7 +239,7 @@ where
                 TransactionKind::Call(to) => TransactTo::Call(to),
                 TransactionKind::Create => TransactTo::create(),
             };
-            tx_env.value = tx.value.into();
+            tx_env.value = tx.value;
             tx_env.data = tx.input.clone();
             tx_env.chain_id = Some(tx.chain_id);
             tx_env.nonce = Some(tx.nonce);
@@ -262,7 +262,7 @@ where
                 TransactionKind::Call(to) => TransactTo::Call(to),
                 TransactionKind::Create => TransactTo::create(),
             };
-            tx_env.value = tx.value.into();
+            tx_env.value = tx.value;
             tx_env.data = tx.input.clone();
             tx_env.chain_id = Some(tx.chain_id);
             tx_env.nonce = Some(tx.nonce);
@@ -287,7 +287,7 @@ where
                 TransactionKind::Call(to) => tx_env.transact_to = TransactTo::Call(to),
                 TransactionKind::Create => tx_env.transact_to = TransactTo::create(),
             }
-            tx_env.value = tx.value.into();
+            tx_env.value = tx.value;
             tx_env.data = tx.input.clone();
             tx_env.chain_id = None;
             tx_env.nonce = None;

diff --git a/crates/primitives/src/transaction/access_list.rs b/crates/primitives/src/transaction/access_list.rs
@@ -1,5 +1,4 @@
-use crate::{Address, B256};
-use alloy_primitives::U256;
+use crate::{Address, B256, U256};
 use alloy_rlp::{RlpDecodable, RlpDecodableWrapper, RlpEncodable, RlpEncodableWrapper};
 use reth_codecs::{main_codec, Compact};
 use std::{

diff --git a/crates/primitives/src/transaction/eip1559.rs b/crates/primitives/src/transaction/eip1559.rs
@@ -1,5 +1,5 @@
 use super::access_list::AccessList;
-use crate::{keccak256, Bytes, ChainId, Signature, TransactionKind, TxType, TxValue, B256};
+use crate::{keccak256, Bytes, ChainId, Signature, TransactionKind, TxType, B256, U256};
 use alloy_rlp::{length_of_length, Decodable, Encodable, Header};
 use bytes::BytesMut;
 use reth_codecs::{main_codec, Compact};
@@ -46,7 +46,7 @@ pub struct TxEip1559 {
     /// 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.
-    pub value: TxValue,
+    pub value: U256,
     /// 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).
@@ -188,7 +188,7 @@ impl TxEip1559 {
         mem::size_of::<u128>() + // max_fee_per_gas
         mem::size_of::<u128>() + // max_priority_fee_per_gas
         self.to.size() + // to
-        mem::size_of::<TxValue>() + // value
+        mem::size_of::<U256>() + // value
         self.access_list.size() + // access_list
         self.input.len() // input
     }
@@ -244,7 +244,7 @@ mod tests {
             nonce: 0x42,
             gas_limit: 44386,
             to: TransactionKind::Call( hex!("6069a6c32cf691f5982febae4faf8a6f3ab2f0f6").into()),
-            value: 0_u64.into(),
+            value: U256::ZERO,
             input:  hex!("a22cb4650000000000000000000000005eee75727d804a2b13038928d36f8b188945a57a0000000000000000000000000000000000000000000000000000000000000000").into(),
             max_fee_per_gas: 0x4a817c800,
             max_priority_fee_per_gas: 0x3b9aca00,

diff --git a/crates/primitives/src/transaction/eip2930.rs b/crates/primitives/src/transaction/eip2930.rs
@@ -1,5 +1,5 @@
 use super::access_list::AccessList;
-use crate::{keccak256, Bytes, ChainId, Signature, TransactionKind, TxType, TxValue, B256};
+use crate::{keccak256, Bytes, ChainId, Signature, TransactionKind, TxType, B256, U256};
 use alloy_rlp::{length_of_length, Decodable, Encodable, Header};
 use bytes::BytesMut;
 use reth_codecs::{main_codec, Compact};
@@ -34,7 +34,7 @@ pub struct TxEip2930 {
     /// 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.
-    pub value: TxValue,
+    pub value: U256,
     /// 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).
@@ -58,7 +58,7 @@ impl TxEip2930 {
         mem::size_of::<u128>() + // gas_price
         mem::size_of::<u64>() + // gas_limit
         self.to.size() + // to
-        mem::size_of::<TxValue>() + // value
+        mem::size_of::<U256>() + // value
         self.access_list.size() + // access_list
         self.input.len() // input
     }
@@ -204,7 +204,7 @@ mod tests {
             gas_price: 1,
             gas_limit: 2,
             to: TransactionKind::Create,
-            value: 3_u64.into(),
+            value: U256::from(3),
             input: Bytes::from(vec![1, 2]),
             access_list: Default::default(),
         });
@@ -227,7 +227,7 @@ mod tests {
             gas_price: 1,
             gas_limit: 2,
             to: TransactionKind::Call(Address::default()),
-            value: 3_u64.into(),
+            value: U256::from(3),
             input: Bytes::from(vec![1, 2]),
             access_list: Default::default(),
         });