From cd08ba825f63dd60ecb64aa72ae47074e87d24e6 Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Thu, 28 Dec 2023 21:03:04 +0100 Subject: [PATCH] fix: ::bytes re-export (#5885) --- Cargo.lock | 25 +++++++++++++++++++++++-- crates/primitives/src/lib.rs | 9 +++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db68da191c..5ab534d80a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,9 +170,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0e5e60ff0e0c34c553822dabcfe0f5fece5a8c52f08a915be8c737de4b03fa" +checksum = "9c234f92024707f224510ff82419b2be0e1d8e1fd911defcac5a085cd7f83898" dependencies = [ "alloy-rlp", "arbitrary", @@ -185,6 +185,7 @@ dependencies = [ "getrandom 0.2.11", "hex-literal", "itoa", + "keccak-asm", "proptest", "proptest-derive", "rand 0.8.5", @@ -4005,6 +4006,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb8515fff80ed850aea4a1595f2e519c003e2a00a82fe168ebf5269196caf444" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -7425,6 +7436,16 @@ dependencies = [ "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac61da6b35ad76b195eb4771210f947734321a8d81d7738e1580d953bc7a15e" +dependencies = [ + "cc", + "cfg-if", +] + [[package]] name = "sharded-slab" version = "0.1.7" diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 37445e1dfb..988c82ecf4 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -50,7 +50,6 @@ pub use block::{ Block, BlockBody, BlockHashOrNumber, BlockId, BlockNumHash, BlockNumberOrTag, BlockWithSenders, ForkBlock, RpcBlockHash, SealedBlock, SealedBlockWithSenders, }; -pub use bytes::{self, Buf, BufMut, BytesMut}; pub use chain::{ AllGenesisFormats, BaseFeeParams, BaseFeeParamsKind, Chain, ChainInfo, ChainSpec, ChainSpecBuilder, DisplayHardforks, ForkBaseFeeParams, ForkCondition, ForkTimestamps, @@ -100,9 +99,11 @@ pub use withdrawal::Withdrawal; // Re-exports pub use self::ruint::UintTryTo; pub use alloy_primitives::{ - self, address, b256, bloom, bytes, eip191_hash_message, hex, hex_literal, keccak256, ruint, - Address, BlockHash, BlockNumber, Bloom, BloomInput, Bytes, ChainId, Selector, StorageKey, - StorageValue, TxHash, TxIndex, TxNumber, B128, B256, B512, B64, U128, U256, U64, U8, + self, address, b256, bloom, bytes, + bytes::{Buf, BufMut, BytesMut}, + eip191_hash_message, hex, hex_literal, keccak256, ruint, Address, BlockHash, BlockNumber, + Bloom, BloomInput, Bytes, ChainId, Selector, StorageKey, StorageValue, TxHash, TxIndex, + TxNumber, B128, B256, B512, B64, U128, U256, U64, U8, }; pub use reth_ethereum_forks::*; pub use revm_primitives::{self, JumpMap};