Make runtime opcode handler generic over S and add missing gasometer extra_check

gasometer/src/lib.rs

@@ -29,23 +29,23 @@ impl Gas for u64 {}
 impl Gas for U256 {}
 
 #[derive(Clone, Copy)]
-pub enum MergeStrategy {
+pub enum GasometerMergeStrategy {
 	Commit,
 	Revert,
-	Discard,
 }
 
 pub trait Gasometer<S, H>: Sized {
 	type Gas: Gas;
 	type Config;
 
 	fn new(gas_limit: Self::Gas, machine: &Machine<S>, config: Self::Config) -> Self;
-	fn record(
+	fn record_stepn(
 		self,
 		machine: &Machine<S>,
 		handler: &H,
 		is_static: bool,
 	) -> Result<(Self, usize), ExitError>;
+	fn record_codedeposit(self, len: usize) -> Result<Self, ExitError>;
 	fn gas(&self) -> Self::Gas;
-	fn merge(&mut self, other: Self, strategy: MergeStrategy);
+	fn merge(&mut self, other: Self, strategy: GasometerMergeStrategy);
 }

gasometer/src/standard.rs

@@ -1,4 +1,4 @@
-use crate::{consts, costs, Config, Gasometer, MergeStrategy};
+use crate::{consts, costs, Config, Gasometer, GasometerMergeStrategy};
 use core::cmp::max;
 use evm_interpreter::{ExitError, ExitException, Handler, Machine, Opcode, RuntimeState, Stack};
 use primitive_types::{H160, H256, U256};
@@ -42,7 +42,7 @@ impl<'config, H: Handler> Gasometer<RuntimeState, H> for StandardGasometer<'conf
 		}
 	}
 
-	fn record(
+	fn record_stepn(
 		mut self,
 		machine: &Machine<RuntimeState>,
 		handler: &H,
@@ -77,25 +77,33 @@ impl<'config, H: Handler> Gasometer<RuntimeState, H> for StandardGasometer<'conf
 					self.memory_gas = max(self.memory_gas, memory_cost);
 				}
 			}
+
+			let after_gas = Gasometer::<RuntimeState, H>::gas(&self);
+			gas.extra_check(after_gas, self.config)?;
 		}
 
 		Ok((self, 1))
 	}
 
+	fn record_codedeposit(mut self, len: usize) -> Result<Self, ExitError> {
+		let cost = len as u64 * consts::G_CODEDEPOSIT;
+		self = self.record_cost(cost)?;
+		Ok(self)
+	}
+
 	fn gas(&self) -> u64 {
 		self.gas_limit - self.memory_gas - self.used_gas
 	}
 
-	fn merge(&mut self, other: Self, strategy: MergeStrategy) {
+	fn merge(&mut self, other: Self, strategy: GasometerMergeStrategy) {
 		match strategy {
-			MergeStrategy::Commit => {
+			GasometerMergeStrategy::Commit => {
 				self.used_gas -= Gasometer::<RuntimeState, H>::gas(&other);
 				self.refunded_gas += other.refunded_gas;
 			}
-			MergeStrategy::Revert => {
+			GasometerMergeStrategy::Revert => {
 				self.used_gas -= Gasometer::<RuntimeState, H>::gas(&other);
 			}
-			MergeStrategy::Discard => (),
 		}
 	}
 }
@@ -573,6 +581,17 @@ impl GasCost {
 			_ => 0,
 		}
 	}
+
+	/// Extra check of the cost.
+	pub fn extra_check(&self, after_gas: u64, config: &Config) -> Result<(), ExitException> {
+		match *self {
+			GasCost::Call { gas, .. } => costs::call_extra_check(gas, after_gas, config),
+			GasCost::CallCode { gas, .. } => costs::call_extra_check(gas, after_gas, config),
+			GasCost::DelegateCall { gas, .. } => costs::call_extra_check(gas, after_gas, config),
+			GasCost::StaticCall { gas, .. } => costs::call_extra_check(gas, after_gas, config),
+			_ => Ok(()),
+		}
+	}
 }
 
 /// Memory cost.