From e84e612389d6abc30bce769ec7873741b50252cc Mon Sep 17 00:00:00 2001 From: Wodann Date: Thu, 7 Mar 2024 17:38:04 +0000 Subject: [PATCH 1/4] fix: gas cost calculation --- crates/revm/src/inspector/gas.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/revm/src/inspector/gas.rs b/crates/revm/src/inspector/gas.rs index 67e67ef8eb..0c9d247fcf 100644 --- a/crates/revm/src/inspector/gas.rs +++ b/crates/revm/src/inspector/gas.rs @@ -41,7 +41,7 @@ impl Inspector for GasInspector { _context: &mut EvmContext, ) { let last_gas = core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); - self.last_gas_cost = last_gas.saturating_sub(self.last_gas_cost); + self.last_gas_cost = last_gas.saturating_sub(self.gas_remaining); } fn call_end( From 0a68ec8ecdc6604149e0541bf0bd5fd618e5ad6a Mon Sep 17 00:00:00 2001 From: Wodann Date: Thu, 7 Mar 2024 18:30:06 -0600 Subject: [PATCH 2/4] Update crates/revm/src/inspector/gas.rs Co-authored-by: Matthias Seitz --- crates/revm/src/inspector/gas.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/revm/src/inspector/gas.rs b/crates/revm/src/inspector/gas.rs index 0c9d247fcf..3b7b303ee2 100644 --- a/crates/revm/src/inspector/gas.rs +++ b/crates/revm/src/inspector/gas.rs @@ -41,7 +41,7 @@ impl Inspector for GasInspector { _context: &mut EvmContext, ) { let last_gas = core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); - self.last_gas_cost = last_gas.saturating_sub(self.gas_remaining); + self.last_gas_cost = last_gas_remaining.saturating_sub(self.gas_remaining); } fn call_end( From 65b2efc4c0b43e1cb6bb119d58ae227944ee88bd Mon Sep 17 00:00:00 2001 From: Wodann Date: Thu, 7 Mar 2024 18:30:10 -0600 Subject: [PATCH 3/4] Update crates/revm/src/inspector/gas.rs Co-authored-by: Matthias Seitz --- crates/revm/src/inspector/gas.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/revm/src/inspector/gas.rs b/crates/revm/src/inspector/gas.rs index 3b7b303ee2..f5788aaa03 100644 --- a/crates/revm/src/inspector/gas.rs +++ b/crates/revm/src/inspector/gas.rs @@ -40,7 +40,7 @@ impl Inspector for GasInspector { interp: &mut crate::interpreter::Interpreter, _context: &mut EvmContext, ) { - let last_gas = core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); + let last_gas_remaining = core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); self.last_gas_cost = last_gas_remaining.saturating_sub(self.gas_remaining); } From 7b5eeb8379b3ac3007982c5a544ccaa58308fe8b Mon Sep 17 00:00:00 2001 From: Wodann Date: Fri, 8 Mar 2024 02:59:31 +0000 Subject: [PATCH 4/4] fix: formatting --- crates/revm/src/inspector/gas.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/revm/src/inspector/gas.rs b/crates/revm/src/inspector/gas.rs index f5788aaa03..d22ae0451e 100644 --- a/crates/revm/src/inspector/gas.rs +++ b/crates/revm/src/inspector/gas.rs @@ -40,7 +40,8 @@ impl Inspector for GasInspector { interp: &mut crate::interpreter::Interpreter, _context: &mut EvmContext, ) { - let last_gas_remaining = core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); + let last_gas_remaining = + core::mem::replace(&mut self.gas_remaining, interp.gas.remaining()); self.last_gas_cost = last_gas_remaining.saturating_sub(self.gas_remaining); }