From 13187008011239221b2bdd6febea6ee350195a61 Mon Sep 17 00:00:00 2001
From: rakita <dragan0rakita@gmail.com>
Date: Fri, 14 Jan 2022 18:41:31 +0100
Subject: [PATCH] Omit edgecase high nonce test. tracer gas fix

---
 bins/revme/src/statetest/runner.rs | 5 +++++
 bins/revme/src/statetest/trace.rs  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bins/revme/src/statetest/runner.rs b/bins/revme/src/statetest/runner.rs
index 06e0c36226..df42bcf5c0 100644
--- a/bins/revme/src/statetest/runner.rs
+++ b/bins/revme/src/statetest/runner.rs
@@ -49,6 +49,11 @@ pub fn execute_test_suit(path: &PathBuf, elapsed: &Arc<Mutex<Duration>>) -> Resu
     if path.file_name() == Some(OsStr::new("ValueOverflow.json")) {
         return Ok(());
     }
+    // test with very high nonce that in revm overflows. Impossible to happen.
+    // https://github.com/bluealloy/revm/issues/28
+    if path.file_name() == Some(OsStr::new("CREATE2_HighNonceDelegatecall.json")) {
+        return Ok(());
+    }
     // /*
     // Test that take a lot of time so we are going to skip them
     if path.file_name() == Some(OsStr::new("loopExp.json")) {
diff --git a/bins/revme/src/statetest/trace.rs b/bins/revme/src/statetest/trace.rs
index c6346c5bbf..957817f2b2 100644
--- a/bins/revme/src/statetest/trace.rs
+++ b/bins/revme/src/statetest/trace.rs
@@ -60,9 +60,11 @@ impl<DB: Database> Inspector<DB> for CustomPrintTracer {
             //hex::encode(machine.memory.data()),
         );
 
-        self.reduced_gas_block += info.gas;
         if info.gas_block_end {
+            self.reduced_gas_block = 0;
             self.full_gas_block = machine.contract.gas_block(machine.program_counter());
+        } else {
+            self.reduced_gas_block += info.gas;
         }
 
         Return::Continue