github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-08 03:01:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

bump: revm v7.1.0 (#7064)

Browse Source
This commit is contained in:
rakita
2024-03-09 01:12:26 +01:00
committed by GitHub
parent 48b763f88a
commit d4ff65bfad
10 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock generated
View File

@@ -3187,7 +3187,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"socket2 0.4.10",
"socket2 0.5.6",
"tokio",
"tower-service",
"tracing",
@@ -3935,7 +3935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164"
dependencies = [
"cfg-if",
"windows-targets 0.52.4",
"windows-targets 0.48.5",
]
[[package]]
@@ -6843,12 +6843,13 @@ dependencies = [
[[package]]
name = "revm"
version = "6.1.0"
version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d35316fc02d99e42831356c71e882f5d385c77b78f64a44ae82f2f9a4b8b72f"
checksum = "217d21144d329f21d5245b8e6a46e0d6d0a527d9917d7a087f225b161e529169"
dependencies = [
"auto_impl",
"cfg-if",
"dyn-clone",
"revm-interpreter",
"revm-precompile",
"serde",
@@ -6858,7 +6859,7 @@ dependencies = [
[[package]]
name = "revm-inspectors"
version = "0.1.0"
source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=f0551cb#f0551cb56be80065bce7a08aa2d5178eb1b1f337"
source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=aad9b3c#aad9b3cc9920997a29c9e5034b78b8866627f739"
dependencies = [
"alloy-primitives",
"alloy-rpc-trace-types",
@@ -6875,9 +6876,9 @@ dependencies = [
[[package]]
name = "revm-interpreter"
version = "3.1.0"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fa10c2dc1e8f4934bdc763a2c09371bcec29e50c22e55e3eb325ee0cba09064"
checksum = "776848391ed76d5103ca1aa1632cd21b521e2870afb30b63723da862d69efd0f"
dependencies = [
"revm-primitives",
"serde",
@@ -6885,9 +6886,9 @@ dependencies = [
[[package]]
name = "revm-precompile"
version = "4.1.0"
version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db828d49d329560a70809d9d1fa0c74695edb49f50c5332db3eb24483076deac"
checksum = "e3fd1856a7cb09197a02669d779e1afb5a627b0888a24814ba2b6a1ad4c3ff8d"
dependencies = [
"aurora-engine-modexp",
"c-kzg",
@@ -6902,9 +6903,9 @@ dependencies = [
[[package]]
name = "revm-primitives"
version = "2.1.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fecd125aad58e135e2ca5771ed6e4e7b1f05fa3a64e0dfb9cc643b7a800a8435"
checksum = "2a4d7d3e793e907dc0797a9d3b43abfdf5226d133855214db9bd27d4cee33ebd"
dependencies = [
"alloy-primitives",
"auto_impl",
@@ -6913,6 +6914,7 @@ dependencies = [
"c-kzg",
"cfg-if",
"derive_more",
"dyn-clone",
"enumn",
"hashbrown 0.14.3",
"hex",

8
Cargo.toml
View File

@@ -186,9 +186,9 @@ reth-trie = { path = "crates/trie" }
reth-trie-parallel = { path = "crates/trie-parallel" }
# revm
revm = { version = "6.1.0", features = ["std", "secp256k1"], default-features = false }
revm-primitives = { version = "2.1.0", features = ["std"], default-features = false }
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "f0551cb" }
revm = { version = "7.1.0", features = ["std", "secp256k1"], default-features = false }
revm-primitives = { version = "3.0.0", features = ["std"], default-features = false }
revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "aad9b3c" }
# eth
alloy-chains = { version = "0.1", feature = ["serde", "rlp", "arbitrary"] }
@@ -287,4 +287,4 @@ proptest = "1.4"
proptest-derive = "0.4"
serial_test = "3"
similar-asserts = "1.5.0"
test-fuzz = "5"
test-fuzz = "5"

2
bin/reth/src/sigsegv_handler.rs
View File

@@ -69,7 +69,7 @@ extern "C" fn print_stack_trace(_: libc::c_int) {
let period = period.saturating_add(1); // avoid "what if wrapped?" branches
let Some(offset) = stack.iter().skip(period).zip(stack).position(cycled) else {
// impossible.
return;
return
};
// Count matching trace slices, else we could miscount "biphasic cycles"

4
crates/consensus/beacon/src/engine/hooks/static_file.rs
View File

@@ -87,7 +87,7 @@ impl<DB: Database + 'static> StaticFileHook<DB> {
StaticFileProducerState::Idle(static_file_producer) => {
let Some(mut static_file_producer) = static_file_producer.take() else {
trace!(target: "consensus::engine::hooks::static_file", "StaticFileProducer is already running but the state is idle");
return Ok(None);
return Ok(None)
};
let targets = static_file_producer.get_static_file_targets(HighestStaticFiles {
@@ -131,7 +131,7 @@ impl<DB: Database + 'static> EngineHook for StaticFileHook<DB> {
) -> Poll<RethResult<EngineHookEvent>> {
let Some(finalized_block_number) = ctx.finalized_block_number else {
trace!(target: "consensus::engine::hooks::static_file", ?ctx, "Finalized block number is not available");
return Poll::Pending;
return Poll::Pending
};
// Try to spawn a static_file_producer

2
crates/net/network/src/peers/manager.rs
View File

@@ -2026,7 +2026,7 @@ mod tests {
let p = peers.peers.get(&peer).unwrap();
if p.is_banned() {
break;
break
}
}

2
crates/payload/ethereum/src/lib.rs
View File

@@ -313,7 +313,7 @@ where
tx_type: tx.tx_type(),
success: result.is_success(),
cumulative_gas_used,
logs: result.logs().into_iter().map(Into::into).collect(),
logs: result.into_logs().into_iter().map(Into::into).collect(),
..Default::default()
}));

4
crates/payload/optimism/src/lib.rs
View File

@@ -397,7 +397,7 @@ mod builder {
tx_type: sequencer_tx.tx_type(),
success: result.is_success(),
cumulative_gas_used,
logs: result.logs().into_iter().map(Into::into).collect(),
logs: result.into_logs().into_iter().map(Into::into).collect(),
deposit_nonce: depositor.map(|account| account.nonce),
// The deposit receipt version was introduced in Canyon to indicate an update to how
// receipt hashes should be computed when set. The state transition process
@@ -490,7 +490,7 @@ mod builder {
tx_type: tx.tx_type(),
success: result.is_success(),
cumulative_gas_used,
logs: result.logs().into_iter().map(Into::into).collect(),
logs: result.into_logs().into_iter().map(Into::into).collect(),
deposit_nonce: None,
deposit_receipt_version: None,
}));

2
crates/revm/src/processor.rs
View File

@@ -978,7 +978,7 @@ mod tests {
// there is no system contract call so there should be NO STORAGE CHANGES
// this means we'll check the transition state
let state = executor.evm.context.evm.db;
let state = executor.evm.context.evm.inner.db;
let transition_state = state
.transition_state
.clone()

2
crates/rpc/rpc/src/eth/api/pending_block.rs
View File

@@ -183,7 +183,7 @@ impl PendingBlockEnv {
tx_type: tx.tx_type(),
success: result.is_success(),
cumulative_gas_used,
logs: result.logs().into_iter().map(Into::into).collect(),
logs: result.into_logs().into_iter().map(Into::into).collect(),
#[cfg(feature = "optimism")]
deposit_nonce: None,
#[cfg(feature = "optimism")]

2
examples/custom-evm/src/main.rs
View File

@@ -50,7 +50,7 @@ impl MyEvmConfig {
address!("0000000000000000000000000000000000000999"),
Precompile::Env(Self::my_precompile),
);
precompiles
precompiles.into()
});
}