Skip to content

Commit 58fe204

Browse files
yash-atreyamattsse
yash-atreya
and
mattsse
authored
chore: alloy 0.14 (paradigmxyz#15635)
Co-authored-by: Matthias Seitz <[email protected]>
1 parent 2563e93 commit 58fe204

File tree

126 files changed

+966
-866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+966
-866
lines changed

‎Cargo.lock

Lines changed: 410 additions & 331 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -438,69 +438,70 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
438438
reth-ress-provider = { path = "crates/ress/provider" }
439439

440440
# revm
441-
revm = { version = "21.0.0", default-features = false }
442-
revm-bytecode = { version = "2.0.0", default-features = false }
443-
revm-database = { version = "2.0.0", default-features = false }
444-
revm-state = { version = "2.0.0", default-features = false }
445-
revm-primitives = { version = "17.0.0", default-features = false }
446-
revm-interpreter = { version = "17.0.0", default-features = false }
447-
revm-inspector = { version = "2.0.0", default-features = false }
448-
revm-context = { version = "2.0.0", default-features = false }
449-
revm-context-interface = { version = "2.0.0", default-features = false }
450-
revm-database-interface = { version = "2.0.0", default-features = false }
451-
op-revm = { version = "2.0.0", default-features = false }
452-
revm-inspectors = "0.18.0"
441+
revm = { version = "22.0.0", default-features = false }
442+
revm-bytecode = { version = "3.0.0", default-features = false }
443+
revm-database = { version = "3.0.0", default-features = false }
444+
revm-state = { version = "3.0.0", default-features = false }
445+
revm-primitives = { version = "18.0.0", default-features = false }
446+
revm-interpreter = { version = "18.0.0", default-features = false }
447+
revm-inspector = { version = "3.0.0", default-features = false }
448+
revm-context = { version = "3.0.0", default-features = false }
449+
revm-context-interface = { version = "3.0.0", default-features = false }
450+
revm-database-interface = { version = "3.0.0", default-features = false }
451+
op-revm = { version = "3.0.0", default-features = false }
452+
revm-inspectors = "0.19.0"
453453

454454
# eth
455-
alloy-chains = { version = "0.1.68", default-features = false }
456-
alloy-dyn-abi = "0.8.25"
457-
alloy-eip2124 = { version = "0.1.0", default-features = false }
458-
alloy-evm = { version = "0.3.2", default-features = false }
459-
alloy-primitives = { version = "0.8.25", default-features = false, features = ["map-foldhash"] }
455+
alloy-chains = { version = "0.2.0", default-features = false }
456+
alloy-dyn-abi = "1.0.0"
457+
alloy-eip2124 = { version = "0.2.0", default-features = false }
458+
alloy-evm = { version = "0.4.0", default-features = false }
459+
alloy-primitives = { version = "1.0.0", default-features = false, features = ["map-foldhash"] }
460460
alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
461-
alloy-sol-types = { version = "0.8.25", default-features = false }
462-
alloy-trie = { version = "0.7.9", default-features = false }
463-
464-
alloy-hardforks = "0.1.4"
465-
466-
alloy-consensus = { version = "0.13.0", default-features = false }
467-
alloy-contract = { version = "0.13.0", default-features = false }
468-
alloy-eips = { version = "0.13.0", default-features = false }
469-
alloy-genesis = { version = "0.13.0", default-features = false }
470-
alloy-json-rpc = { version = "0.13.0", default-features = false }
471-
alloy-network = { version = "0.13.0", default-features = false }
472-
alloy-network-primitives = { version = "0.13.0", default-features = false }
473-
alloy-node-bindings = { version = "0.13.0", default-features = false }
474-
alloy-provider = { version = "0.13.0", features = ["reqwest"], default-features = false }
475-
alloy-pubsub = { version = "0.13.0", default-features = false }
476-
alloy-rpc-client = { version = "0.13.0", default-features = false }
477-
alloy-rpc-types = { version = "0.13.0", features = ["eth"], default-features = false }
478-
alloy-rpc-types-admin = { version = "0.13.0", default-features = false }
479-
alloy-rpc-types-anvil = { version = "0.13.0", default-features = false }
480-
alloy-rpc-types-beacon = { version = "0.13.0", default-features = false }
481-
alloy-rpc-types-debug = { version = "0.13.0", default-features = false }
482-
alloy-rpc-types-engine = { version = "0.13.0", default-features = false }
483-
alloy-rpc-types-eth = { version = "0.13.0", default-features = false }
484-
alloy-rpc-types-mev = { version = "0.13.0", default-features = false }
485-
alloy-rpc-types-trace = { version = "0.13.0", default-features = false }
486-
alloy-rpc-types-txpool = { version = "0.13.0", default-features = false }
487-
alloy-serde = { version = "0.13.0", default-features = false }
488-
alloy-signer = { version = "0.13.0", default-features = false }
489-
alloy-signer-local = { version = "0.13.0", default-features = false }
490-
alloy-transport = { version = "0.13.0" }
491-
alloy-transport-http = { version = "0.13.0", features = ["reqwest-rustls-tls"], default-features = false }
492-
alloy-transport-ipc = { version = "0.13.0", default-features = false }
493-
alloy-transport-ws = { version = "0.13.0", default-features = false }
461+
alloy-sol-macro = "1.0.0"
462+
alloy-sol-types = { version = "1.0.0", default-features = false }
463+
alloy-trie = { version = "0.8.0", default-features = false }
464+
465+
alloy-hardforks = "0.2.0"
466+
467+
alloy-consensus = { version = "0.14.0", default-features = false }
468+
alloy-contract = { version = "0.14.0", default-features = false }
469+
alloy-eips = { version = "0.14.0", default-features = false }
470+
alloy-genesis = { version = "0.14.0", default-features = false }
471+
alloy-json-rpc = { version = "0.14.0", default-features = false }
472+
alloy-network = { version = "0.14.0", default-features = false }
473+
alloy-network-primitives = { version = "0.14.0", default-features = false }
474+
alloy-node-bindings = { version = "0.14.0", default-features = false }
475+
alloy-provider = { version = "0.14.0", features = ["reqwest"], default-features = false }
476+
alloy-pubsub = { version = "0.14.0", default-features = false }
477+
alloy-rpc-client = { version = "0.14.0", default-features = false }
478+
alloy-rpc-types = { version = "0.14.0", features = ["eth"], default-features = false }
479+
alloy-rpc-types-admin = { version = "0.14.0", default-features = false }
480+
alloy-rpc-types-anvil = { version = "0.14.0", default-features = false }
481+
alloy-rpc-types-beacon = { version = "0.14.0", default-features = false }
482+
alloy-rpc-types-debug = { version = "0.14.0", default-features = false }
483+
alloy-rpc-types-engine = { version = "0.14.0", default-features = false }
484+
alloy-rpc-types-eth = { version = "0.14.0", default-features = false }
485+
alloy-rpc-types-mev = { version = "0.14.0", default-features = false }
486+
alloy-rpc-types-trace = { version = "0.14.0", default-features = false }
487+
alloy-rpc-types-txpool = { version = "0.14.0", default-features = false }
488+
alloy-serde = { version = "0.14.0", default-features = false }
489+
alloy-signer = { version = "0.14.0", default-features = false }
490+
alloy-signer-local = { version = "0.14.0", default-features = false }
491+
alloy-transport = { version = "0.14.0" }
492+
alloy-transport-http = { version = "0.14.0", features = ["reqwest-rustls-tls"], default-features = false }
493+
alloy-transport-ipc = { version = "0.14.0", default-features = false }
494+
alloy-transport-ws = { version = "0.14.0", default-features = false }
494495

495496
# op
496-
alloy-op-evm = { version = "0.3.2", default-features = false }
497-
alloy-op-hardforks = "0.1.2"
498-
op-alloy-rpc-types = { version = "0.12.2", default-features = false }
499-
op-alloy-rpc-types-engine = { version = "0.12.2", default-features = false }
500-
op-alloy-network = { version = "0.12.2", default-features = false }
501-
op-alloy-consensus = { version = "0.12.2", default-features = false }
502-
op-alloy-rpc-jsonrpsee = { version = "0.12.2", default-features = false }
503-
op-alloy-flz = { version = "0.12.0", default-features = false }
497+
alloy-op-evm = { version = "0.4.0", default-features = false }
498+
alloy-op-hardforks = "0.2.0"
499+
op-alloy-rpc-types = { version = "0.13.0", default-features = false }
500+
op-alloy-rpc-types-engine = { version = "0.13.0", default-features = false }
501+
op-alloy-network = { version = "0.13.0", default-features = false }
502+
op-alloy-consensus = { version = "0.13.0", default-features = false }
503+
op-alloy-rpc-jsonrpsee = { version = "0.13.0", default-features = false }
504+
op-alloy-flz = { version = "0.13.0", default-features = false }
504505

505506
# misc
506507
aquamarine = "0.6"
@@ -530,7 +531,7 @@ nybbles = { version = "0.3.0", default-features = false }
530531
once_cell = { version = "1.19", default-features = false, features = ["critical-section"] }
531532
parking_lot = "0.12"
532533
paste = "1.0"
533-
rand = "0.8.5"
534+
rand = "0.9"
534535
rayon = "1.7"
535536
rustc-hash = { version = "2.0", default-features = false }
536537
schnellru = "0.2"
@@ -603,6 +604,8 @@ proptest-arbitrary-interop = "0.1.0"
603604
enr = { version = "0.13", default-features = false }
604605
k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }
605606
secp256k1 = { version = "0.30", default-features = false, features = ["global-context", "recovery"] }
607+
# rand 8 for secp256k1
608+
rand_08 = { package = "rand", version = "0.8" }
606609

