add value parameter to Inspector::selfdestruct (bluealloy#645)

Author: tonyke-bot

crates/revm/src/db/states/state.rs

@@ -554,15 +554,15 @@ mod tests {
         let mut state = StateBuilder::default().build();
 
         // Non-existing account.
-        let new_account_address = B160::from_slice(&[0x1; 20]);
+        let new_account_address = Address::from_slice(&[0x1; 20]);
         let new_account_created_info = AccountInfo {
             nonce: 1,
             balance: U256::from(1),
             ..Default::default()
         };
 
         // Existing account.
-        let existing_account_address = B160::from_slice(&[0x2; 20]);
+        let existing_account_address = Address::from_slice(&[0x2; 20]);
         let existing_account_initial_info = AccountInfo {
             nonce: 1,
             ..Default::default()
@@ -575,7 +575,7 @@ mod tests {
 
         // Existing account with storage.
         let (slot1, slot2) = (U256::from(1), U256::from(2));
-        let existing_account_with_storage_address = B160::from_slice(&[0x3; 20]);
+        let existing_account_with_storage_address = Address::from_slice(&[0x3; 20]);
         let existing_account_with_storage_info = AccountInfo {
             nonce: 1,
             ..Default::default()
@@ -722,7 +722,7 @@ mod tests {
         let mut state = StateBuilder::default().build();
 
         // Existing account.
-        let existing_account_address = B160::from_slice(&[0x1; 20]);
+        let existing_account_address = Address::from_slice(&[0x1; 20]);
         let existing_account_info = AccountInfo {
             nonce: 1,
             ..Default::default()

crates/revm/src/evm_impl.rs

@@ -236,7 +236,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> Transact<DB::Error>
             },
             SuccessOrHalt::Halt(reason) => ExecutionResult::Halt { reason, gas_used },
             SuccessOrHalt::FatalExternalError => {
-                return Err(EVMError::Database(self.data.error.take().unwrap()))
+                return Err(EVMError::Database(self.data.error.take().unwrap()));
             }
             SuccessOrHalt::InternalContinue => {
                 panic!("Internal return flags should remain internal {exit_reason:?}")
@@ -425,7 +425,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> EVMImpl<'a, GSPEC, DB,
                     created_address: None,
                     gas,
                     return_value: Bytes::new(),
-                })
+                });
             }
         };
 
@@ -857,7 +857,9 @@ impl<'a, GSPEC: Spec, DB: Database + 'a, const INSPECT: bool> Host
 
     fn selfdestruct(&mut self, address: Address, target: Address) -> Option<SelfDestructResult> {
         if INSPECT {
-            self.inspector.selfdestruct(address, target);
+            let acc = self.data.journaled_state.state.get(&address).unwrap();
+            self.inspector
+                .selfdestruct(address, target, acc.info.balance);
         }
         self.data
             .journaled_state

crates/revm/src/inspector.rs

@@ -1,6 +1,6 @@
 use crate::evm_impl::EVMData;
 use crate::interpreter::{CallInputs, CreateInputs, Gas, InstructionResult, Interpreter};
-use crate::primitives::{db::Database, Address, Bytes, B256};
+use crate::primitives::{db::Database, Bytes, Address, B256, U256};
 
 use auto_impl::auto_impl;
 
@@ -136,5 +136,5 @@ pub trait Inspector<DB: Database> {
     }
 
     /// Called when a contract has been self-destructed with funds transferred to target.
-    fn selfdestruct(&mut self, _contract: Address, _target: Address) {}
+    fn selfdestruct(&mut self, _contract: Address, _target: Address, _value: U256) {}
 }

crates/revm/src/inspector/customprinter.rs

@@ -2,7 +2,7 @@
 //! It is a great tool if some debugging is needed.
 //!
 use crate::interpreter::{opcode, CallInputs, CreateInputs, Gas, InstructionResult, Interpreter};
-use crate::primitives::{Address, Bytes};
+use crate::primitives::{Bytes, Address, U256};
 use crate::{inspectors::GasInspector, Database, EVMData, Inspector};
 #[derive(Clone, Default)]
 pub struct CustomPrintTracer {
@@ -89,7 +89,7 @@ impl<DB: Database> Inspector<DB> for CustomPrintTracer {
         inputs: &mut CallInputs,
     ) -> (InstructionResult, Gas, Bytes) {
         println!(
-            "SM CALL:   {:?},context:{:?}, is_static:{:?}, transfer:{:?}, input_size:{:?}",
+            "SM CALL:   {:?}, context:{:?}, is_static:{:?}, transfer:{:?}, input_size:{:?}",
             inputs.contract,
             inputs.context,
             inputs.is_static,
@@ -111,8 +111,11 @@ impl<DB: Database> Inspector<DB> for CustomPrintTracer {
         (InstructionResult::Continue, None, Gas::new(0), Bytes::new())
     }
 
-    fn selfdestruct(&mut self, contract: Address, target: Address) {
-        println!("SELFDESTRUCT on {contract:?} refund target: {target:?}");
+    fn selfdestruct(&mut self, contract: Address, target: Address, value: U256) {
+        println!(
+            "SELFDESTRUCT: contract: {:?}, refund target: {:?}, value {:?}",
+            contract, target, value
+        );
     }
 }