fix(trin-execution): regression| tx_env modify + no withdrawals + traces broken (#1864)

KolbyML · web-flow · commit 682b671f51f8 · 2025-05-28T15:04:23.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,7 +74,7 @@ rand = "0.9"
 rayon = "1.10.0"
 reqwest = { version = "0.12.17", features = ["native-tls-vendored", "json"] }
 reth-ipc = { tag = "v1.3.12", git = "https://github.com/paradigmxyz/reth.git"}
-revm = { version = "23.1", default-features = false, features = ["std", "secp256k1", "serde-json", "c-kzg"] }
+revm = { version = "24.0", default-features = false, features = ["std", "secp256k1", "serde-json", "c-kzg"] }
 revm-primitives = { version = "19.0.0", default-features = false, features = ["std", "serde"] }
 rstest = "0.25"
 rust-embed = "8.5.0"
diff --git a/bin/trin-execution/Cargo.toml b/bin/trin-execution/Cargo.toml
@@ -31,7 +31,7 @@ rand.workspace = true
 rayon.workspace = true
 reqwest =  { workspace = true, features = ["stream"] }
 revm.workspace = true
-revm-inspectors = "0.22"
+revm-inspectors = "0.23"
 revm-primitives.workspace = true
 rocksdb = "0.23"
 serde = { workspace = true, features = ["rc"] }
diff --git a/bin/trin-execution/src/e2hs/utils.rs b/bin/trin-execution/src/e2hs/utils.rs
@@ -34,7 +34,7 @@ pub fn process_e2hs_file(raw_e2hs: &[u8]) -> anyhow::Result<ProcessedE2HS> {
         blocks.push(ProcessedBlock {
             header: header_with_proof.header_with_proof.header,
             uncles: Some(body.body.0.ommers),
-            withdrawals: None,
+            withdrawals: body.body.0.withdrawals.map(|withdrawals| withdrawals.0),
             transactions: transactions_with_recovered_senders,
         });
     }
diff --git a/bin/trin-execution/src/evm/block_executor.rs b/bin/trin-execution/src/evm/block_executor.rs
@@ -12,7 +12,7 @@ use revm::{
     database::{states::bundle_state::BundleRetention, State},
     handler::MainnetContext,
     inspector::inspectors::TracerEip3155,
-    Context, DatabaseCommit, ExecuteEvm, MainBuilder, MainnetEvm,
+    Context, DatabaseCommit, ExecuteEvm, InspectEvm, MainBuilder, MainnetEvm,
 };
 use revm_primitives::{hardfork::SpecId, keccak256, Address, B256, U256};
 use serde::{Deserialize, Serialize};
@@ -228,7 +228,7 @@ impl BlockExecutor {
         let result = match tracer_fn(&tx.transaction) {
             Some(tracer) => {
                 create_evm_with_tracer(self.evm.block().clone(), tx, self.evm.db(), tracer)
-                    .replay()?
+                    .inspect_replay()?
             }
             None => self.evm.replay()?,
         };
diff --git a/crates/evm/src/tx_env_modifier.rs b/crates/evm/src/tx_env_modifier.rs
@@ -1,9 +1,8 @@
 use alloy::{
     consensus::{TxEip1559, TxEip2930, TxEip4844, TxLegacy},
-    eips::eip2930::{AccessList, AccessListItem},
     rpc::types::TransactionRequest,
 };
-use revm::context::{TransactTo, TxEnv};
+use revm::context::TxEnv;
 use revm_primitives::{hardfork::SpecId, TxKind};
 
 use super::spec_id::get_spec_id;
@@ -14,102 +13,89 @@ pub trait TxEnvModifier {
 
 impl TxEnvModifier for TxLegacy {
     fn modify(&self, block_number: u64, tx_env: &mut TxEnv) {
-        tx_env.gas_limit = self.gas_limit;
-        tx_env.gas_price = self.gas_price;
-        tx_env.gas_priority_fee = None;
-        tx_env.kind = match self.to {
-            TxKind::Call(to) => TransactTo::Call(to),
-            TxKind::Create => TransactTo::Create,
-        };
-        tx_env.value = self.value;
-        tx_env.data = self.input.clone();
-        tx_env.chain_id = if get_spec_id(block_number).is_enabled_in(SpecId::SPURIOUS_DRAGON) {
-            Some(1)
-        } else {
-            None
+        *tx_env = TxEnv {
+            tx_type: 0,
+            caller: tx_env.caller,
+            gas_limit: self.gas_limit,
+            gas_price: self.gas_price,
+            kind: self.to,
+            value: self.value,
+            data: self.input.clone(),
+            nonce: self.nonce,
+            chain_id: if get_spec_id(block_number).is_enabled_in(SpecId::SPURIOUS_DRAGON) {
+                Some(1)
+            } else {
+                None
+            },
+            access_list: Default::default(),
+            gas_priority_fee: None,
+            blob_hashes: Default::default(),
+            max_fee_per_blob_gas: Default::default(),
+            authorization_list: Default::default(),
         };
-        tx_env.nonce = self.nonce;
-        tx_env.access_list = AccessList::default();
-        tx_env.blob_hashes.clear();
-        tx_env.max_fee_per_blob_gas = 0;
     }
 }
 
-impl TxEnvModifier for TxEip1559 {
+impl TxEnvModifier for TxEip2930 {
     fn modify(&self, _block_number: u64, tx_env: &mut TxEnv) {
-        tx_env.gas_limit = self.gas_limit;
-        tx_env.gas_price = self.max_fee_per_gas;
-        tx_env.gas_priority_fee = Some(self.max_priority_fee_per_gas);
-        tx_env.kind = match self.to {
-            TxKind::Call(to) => TransactTo::Call(to),
-            TxKind::Create => TransactTo::Create,
+        *tx_env = TxEnv {
+            tx_type: 1,
+            caller: tx_env.caller,
+            gas_limit: self.gas_limit,
+            gas_price: self.gas_price,
+            kind: self.to,
+            value: self.value,
+            data: self.input.clone(),
+            nonce: self.nonce,
+            chain_id: Some(self.chain_id),
+            access_list: self.access_list.clone(),
+            gas_priority_fee: None,
+            blob_hashes: Default::default(),
+            max_fee_per_blob_gas: Default::default(),
+            authorization_list: Default::default(),
         };
-        tx_env.value = self.value;
-        tx_env.data = self.input.clone();
-        tx_env.chain_id = Some(self.chain_id);
-        tx_env.nonce = self.nonce;
-        tx_env.access_list = AccessList::from(
-            self.access_list
-                .iter()
-                .map(|l| AccessListItem {
-                    address: l.address,
-                    storage_keys: l.storage_keys.clone(),
-                })
-                .collect::<Vec<_>>(),
-        );
-        tx_env.blob_hashes.clear();
-        tx_env.max_fee_per_blob_gas = 0;
     }
 }
 
-impl TxEnvModifier for TxEip2930 {
+impl TxEnvModifier for TxEip1559 {
     fn modify(&self, _block_number: u64, tx_env: &mut TxEnv) {
-        tx_env.gas_limit = self.gas_limit;
-        tx_env.gas_price = self.gas_price;
-        tx_env.gas_priority_fee = None;
-        tx_env.kind = match self.to {
-            TxKind::Call(to) => TransactTo::Call(to),
-            TxKind::Create => TransactTo::Create,
+        *tx_env = TxEnv {
+            tx_type: 2,
+            caller: tx_env.caller,
+            gas_limit: self.gas_limit,
+            gas_price: self.max_fee_per_gas,
+            kind: self.to,
+            value: self.value,
+            data: self.input.clone(),
+            nonce: self.nonce,
+            chain_id: Some(self.chain_id),
+            access_list: self.access_list.clone(),
+            gas_priority_fee: Some(self.max_priority_fee_per_gas),
+            blob_hashes: Default::default(),
+            max_fee_per_blob_gas: Default::default(),
+            authorization_list: Default::default(),
         };
-        tx_env.value = self.value;
-        tx_env.data = self.input.clone();
-        tx_env.chain_id = Some(self.chain_id);
-        tx_env.nonce = self.nonce;
-        tx_env.access_list = AccessList::from(
-            self.access_list
-                .iter()
-                .map(|l| AccessListItem {
-                    address: l.address,
-                    storage_keys: l.storage_keys.clone(),
-                })
-                .collect::<Vec<_>>(),
-        );
-        tx_env.blob_hashes.clear();
-        tx_env.max_fee_per_blob_gas = 0;
     }
 }
 
 impl TxEnvModifier for TxEip4844 {
     fn modify(&self, _block_number: u64, tx_env: &mut TxEnv) {
-        tx_env.gas_limit = self.gas_limit;
-        tx_env.gas_price = self.max_fee_per_gas;
-        tx_env.gas_priority_fee = Some(self.max_priority_fee_per_gas);
-        tx_env.kind = TransactTo::Call(self.to);
-        tx_env.value = self.value;
-        tx_env.data = self.input.clone();
-        tx_env.chain_id = Some(self.chain_id);
-        tx_env.nonce = self.nonce;
-        tx_env.access_list = AccessList::from(
-            self.access_list
-                .iter()
-                .map(|l| AccessListItem {
-                    address: l.address,
-                    storage_keys: l.storage_keys.clone(),
-                })
-                .collect::<Vec<_>>(),
-        );
-        tx_env.blob_hashes.clone_from(&self.blob_versioned_hashes);
-        tx_env.max_fee_per_blob_gas = self.max_fee_per_blob_gas;
+        *tx_env = TxEnv {
+            tx_type: 3,
+            caller: tx_env.caller,
+            gas_limit: self.gas_limit,
+            gas_price: self.max_fee_per_gas,
+            kind: TxKind::Call(self.to),
+            value: self.value,
+            data: self.input.clone(),
+            nonce: self.nonce,
+            chain_id: Some(self.chain_id),
+            access_list: self.access_list.clone(),
+            gas_priority_fee: Some(self.max_priority_fee_per_gas),
+            blob_hashes: self.blob_versioned_hashes.clone(),
+            max_fee_per_blob_gas: self.max_fee_per_blob_gas,
+            authorization_list: Default::default(),
+        };
     }
 }
 
@@ -140,8 +126,8 @@ impl TxEnvModifier for TransactionRequest {
         if let Some(data) = self.input.input() {
             tx_env.data.clone_from(data);
         }
-        if let Some(nounce) = self.nonce {
-            tx_env.nonce = nounce;
+        if let Some(nonce) = self.nonce {
+            tx_env.nonce = nonce;
         }
         tx_env.chain_id = self.chain_id;
         if let Some(access_list) = &self.access_list {
@@ -156,6 +142,7 @@ impl TxEnvModifier for TransactionRequest {
 #[cfg(test)]
 mod tests {
     use alloy::primitives::bytes::Bytes;
+    use revm::context::TransactTo;
     use revm_primitives::{TxKind, U256};
 
     use super::*;
@@ -204,7 +191,7 @@ mod tests {
         assert_eq!(tx_env.value, U256::from(1));
         assert_eq!(tx_env.data.0, vec![1, 2, 3]);
         assert_eq!(tx_env.chain_id, Some(1));
-        assert_eq!(tx_env.access_list, AccessList::default());
+        assert_eq!(tx_env.access_list, Default::default());
     }
 
     #[test]
@@ -228,7 +215,7 @@ mod tests {
         assert_eq!(tx_env.value, U256::from(1));
         assert_eq!(tx_env.data.0, vec![1, 2, 3]);
         assert_eq!(tx_env.chain_id, Some(1));
-        assert_eq!(tx_env.access_list, AccessList::default());
+        assert_eq!(tx_env.access_list, Default::default());
     }
 
     #[test]
@@ -256,7 +243,7 @@ mod tests {
         assert_eq!(tx_env.value, U256::from(1));
         assert_eq!(tx_env.data.0, vec![1, 2, 3]);
         assert_eq!(tx_env.chain_id, Some(1));
-        assert_eq!(tx_env.access_list, AccessList::default());
+        assert_eq!(tx_env.access_list, Default::default());
         assert_eq!(tx_env.blob_hashes.len(), 0);
         assert_eq!(tx_env.max_fee_per_blob_gas, 1);
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ pub fn process_e2hs_file(raw_e2hs: &[u8]) -> anyhow::Result<ProcessedE2HS> {`
`34`	`34`	`blocks.push(ProcessedBlock {`
`35`	`35`	`header: header_with_proof.header_with_proof.header,`
`36`	`36`	`uncles: Some(body.body.0.ommers),`
`37`		`- withdrawals: None,`
	`37`	`+ withdrawals: body.body.0.withdrawals.map(\|withdrawals\| withdrawals.0),`
`38`	`38`	`transactions: transactions_with_recovered_senders,`
`39`	`39`	`});`
`40`	`40`	`}`