607610
# for eip-4844
608611
c-kzg = "2.1.0"
@@ -639,7 +642,6 @@ snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
639642
crunchy = "=0.2.2"
640643
aes = "0.8.1"
641644
ahash = "0.8"
642-
alloy-sol-macro = "0.8.9"
643645
anyhow = "1.0"
644646
bindgen = { version = "0.70", default-features = false }
645647
block-padding = "0.3.2"

‎crates/chain-state/src/in_memory.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ mod tests {
11141114
#[test]
11151115
fn test_in_memory_state_impl_state_by_hash() {
11161116
let mut state_by_hash = HashMap::default();
1117-
let number = rand::thread_rng().gen::<u64>();
1117+
let number = rand::rng().random::<u64>();
11181118
let mut test_block_builder: TestBlockBuilder = TestBlockBuilder::default();
11191119
let state = Arc::new(create_mock_state(&mut test_block_builder, number, B256::random()));
11201120
state_by_hash.insert(state.hash(), state.clone());
@@ -1130,7 +1130,7 @@ mod tests {
11301130
let mut state_by_hash = HashMap::default();
11311131
let mut hash_by_number = BTreeMap::new();
11321132

1133-
let number = rand::thread_rng().gen::<u64>();
1133+
let number = rand::rng().random::<u64>();
11341134
let mut test_block_builder: TestBlockBuilder = TestBlockBuilder::default();
11351135
let state = Arc::new(create_mock_state(&mut test_block_builder, number, B256::random()));
11361136
let hash = state.hash();
@@ -1167,7 +1167,7 @@ mod tests {
11671167

11681168
#[test]
11691169
fn test_in_memory_state_impl_pending_state() {
1170-
let pending_number = rand::thread_rng().gen::<u64>();
1170+
let pending_number = rand::rng().random::<u64>();
11711171
let mut test_block_builder: TestBlockBuilder = TestBlockBuilder::default();
11721172
let pending_state =
11731173
create_mock_state(&mut test_block_builder, pending_number, B256::random());
@@ -1193,7 +1193,7 @@ mod tests {
11931193

11941194
#[test]
11951195
fn test_state() {
1196-
let number = rand::thread_rng().gen::<u64>();
1196+
let number = rand::rng().random::<u64>();
11971197
let mut test_block_builder: TestBlockBuilder = TestBlockBuilder::default();
11981198
let block = test_block_builder.get_executed_block_with_number(number, B256::random());
11991199

‎crates/chain-state/src/test_utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use alloy_primitives::{Address, BlockNumber, B256, U256};
1313
use alloy_signer::SignerSync;
1414
use alloy_signer_local::PrivateKeySigner;
1515
use core::marker::PhantomData;
16-
use rand::{thread_rng, Rng};
16+
use rand::Rng;
1717
use reth_chainspec::{ChainSpec, EthereumHardfork, MIN_TRANSACTION_GAS};
1818
use reth_ethereum_primitives::{
1919
Block, BlockBody, EthPrimitives, Receipt, Transaction, TransactionSigned,
@@ -96,7 +96,7 @@ impl<N: NodePrimitives> TestBlockBuilder<N> {
9696
number: BlockNumber,
9797
parent_hash: B256,
9898
) -> RecoveredBlock<reth_ethereum_primitives::Block> {
99-
let mut rng = thread_rng();
99+
let mut rng = rand::rng();
100100

101101
let mock_tx = |nonce: u64| -> Recovered<_> {
102102
let tx = Transaction::Eip1559(TxEip1559 {
@@ -114,7 +114,7 @@ impl<N: NodePrimitives> TestBlockBuilder<N> {
114114
TransactionSigned::new_unhashed(tx, signature).with_signer(self.signer)
115115
};
116116

117-
let num_txs = rng.gen_range(0..5);
117+
let num_txs = rng.random_range(0..5);
118118
let signer_balance_decrease = Self::single_tx_cost() * U256::from(num_txs);
119119
let transactions: Vec<Recovered<_>> = (0..num_txs)
120120
.map(|_| {
@@ -232,7 +232,7 @@ impl<N: NodePrimitives> TestBlockBuilder<N> {
232232
receipts: Vec<Vec<Receipt>>,
233233
parent_hash: B256,
234234
) -> ExecutedBlockWithTrieUpdates {
235-
let number = rand::thread_rng().gen::<u64>();
235+
let number = rand::rng().random::<u64>();
236236
self.get_executed_block(number, receipts, parent_hash)
237237
}
238238

‎crates/cli/commands/src/test_vectors/compact.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use alloy_eips::eip4895::Withdrawals;
2-
use alloy_primitives::{hex, private::getrandom::getrandom, PrimitiveSignature, TxKind};
2+
use alloy_primitives::{hex, Signature, TxKind, B256};
33
use arbitrary::Arbitrary;
44
use eyre::{Context, Result};
55
use proptest::{
@@ -128,7 +128,7 @@ compact_types!(
128128
],
129129
// These types require an extra identifier which is usually stored elsewhere (eg. parent type).
130130
identifier: [
131-
PrimitiveSignature,
131+
Signature,
132132
Transaction,
133133
TxType,
134134
TxKind
@@ -147,13 +147,12 @@ pub fn read_vectors() -> Result<()> {
147147
/// Generates a vector of type `T` to a file.
148148
pub fn generate_vectors_with(gen: &[fn(&mut TestRunner) -> eyre::Result<()>]) -> Result<()> {
149149
// Prepare random seed for test (same method as used by proptest)
150-
let mut seed = [0u8; 32];
151-
getrandom(&mut seed)?;
150+
let seed = B256::random();
152151
println!("Seed for compact test vectors: {:?}", hex::encode_prefixed(seed));
153152

154153
// Start the runner with the seed
155154
let config = ProptestConfig::default();
156-
let rng = TestRng::from_seed(config.rng_algorithm, &seed);
155+
let rng = TestRng::from_seed(config.rng_algorithm, &seed.0);
157156
let mut runner = TestRunner::new_with_rng(config, rng);
158157

159158
fs::create_dir_all(VECTORS_FOLDER)?;

‎crates/cli/commands/src/test_vectors/tables.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use alloy_consensus::Header;
2-
use alloy_primitives::{hex, private::getrandom::getrandom};
2+
use alloy_primitives::{hex, B256};
33
use arbitrary::Arbitrary;
44
use eyre::Result;
55
use proptest::{
@@ -23,13 +23,12 @@ const PER_TABLE: usize = 1000;
2323
/// Generates test vectors for specified `tables`. If list is empty, then generate for all tables.
2424
pub fn generate_vectors(mut tables: Vec<String>) -> Result<()> {
2525
// Prepare random seed for test (same method as used by proptest)
26-
let mut seed = [0u8; 32];
27-
getrandom(&mut seed)?;
26+
let seed = B256::random();
2827
println!("Seed for table test vectors: {:?}", hex::encode_prefixed(seed));
2928

3029
// Start the runner with the seed
3130
let config = ProptestConfig::default();
32-
let rng = TestRng::from_seed(config.rng_algorithm, &seed);
31+
let rng = TestRng::from_seed(config.rng_algorithm, &seed.0);
3332
let mut runner = TestRunner::new_with_rng(config, rng);
3433

3534
fs::create_dir_all(VECTORS_FOLDER)?;

‎crates/cli/util/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ alloy-eips.workspace = true
2121
# misc
2222
cfg-if.workspace = true
2323
eyre.workspace = true
24-
rand.workspace = true
2524
secp256k1 = { workspace = true, features = ["rand"] }
25+
rand_08.workspace = true
2626
thiserror.workspace = true
2727
serde.workspace = true
2828

2929
tracy-client = { workspace = true, optional = true, features = ["demangle"] }
3030

31+
[dev-dependencies]
32+
rand.workspace = true
33+
3134
[target.'cfg(unix)'.dependencies]
3235
tikv-jemallocator = { workspace = true, optional = true }
3336
snmalloc-rs = { workspace = true, optional = true }

‎crates/cli/util/src/load_secret_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use thiserror::Error;
88

99
/// Convenience function to create a new random [`SecretKey`]
1010
pub fn rng_secret_key() -> SecretKey {
11-
SecretKey::new(&mut rand::thread_rng())
11+
SecretKey::new(&mut rand_08::thread_rng())
1212
}
1313

1414
/// Errors returned by loading a [`SecretKey`], including IO errors.

‎crates/cli/util/src/parsers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ mod tests {
107107

108108
#[test]
109109
fn parse_socket_address_random() {
110-
let port: u16 = rand::thread_rng().gen();
110+
let port: u16 = rand::rng().random();
111111

112112
for value in [format!("localhost:{port}"), format!(":{port}"), port.to_string()] {
113113
let socket_addr = parse_socket_address(&value)

‎crates/consensus/common/src/validation.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,14 @@ mod tests {
348348
use super::*;
349349
use alloy_consensus::{BlockBody, Header, TxEip4844};
350350
use alloy_eips::eip4895::Withdrawals;
351-
use alloy_primitives::{Address, Bytes, PrimitiveSignature as Signature, U256};
351+
use alloy_primitives::{Address, Bytes, Signature, U256};
352352
use rand::Rng;
353353
use reth_chainspec::ChainSpecBuilder;
354354
use reth_ethereum_primitives::{Transaction, TransactionSigned};
355355
use reth_primitives_traits::proofs;
356356

357357
fn mock_blob_tx(nonce: u64, num_blobs: usize) -> TransactionSigned {
358-
let mut rng = rand::thread_rng();
358+
let mut rng = rand::rng();
359359
let request = Transaction::Eip4844(TxEip4844 {
360360
chain_id: 1u64,
361361
nonce,
@@ -367,7 +367,9 @@ mod tests {
367367
value: U256::from(3_u64),
368368
input: Bytes::from(vec![1, 2]),
369369
access_list: Default::default(),
370-
blob_versioned_hashes: std::iter::repeat_with(|| rng.gen()).take(num_blobs).collect(),
370+
blob_versioned_hashes: std::iter::repeat_with(|| rng.random())
371+
.take(num_blobs)
372+
.collect(),
371373
});
372374

373375
let signature = Signature::new(U256::default(), U256::default(), true);

‎crates/engine/invalid-block-hooks/src/witness.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ where
125125
let state = state_provider.witness(Default::default(), hashed_state.clone())?;
126126

127127
// Write the witness to the output directory.
128-
let response = ExecutionWitness { state, codes, keys: state_preimages };
128+
let response =
129+
ExecutionWitness { state, codes, keys: state_preimages, ..Default::default() };
129130
let re_executed_witness_path = self.save_file(
130131
format!("{}_{}.witness.re_executed.json", block.number(), block.hash()),
131132
&response,

‎crates/engine/tree/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ criterion.workspace = true
9898
crossbeam-channel.workspace = true
9999
proptest.workspace = true
100100
rand.workspace = true
101+
rand_08.workspace = true
101102

102103
[[bench]]
103104
name = "channel_perf"

‎crates/engine/tree/benches/channel_perf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use alloy_primitives::{B256, U256};
66
use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
77
use proptest::test_runner::TestRunner;
8-
use rand::Rng;
8+
use rand_08::Rng;
99
use revm_primitives::{Address, HashMap};
1010
use revm_state::{Account, AccountInfo, AccountStatus, EvmState, EvmStorage, EvmStorageSlot};
1111
use std::{hint::black_box, thread};

‎crates/engine/tree/benches/state_root_task.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use alloy_evm::block::StateChangeSource;
88
use alloy_primitives::{Address, B256};
99
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
1010
use proptest::test_runner::TestRunner;
11-
use rand::Rng;
11+
use rand_08::Rng;
1212
use reth_chain_state::EthPrimitives;
1313
use reth_chainspec::ChainSpec;
1414
use reth_db_common::init::init_genesis;
@@ -41,7 +41,12 @@ struct BenchParams {
4141
fn create_bench_state_updates(params: &BenchParams) -> Vec<EvmState> {
4242
let mut runner = TestRunner::deterministic();
4343
let mut rng = runner.rng().clone();
44-
let all_addresses: Vec<Address> = (0..params.num_accounts).map(|_| rng.gen()).collect();
44+
let all_addresses: Vec<Address> = (0..params.num_accounts)
45+
.map(|_| {
46+
// TODO: rand08
47+
Address::random()
48+
})
49+
.collect();
4550
let mut updates = Vec::new();
4651

4752
for _ in 0..params.updates_per_account {

0 commit comments

Comments
 (0)