paradigmxyz · mattsse · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023
@@ -23,6 +23,7 @@ itertools.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 jsonrpsee-types = { workspace = true, optional = true }
+alloy-primitives = { workspace = true, features = ["rand", "rlp"] }
 
 
 [features]

@@ -1,4 +1,5 @@
-use reth_primitives::{NodeRecord, PeerId, B256, U256};
+use alloy_primitives::{B256, U256};
+use reth_primitives::{NodeRecord, PeerId};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::BTreeMap,

@@ -1,5 +1,6 @@
 #![allow(missing_docs)]
-use reth_primitives::{serde_helper::JsonStorageKey, Address, Bytes, B256, B512, U256, U64};
+use alloy_primitives::{Address, Bytes, B256, B512, U256, U64};
+use reth_primitives::serde_helper::JsonStorageKey;
 use serde::{Deserialize, Serialize};
 
 /// Account information.

@@ -1,9 +1,7 @@
 //! Contains types that represent ethereum types in [reth_primitives] when used in RPC
 use crate::Transaction;
-use reth_primitives::{
-    Address, Bloom, Bytes, Header as PrimitiveHeader, SealedHeader, Withdrawal, B256, B64, U256,
-    U64,
-};
+use alloy_primitives::{Address, Bloom, Bytes, B256, B64, U256, U64};
+use reth_primitives::{Header as PrimitiveHeader, SealedHeader, Withdrawal};
 use serde::{ser::Error, Deserialize, Serialize, Serializer};
 use std::{collections::BTreeMap, ops::Deref};
 /// Block Transactions depending on the boolean attribute of `eth_getBlockBy*`,

@@ -1,6 +1,7 @@
 //use crate::access_list::AccessList;
 use crate::BlockOverrides;
-use reth_primitives::{AccessList, Address, BlockId, Bytes, B256, U256, U64, U8};
+use alloy_primitives::{Address, Bytes, B256, U256, U64, U8};
+use reth_primitives::{AccessList, BlockId};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 /// Bundle of transactions
 #[derive(Debug, Clone, Default, Eq, PartialEq, Serialize, Deserialize)]

@@ -1,6 +1,6 @@
 //! Contains types related to the Cancun hardfork that will be used by RPC to communicate with the
 //! beacon consensus engine.
-use reth_primitives::B256;
+use alloy_primitives::B256;
 
 /// Fields introduced in `engine_newPayloadV3` that are not present in the `ExecutionPayload` RPC
 /// object.

@@ -1,6 +1,6 @@
 use super::{PayloadStatus, PayloadStatusEnum};
 use crate::engine::PayloadId;
-use reth_primitives::B256;
+use alloy_primitives::B256;
 use serde::{Deserialize, Serialize};
 
 /// invalid forkchoice state error code.

@@ -1,7 +1,8 @@
 pub use crate::Withdrawal;
+use alloy_primitives::{Address, Bloom, Bytes, B256, B64, U256, U64};
 use reth_primitives::{
     kzg::{Blob, Bytes48},
-    Address, BlobTransactionSidecar, Bloom, Bytes, SealedBlock, B256, B64, U256, U64,
+    BlobTransactionSidecar, SealedBlock,
 };
 use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
 

@@ -1,4 +1,4 @@
-use reth_primitives::{B256, U256, U64};
+use alloy_primitives::{B256, U256, U64};
 use serde::{Deserialize, Serialize};
 
 /// This structure contains configurable settings of the transition process.

@@ -1,4 +1,4 @@
-use reth_primitives::U256;
+use alloy_primitives::U256;
 use serde::{Deserialize, Serialize};
 
 /// Internal struct to calculate reward percentiles

@@ -1,8 +1,7 @@
 use crate::Log as RpcLog;
+use alloy_primitives::{keccak256, Address, Bloom, BloomInput, B256, U256, U64};
 use itertools::{EitherOrBoth::*, Itertools};
