Update evm to v0.41.1 (polkadot-evm#1259) (#19)

Co-authored-by: Wei Tang <[email protected]>

Author: boundless-forest

Cargo.lock

@@ -49,9 +49,9 @@ bn = { package = "substrate-bn", version = "0.6", default-features = false }
 clap = { version = "4.4.3", features = ["derive", "deprecated"] }
 derive_more = "0.99"
 environmental = { version = "1.1.4", default-features = false }
-ethereum = { version = "0.14.0", default-features = false }
+ethereum = { version = "0.15.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
-evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false }
+evm = { version = "0.41.1", default-features = false }
 futures = "0.3.28"
 hash-db = { version = "0.16.0", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

Cargo.toml

@@ -85,8 +85,11 @@ where
 			return Err(err);
 		}
 
-		handle
-			.record_external_cost(Some(info.weight.ref_time()), Some(info.weight.proof_size()))?;
+		handle.record_external_cost(
+			Some(info.weight.ref_time()),
+			Some(info.weight.proof_size()),
+			None,
+		)?;
 
 		match call.dispatch(Some(origin).into()) {
 			Ok(post_info) => {

frame/evm/precompile/dispatch/src/lib.rs

@@ -183,6 +183,7 @@ impl PrecompileHandle for MockHandle {
 		&mut self,
 		_ref_time: Option<u64>,
 		_proof_size: Option<u64>,
+		_storage_growth: Option<u64>,
 	) -> Result<(), ExitError> {
 		Ok(())
 	}

frame/evm/precompile/dispatch/src/mock.rs

@@ -999,7 +999,7 @@ where
 				ExternalOperation::IsEmpty => {
 					weight_info.try_record_proof_size_or_fail(IS_EMPTY_CHECK_PROOF_SIZE)?
 				}
-				ExternalOperation::Write => {
+				ExternalOperation::Write(_) => {
 					weight_info.try_record_proof_size_or_fail(WRITE_PROOF_SIZE)?
 				}
 			};
@@ -1138,6 +1138,7 @@ where
 		&mut self,
 		ref_time: Option<u64>,
 		proof_size: Option<u64>,
+		_storage_growth: Option<u64>,
 	) -> Result<(), ExitError> {
 		let weight_info = if let (Some(weight_info), _) = self.info_mut() {
 			weight_info

frame/evm/src/runner/stack.rs

@@ -80,7 +80,12 @@ impl PrecompileHandle for MockHandle {
 		Ok(())
 	}
 
-	fn record_external_cost(&mut self, _: Option<u64>, _: Option<u64>) -> Result<(), ExitError> {
+	fn record_external_cost(
+		&mut self,
+		_: Option<u64>,
+		_: Option<u64>,
+		_: Option<u64>,
+	) -> Result<(), ExitError> {
 		Ok(())
 	}
 

frame/evm/test-vector-support/src/lib.rs

@@ -60,7 +60,7 @@ impl<T: PrecompileHandle> PrecompileHandleExt for T {
 	) -> Result<(), evm::ExitError> {
 		self.record_cost(crate::prelude::RuntimeHelper::<Runtime>::db_read_gas_cost())?;
 		// TODO: record ref time when precompile will be benchmarked
-		self.record_external_cost(None, Some(data_max_encoded_len as u64))
+		self.record_external_cost(None, Some(data_max_encoded_len as u64), None)
 	}
 
 	/// Record cost of a log manualy.
@@ -190,6 +190,7 @@ mod tests {
 			&mut self,
 			_ref_time: Option<u64>,
 			_proof_size: Option<u64>,
+			_storage_growth: Option<u64>,
 		) -> Result<(), fp_evm::ExitError> {
 			Ok(())
 		}

precompiles/src/evm/handle.rs

@@ -477,8 +477,10 @@ impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
 		&mut self,
 		ref_time: Option<u64>,
 		proof_size: Option<u64>,
+		storage_growth: Option<u64>,
 	) -> Result<(), ExitError> {
-		self.handle.record_external_cost(ref_time, proof_size)
+		self.handle
+			.record_external_cost(ref_time, proof_size, storage_growth)
 	}
 
 	fn refund_external_cost(&mut self, ref_time: Option<u64>, proof_size: Option<u64>) {

precompiles/src/precompile_set.rs

@@ -77,7 +77,7 @@ where
 
 		// Make sure there is enough remaining weight
 		// TODO: record ref time when precompile will be benchmarked
-		handle.record_external_cost(None, Some(weight.proof_size()))
+		handle.record_external_cost(None, Some(weight.proof_size()), None)
 	}
 
 	#[inline(always)]

precompiles/src/substrate.rs

@@ -208,6 +208,7 @@ impl PrecompileHandle for MockHandle {
 		&mut self,
 		_ref_time: Option<u64>,
 		_proof_size: Option<u64>,
+		_storage_growth: Option<u64>,
 	) -> Result<(), ExitError> {
 		Ok(())
 	}