Merge branch 'main' into rkrasiuk/gitattributes

bluealloy · Sep 4, 2024 · ff5d40a · ff5d40a
2 parents a86534b + bc0017a
commit ff5d40a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 assets/** linguist-vendored
 documentation/** linguist-vendored
+tests/** linguist-vendored
diff --git a/crates/revm/src/inspector/handler_register.rs b/crates/revm/src/inspector/handler_register.rs
@@ -67,16 +67,25 @@ pub fn inspector_handle_register<DB: Database, EXT: GetInspector<DB>>(
         // execute selfdestruct
         prev(interpreter, host);
         // check if selfdestruct was successful and if journal entry is made.
-        if let Some(JournalEntry::AccountDestroyed {
-            address,
-            target,
-            had_balance,
-            ..
-        }) = host.evm.journaled_state.journal.last().unwrap().last()
-        {
-            host.external
-                .get_inspector()
-                .selfdestruct(*address, *target, *had_balance);
+        match host.evm.journaled_state.journal.last().unwrap().last() {
+            Some(JournalEntry::AccountDestroyed {
+                address,
+                target,
+                had_balance,
+                ..
+            }) => {
+                host.external
+                    .get_inspector()
+                    .selfdestruct(*address, *target, *had_balance);
+            }
+            Some(JournalEntry::BalanceTransfer {
+                from, to, balance, ..
+            }) => {
+                host.external
+                    .get_inspector()
+                    .selfdestruct(*from, *to, *balance);
+            }
+            _ => {}
         }
     });