-use reth_primitives::{
-    keccak256, Address, BlockNumberOrTag, Bloom, BloomInput, Log, B256, U256, U64,
-};
+use reth_primitives::{BlockNumberOrTag, Log};
 use serde::{
     de::{DeserializeOwned, MapAccess, Visitor},
     ser::SerializeStruct,
@@ -294,7 +293,7 @@ impl Filter {
     /// Match a block by its hash
     ///
     /// ```rust
-    /// # use reth_primitives::B256;
+    /// # use alloy_primitives::B256;
     /// # use reth_rpc_types::Filter;
     /// # fn main() {
     /// let filter = Filter::new().select(B256::ZERO);
@@ -365,7 +364,7 @@ impl Filter {
     /// Match only a specific address `("0xAc4b3DacB91461209Ae9d41EC517c2B9Cb1B7DAF")`
     ///
     /// ```rust
-    /// # use reth_primitives::Address;
+    /// # use alloy_primitives::Address;
     /// # use reth_rpc_types::Filter;
     /// # fn main() {
     /// let filter = Filter::new().address("0xAc4b3DacB91461209Ae9d41EC517c2B9Cb1B7DAF".parse::<Address>().unwrap());
@@ -376,7 +375,7 @@ impl Filter {
     /// "0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8"])`
     ///
     /// ```rust
-    /// # use reth_primitives::Address;
+    /// # use alloy_primitives::Address;
     /// # use reth_rpc_types::Filter;
     /// # fn main() {
     /// let addresses = vec!["0xAc4b3DacB91461209Ae9d41EC517c2B9Cb1B7DAF".parse::<Address>().unwrap(),"0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8".parse::<Address>().unwrap()];
@@ -914,7 +913,7 @@ impl From<jsonrpsee_types::SubscriptionId<'_>> for FilterId {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reth_primitives::U256;
+    use alloy_primitives::U256;
     use serde_json::json;
 
     fn serialize<T: serde::Serialize>(t: &T) -> serde_json::Value {

@@ -1,4 +1,4 @@
-use reth_primitives::U256;
+use alloy_primitives::U256;
 use serde::{
     de::{Error, Visitor},
     Deserialize, Deserializer, Serialize, Serializer,

@@ -1,4 +1,4 @@
-use reth_primitives::{Address, Bytes, B256, U256};
+use alloy_primitives::{Address, Bytes, B256, U256};
 use serde::{Deserialize, Serialize};
 
 /// Ethereum Log emitted by a transaction

@@ -5,7 +5,7 @@ use crate::{
     Log, RichHeader,
 };
 
-use reth_primitives::B256;
+use alloy_primitives::B256;
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 
 /// Subscription result.

@@ -1,6 +1,6 @@
 //! bindings for state overrides in eth_call
 
-use reth_primitives::{Address, Bytes, B256, U256, U64};
+use alloy_primitives::{Address, Bytes, B256, U256, U64};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
@@ -34,7 +34,7 @@ pub struct AccountOverride {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reth_primitives::address;
+    use alloy_primitives::address;
 
     #[test]
     fn test_state_override() {

@@ -1,4 +1,4 @@
-use reth_primitives::{B512, U256, U64};
+use alloy_primitives::{B512, U256, U64};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::collections::BTreeMap;
 

@@ -1,5 +1,6 @@
 //! `trace_filter` types and support
-use reth_primitives::{serde_helper::num::u64_hex_or_decimal_opt, Address};
+use alloy_primitives::Address;
+use reth_primitives::serde_helper::num::u64_hex_or_decimal_opt;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 

@@ -1,4 +1,5 @@
-use reth_primitives::{serde_helper::num::from_int_or_hex, Address, Bytes, B256, U256};
+use alloy_primitives::{Address, Bytes, B256, U256};
+use reth_primitives::serde_helper::num::from_int_or_hex;
 use serde::{Deserialize, Serialize};
 
 /// The response object for `debug_traceTransaction` with `"tracer": "callTracer"`

@@ -2,7 +2,7 @@
 #![allow(missing_docs)]
 
 use crate::{state::StateOverride, BlockOverrides};
-use reth_primitives::{Bytes, B256, U256};
+use alloy_primitives::{Bytes, B256, U256};
 use serde::{de::DeserializeOwned, ser::SerializeMap, Deserialize, Serialize, Serializer};
 use std::{collections::BTreeMap, time::Duration};
 

@@ -1,4 +1,5 @@
-use reth_primitives::{serde_helper::num::from_int_or_hex_opt, Address, Bytes, B256, U256};
+use alloy_primitives::{Address, Bytes, B256, U256};
+use reth_primitives::serde_helper::num::from_int_or_hex_opt;
 use serde::{Deserialize, Serialize};
 use std::collections::{btree_map, BTreeMap};
 

@@ -3,7 +3,7 @@
 //!
 //! See <https://openethereum.github.io/JSONRPC-trace-module>
 
-use reth_primitives::{Address, Bytes, B256, U256, U64};
+use alloy_primitives::{Address, Bytes, B256, U256, U64};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::BTreeMap,

@@ -1,7 +1,7 @@
 //! Commonly used additional types that are not part of the JSON RPC spec but are often required
 //! when working with RPC types, such as [Transaction](crate::Transaction)
 
-use reth_primitives::{TxHash, B256};
+use alloy_primitives::{TxHash, B256};
 
 /// Additional fields in the context of a block that contains this transaction.
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq)]

@@ -1,8 +1,8 @@
 pub use access_list::{AccessList, AccessListItem, AccessListWithGasUsed};
+use alloy_primitives::{Address, Bytes, B256, U128, U256, U64};
 pub use common::TransactionInfo;
 pub use receipt::TransactionReceipt;
 pub use request::TransactionRequest;
-use reth_primitives::{Address, Bytes, B256, U128, U256, U64};
 use serde::{Deserialize, Serialize};
 pub use signature::{Parity, Signature};
 pub use typed::*;

@@ -1,5 +1,5 @@
 use crate::Log;
-use reth_primitives::{Address, Bloom, B256, U128, U256, U64, U8};
+use alloy_primitives::{Address, Bloom, B256, U128, U256, U64, U8};
 use serde::{Deserialize, Serialize};
 
 /// Transaction receipt

@@ -2,7 +2,8 @@ use crate::eth::transaction::typed::{
     EIP1559TransactionRequest, EIP2930TransactionRequest, LegacyTransactionRequest,
     TransactionKind, TypedTransactionRequest,
 };
-use reth_primitives::{AccessList, Address, Bytes, U128, U256, U64, U8};
+use alloy_primitives::{Address, Bytes, U128, U256, U64, U8};
+use reth_primitives::AccessList;
 use serde::{Deserialize, Serialize};
 
 /// Represents _all_ transaction requests received from RPC

@@ -1,5 +1,5 @@
 //! Signature related RPC values
-use reth_primitives::U256;
+use alloy_primitives::U256;
 use serde::{Deserialize, Serialize};
 
 /// Container type for all signature fields in RPC

@@ -3,11 +3,11 @@
 //! transaction deserialized from the json input of an RPC call. Depending on what fields are set,
 //! it can be converted into the container type [`TypedTransactionRequest`].
 
+use alloy_primitives::{Address, Bytes, B256, U128, U256, U64};
 use alloy_rlp::{BufMut, Decodable, Encodable, Error as RlpError, RlpDecodable, RlpEncodable};
 use reth_primitives::{
     kzg::{Blob, Bytes48},
-    AccessList, Address, Bytes, Transaction, TxEip1559, TxEip2930, TxEip4844, TxLegacy, B256, U128,
-    U256, U64,
+    AccessList, Transaction, TxEip1559, TxEip2930, TxEip4844, TxLegacy,
 };
 use serde::{Deserialize, Serialize};
 /// Container type for various Ethereum transaction requests

@@ -1,7 +1,7 @@
 //! Types for the `txpool` namespace: <https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-txpool>
 
 use crate::Transaction;
-use reth_primitives::{Address, U256, U64};
+use alloy_primitives::{Address, U256, U64};
 use serde::{
     de::{self, Deserializer, Visitor},
     Deserialize, Serialize,

@@ -1,5 +1,6 @@
+use alloy_primitives::{Address, U256};
 use alloy_rlp::RlpEncodable;
-use reth_primitives::{constants::GWEI_TO_WEI, serde_helper::u64_hex, Address, U256};
+use reth_primitives::{constants::GWEI_TO_WEI, serde_helper::u64_hex};
 use serde::{Deserialize, Serialize};
 /// Withdrawal represents a validator withdrawal from the consensus layer.
 #[derive(Debug, Clone, PartialEq, Eq, Default, Hash, RlpEncodable, Serialize, Deserialize)]

@@ -1,4 +1,4 @@
-use reth_primitives::{B256, U256};
+use alloy_primitives::{B256, U256};
 use serde::{
     de::{Error, SeqAccess, Visitor},
     Deserialize, Deserializer, Serialize, Serializer,

@@ -1,6 +1,7 @@
 //! MEV-share bundle type bindings
 #![allow(missing_docs)]
-use reth_primitives::{Address, BlockId, BlockNumber, Bytes, Log, TxHash, B256, U256, U64};
+use alloy_primitives::{Address, BlockNumber, Bytes, TxHash, B256, U256, U64};
+use reth_primitives::{BlockId, Log};
 use serde::{
     ser::{SerializeSeq, Serializer},
     Deserialize, Deserializer, Serialize,
@@ -646,7 +647,7 @@ pub struct EthCallBundleTransactionResult {
 }
 
 mod u256_numeric_string {
-    use reth_primitives::U256;
+    use alloy_primitives::U256;
     use serde::{de, Deserialize, Serializer};
     use std::str::FromStr;
 
@@ -681,7 +682,7 @@ mod u256_numeric_string {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reth_primitives::Bytes;
+    use alloy_primitives::Bytes;
     use std::str::FromStr;
 
     #[test]

@@ -1,5 +1,5 @@
 use crate::{Block, BlockTransactions, Rich, Transaction, TransactionReceipt};
-use reth_primitives::{Address, Bytes, U256};
+use alloy_primitives::{Address, Bytes, U256};
 use serde::{Deserialize, Serialize};
 
 /// Operation type enum for `InternalOperation` struct