diff --git a/Cargo.lock b/Cargo.lock index ea860db7ca8..c671b27d4e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11407,9 +11407,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1ce3f52a052d78cc251714d57bf05dc8bc75e269677de11805d3153300a2cd" +checksum = "a24ca988ae1f7a0bb5688630579c00e867cd9f1df0a2f040623887f63d3b414c" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", diff --git a/Cargo.toml b/Cargo.toml index 9e83760c22c..9d774429bb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -481,7 +481,7 @@ revm-primitives = { version = "22.0.0", default-features = false } revm-interpreter = { version = "32.0.0", default-features = false } revm-database-interface = { version = "9.0.0", default-features = false } op-revm = { version = "15.0.0", default-features = false } -revm-inspectors = "0.34.0" +revm-inspectors = "0.34.1" # eth alloy-chains = { version = "0.2.5", default-features = false } diff --git a/crates/primitives-traits/src/block/recovered.rs b/crates/primitives-traits/src/block/recovered.rs index 7d107af6ddb..be4564fc507 100644 --- a/crates/primitives-traits/src/block/recovered.rs +++ b/crates/primitives-traits/src/block/recovered.rs @@ -798,12 +798,14 @@ mod rpc_compat { .zip(senders) .enumerate() .map(|(idx, (tx, sender))| { + #[allow(clippy::needless_update)] let tx_info = TransactionInfo { hash: Some(*tx.tx_hash()), block_hash, block_number: Some(block_number), base_fee, index: Some(idx as u64), + ..Default::default() }; converter(Recovered::new_unchecked(tx, sender), tx_info) diff --git a/crates/rpc/rpc-eth-api/src/helpers/trace.rs b/crates/rpc/rpc-eth-api/src/helpers/trace.rs index 13ac2479158..8948efe869d 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/trace.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/trace.rs @@ -310,12 +310,14 @@ pub trait Trace: LoadState> + Call { .evm_factory() .create_tracer(&mut db, evm_env, inspector_setup()) .try_trace_many(block.transactions_recovered().take(max_transactions), |ctx| { + #[allow(clippy::needless_update)] let tx_info = TransactionInfo { hash: Some(*ctx.tx.tx_hash()), index: Some(idx), block_hash: Some(block_hash), block_number: Some(block_number), base_fee: Some(base_fee), + ..Default::default() }; idx += 1; diff --git a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs index 7a073834904..d8083d20c89 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs @@ -290,12 +290,14 @@ pub trait EthTransactions: LoadTransaction { let block_number = block.number(); let base_fee_per_gas = block.base_fee_per_gas(); if let Some((signer, tx)) = block.transactions_with_sender().nth(index) { + #[allow(clippy::needless_update)] let tx_info = TransactionInfo { hash: Some(*tx.tx_hash()), block_hash: Some(block_hash), block_number: Some(block_number), base_fee: base_fee_per_gas, index: Some(index as u64), + ..Default::default() }; return Ok(Some( @@ -366,12 +368,14 @@ pub trait EthTransactions: LoadTransaction { .enumerate() .find(|(_, (signer, tx))| **signer == sender && (*tx).nonce() == nonce) .map(|(index, (signer, tx))| { + #[allow(clippy::needless_update)] let tx_info = TransactionInfo { hash: Some(*tx.tx_hash()), block_hash: Some(block_hash), block_number: Some(block_number), base_fee: base_fee_per_gas, index: Some(index as u64), + ..Default::default() }; Ok(self.converter().fill(tx.clone().with_signer(*signer), tx_info)?) }) diff --git a/crates/rpc/rpc-eth-types/src/transaction.rs b/crates/rpc/rpc-eth-types/src/transaction.rs index de3323d61e6..682fa1b1cea 100644 --- a/crates/rpc/rpc-eth-types/src/transaction.rs +++ b/crates/rpc/rpc-eth-types/src/transaction.rs @@ -49,12 +49,14 @@ impl TransactionSource { match self { Self::Pool(tx) => resp_builder.fill_pending(tx), Self::Block { transaction, index, block_hash, block_number, base_fee } => { + #[allow(clippy::needless_update)] let tx_info = TransactionInfo { hash: Some(transaction.trie_hash()), index: Some(index), block_hash: Some(block_hash), block_number: Some(block_number), base_fee, + ..Default::default() }; resp_builder.fill(transaction, tx_info) @@ -69,6 +71,7 @@ impl TransactionSource { let hash = tx.trie_hash(); (tx, TransactionInfo { hash: Some(hash), ..Default::default() }) } + #[allow(clippy::needless_update)] Self::Block { transaction, index, block_hash, block_number, base_fee } => { let hash = transaction.trie_hash(); ( @@ -79,6 +82,7 @@ impl TransactionSource { block_hash: Some(block_hash), block_number: Some(block_number), base_fee, + ..Default::default() }, ) }