refactor: ♻️ add with_floor parameter to effective_gas

Author: manuelmauro

src/standard/gasometer/mod.rs

@@ -3,7 +3,7 @@ mod costs;
 mod utils;
 
 use alloc::vec::Vec;
-use core::cmp::{max, min};
+use core::cmp::max;
 
 use evm_interpreter::{
 	Control, ExitError, ExitException, Machine, Opcode, Stack,
@@ -166,23 +166,23 @@ impl GasometerState {
 	/// The effective used gas at the end of the transaction.
 	///
 	/// In case of revert, refunded gas are not taken into account.
-	pub fn effective_gas(&self, with_refund: bool, config: &Config) -> U256 {
-		let refunded_gas = if self.refunded_gas >= 0 {
-			self.refunded_gas as u64
+	pub fn effective_gas(&self, with_refund: bool, with_floor: bool, config: &Config) -> U256 {
+		let refunded_gas = self.refunded_gas.max(0) as u64;
+
+		let used_gas = if with_refund {
+			let max_refund = self.total_used_gas() / config.max_refund_quotient();
+			self.total_used_gas() - refunded_gas.min(max_refund)
 		} else {
-			0
+			self.total_used_gas()
 		};
 
-		U256::from(if with_refund {
-			self.gas_limit
-				- (self.total_used_gas()
-					- min(
-						self.total_used_gas() / config.max_refund_quotient(),
-						refunded_gas,
-					))
+		let used_gas = if with_floor {
+			used_gas.max(self.floor_gas)
 		} else {
-			self.gas_limit - self.total_used_gas()
-		})
+			used_gas
+		};
+
+		U256::from(self.gas_limit - used_gas)
 	}
 
 	/// Create a submeter.
@@ -221,11 +221,6 @@ impl GasometerState {
 			MergeStrategy::Discard => {}
 		}
 	}
-
-	/// Apply the floor gas cost for calldata as defined in EIP-7623
-	pub fn apply_transaction_floor_cost(&mut self) {
-		self.used_gas = max(self.used_gas, self.floor_gas);
-	}
 }
 
 /// The eval function of the entire gasometer.

src/standard/invoker/mod.rs

@@ -510,23 +510,16 @@ where
 
 		let result = work();
 
-		// Apply EIP-7623 floor cost before calculating effective gas
-		if let Some(substate) = exit.substate.as_mut()
-			&& invoke.config.eip7623_calldata_floor
-		{
-			substate.apply_transaction_floor_cost();
-		}
-
 		let effective_gas = match result {
 			Ok(_) => exit
 				.substate
 				.as_ref()
-				.map(|s| s.effective_gas(true))
+				.map(|s| s.effective_gas(true, invoke.config.eip7623_calldata_floor))
 				.unwrap_or_default(),
 			Err(ExitError::Reverted) => exit
 				.substate
 				.as_ref()
-				.map(|s| s.effective_gas(false))
+				.map(|s| s.effective_gas(false, invoke.config.eip7623_calldata_floor))
 				.unwrap_or_default(),
 			Err(_) => U256::zero(),
 		};

src/standard/invoker/state.rs

@@ -46,7 +46,5 @@ pub trait InvokerState: GasState + Sized {
 	/// Whether the current state is in the static frame.
 	fn is_static(&self) -> bool;
 	/// Effective gas. The final used gas as reported by the transaction.
-	fn effective_gas(&self, with_refund: bool) -> U256;
-	/// Apply transaction floor cost for EIP-7623.
-	fn apply_transaction_floor_cost(&mut self);
+	fn effective_gas(&self, with_refund: bool, with_floor: bool) -> U256;
 }

src/standard/mod.rs

@@ -227,11 +227,8 @@ impl<'config> InvokerState for State<'config> {
 		self.gasometer.is_static
 	}
 
-	fn effective_gas(&self, with_refund: bool) -> U256 {
-		self.gasometer.effective_gas(with_refund, self.config)
-	}
-
-	fn apply_transaction_floor_cost(&mut self) {
-		self.gasometer.apply_transaction_floor_cost()
+	fn effective_gas(&self, with_refund: bool, with_floor: bool) -> U256 {
+		self.gasometer
+			.effective_gas(with_refund, with_floor, self.config)
 	}
 }