Finalize v0.42.0 release (#307)

sorpaas · web-flow · commit f45fcb7b423c · 2025-01-14T12:13:51.000+01:00
* Update rust version in rust-toolchain.toml

* Enable CI in v0.x branch

* Fix missing version bumps

* Missing version bump in evm-fuzzer

* Run cargo fmt on the codebase

* Fix all clippy warnings

* Add missing opcode flags
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -2,9 +2,13 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - v0.x
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - v0.x
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -103,6 +103,9 @@ impl Machine {
 	}
 
 	/// Copy and get the return value of the machine, if any.
+	#[allow(clippy::slow_vector_initialization)]
+	// Clippy complains about not using `no_std`. However, we need to support
+	// `no_std` and we can't use that.
 	pub fn return_value(&self) -> Vec<u8> {
 		if self.return_range.start > U256::from(usize::MAX) {
 			let mut ret = Vec::new();
diff --git a/core/src/memory.rs b/core/src/memory.rs
@@ -48,9 +48,8 @@ impl Memory {
 		&self.data
 	}
 
-	/// Resize the memory, making it cover the memory region of `offset..(offset
-	/// + len)`, with 32 bytes as the step. If the length is zero, this function
-	/// does nothing.
+	/// Resize the memory, making it cover the memory region of `offset..(offset + len)`,
+	/// with 32 bytes as the step. If the length is zero, this function does nothing.
 	pub fn resize_offset(&mut self, offset: U256, len: U256) -> Result<(), ExitError> {
 		if len == U256::zero() {
 			return Ok(());
@@ -79,6 +78,9 @@ impl Memory {
 	///
 	/// Value of `size` is considered trusted. If they're too large,
 	/// the program can run out of memory, or it can overflow.
+	#[allow(clippy::slow_vector_initialization)]
+	// Clippy complains about not using `vec!`. However, we need to support
+	// `no_std` and we can't use that.
 	pub fn get(&self, offset: usize, size: usize) -> Vec<u8> {
 		let mut ret = Vec::new();
 		ret.resize(size, 0);
diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 [dependencies]
 honggfuzz = "0.5"
 
-evm-core = { version = "0.41", path = "../core" }
+evm-core = { version = "0.42", path = "../core" }
 
 [[bin]]
 name = "evm_fuzz"
diff --git a/gasometer/Cargo.toml b/gasometer/Cargo.toml
@@ -13,8 +13,8 @@ environmental = { version = "1.1.2", default-features = false, optional = true }
 log = { version = "0.4", optional = true }
 primitive-types = { version = "0.12", default-features = false }
 
-evm-core = { version = "0.41", path = "../core", default-features = false }
-evm-runtime = { version = "0.41", path = "../runtime", default-features = false }
+evm-core = { version = "0.42", path = "../core", default-features = false }
+evm-runtime = { version = "0.42", path = "../runtime", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/gasometer/src/lib.rs b/gasometer/src/lib.rs
@@ -586,7 +586,10 @@ pub fn dynamic_opcode_cost<H: Handler>(
 				len: U256::from_big_endian(&stack.peek(3)?[..]),
 			}
 		}
-		Opcode::CALLDATACOPY | Opcode::CODECOPY | Opcode::MCOPY => GasCost::VeryLowCopy {
+		Opcode::CALLDATACOPY | Opcode::CODECOPY => GasCost::VeryLowCopy {
+			len: U256::from_big_endian(&stack.peek(2)?[..]),
+		},
+		Opcode::MCOPY if config.has_mcopy => GasCost::VeryLowCopy {
 			len: U256::from_big_endian(&stack.peek(2)?[..]),
 		},
 		Opcode::EXP => GasCost::Exp {
@@ -599,7 +602,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 				target_is_cold: handler.is_cold(address, Some(index))?,
 			}
 		}
-		Opcode::TLOAD => GasCost::TLoad,
+		Opcode::TLOAD if config.has_tloadstore => GasCost::TLoad,
 
 		Opcode::DELEGATECALL if config.has_delegate_call => {
 			let target = stack.peek(1)?.into();
@@ -633,7 +636,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 				target_is_cold: handler.is_cold(address, Some(index))?,
 			}
 		}
-		Opcode::TSTORE if !is_static => GasCost::TStore,
+		Opcode::TSTORE if config.has_tloadstore && !is_static => GasCost::TStore,
 		Opcode::LOG0 if !is_static => GasCost::Log {
 			n: 0,
 			len: U256::from_big_endian(&stack.peek(1)?[..]),
@@ -778,7 +781,7 @@ struct Inner<'config> {
 	config: &'config Config,
 }
 
-impl<'config> Inner<'config> {
+impl Inner<'_> {
 	fn memory_gas(&self, memory: MemoryCost) -> Result<u64, ExitError> {
 		let from = memory.offset;
 		let len = memory.len;
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -14,7 +14,7 @@ environmental = { version = "1.1.2", default-features = false, optional = true }
 primitive-types = { version = "0.12", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 
-evm-core = { version = "0.41", path = "../core", default-features = false }
+evm-core = { version = "0.42", path = "../core", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/runtime/src/handler.rs b/runtime/src/handler.rs
@@ -81,12 +81,7 @@ pub trait Handler {
 	/// Set storage value of address at index.
 	fn set_storage(&mut self, address: H160, index: H256, value: H256) -> Result<(), ExitError>;
 	/// Set transient storage value of address at index, transient storage gets discarded after every transaction. (see EIP-1153)
-	fn set_transient_storage(
-		&mut self,
-		address: H160,
-		index: H256,
-		value: H256,
-	);
+	fn set_transient_storage(&mut self, address: H160, index: H256, value: H256);
 	/// Create a log owned by address with given topics and data.
 	fn log(&mut self, address: H160, topics: Vec<H256>, data: Vec<u8>) -> Result<(), ExitError>;
 	/// Mark an address to be deleted, with funds transferred to target.
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -286,6 +286,10 @@ pub struct Config {
 	pub has_base_fee: bool,
 	/// Has PUSH0 opcode. See [EIP-3855](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-3855.md)
 	pub has_push0: bool,
+	/// Has TLOAD and TSTORE opcode.
+	pub has_tloadstore: bool,
+	/// Has MCOPY opcode.
+	pub has_mcopy: bool,
 	/// Whether the gasometer is running in estimate mode.
 	pub estimate: bool,
 	/// Has EIP-6780. See [EIP-6780](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-6780.md)
@@ -343,6 +347,8 @@ impl Config {
 			has_ext_code_hash: false,
 			has_base_fee: false,
 			has_push0: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 			estimate: false,
 			has_eip_6780: false,
 		}
@@ -398,6 +404,8 @@ impl Config {
 			has_ext_code_hash: true,
 			has_base_fee: false,
 			has_push0: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 			estimate: false,
 			has_eip_6780: false,
 		}
@@ -440,6 +448,8 @@ impl Config {
 			warm_coinbase_address,
 			max_initcode_size,
 			has_eip_6780,
+			has_tloadstore,
+			has_mcopy,
 		} = inputs;
 
 		// See https://eips.ethereum.org/EIPS/eip-2929
@@ -504,6 +514,8 @@ impl Config {
 			has_push0,
 			estimate: false,
 			has_eip_6780,
+			has_tloadstore,
+			has_mcopy,
 		}
 	}
 }
@@ -521,6 +533,8 @@ struct DerivedConfigInputs {
 	warm_coinbase_address: bool,
 	max_initcode_size: Option<usize>,
 	has_eip_6780: bool,
+	has_tloadstore: bool,
+	has_mcopy: bool,
 }
 
 impl DerivedConfigInputs {
@@ -536,6 +550,8 @@ impl DerivedConfigInputs {
 			warm_coinbase_address: false,
 			max_initcode_size: None,
 			has_eip_6780: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 		}
 	}
 
@@ -551,6 +567,8 @@ impl DerivedConfigInputs {
 			warm_coinbase_address: false,
 			max_initcode_size: None,
 			has_eip_6780: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 		}
 	}
 
@@ -566,6 +584,8 @@ impl DerivedConfigInputs {
 			warm_coinbase_address: false,
 			max_initcode_size: None,
 			has_eip_6780: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 		}
 	}
 
@@ -582,6 +602,8 @@ impl DerivedConfigInputs {
 			// 2 * 24576 as per EIP-3860
 			max_initcode_size: Some(0xC000),
 			has_eip_6780: false,
+			has_tloadstore: false,
+			has_mcopy: false,
 		}
 	}
 
@@ -598,6 +620,8 @@ impl DerivedConfigInputs {
 			// 2 * 24576 as per EIP-3860
 			max_initcode_size: Some(0xC000),
 			has_eip_6780: true,
+			has_tloadstore: true,
+			has_mcopy: true,
 		}
 	}
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.69.0"
+channel = "1.84.0"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
diff --git a/src/backend/memory.rs b/src/backend/memory.rs
@@ -88,7 +88,7 @@ impl<'vicinity> MemoryBackend<'vicinity> {
 	}
 }
 
-impl<'vicinity> Backend for MemoryBackend<'vicinity> {
+impl Backend for MemoryBackend<'_> {
 	fn gas_price(&self) -> U256 {
 		self.vicinity.gas_price
 	}
@@ -172,7 +172,7 @@ impl<'vicinity> Backend for MemoryBackend<'vicinity> {
 	}
 }
 
-impl<'vicinity> ApplyBackend for MemoryBackend<'vicinity> {
+impl ApplyBackend for MemoryBackend<'_> {
 	fn apply<A, I, L>(&mut self, values: A, logs: L, delete_empty: bool)
 	where
 		A: IntoIterator<Item = Apply<I>>,
@@ -189,7 +189,7 @@ impl<'vicinity> ApplyBackend for MemoryBackend<'vicinity> {
 					reset_storage,
 				} => {
 					let is_empty = {
-						let account = self.state.entry(address).or_insert_with(Default::default);
+						let account = self.state.entry(address).or_default();
 						account.balance = basic.balance;
 						account.nonce = basic.nonce;
 						if let Some(code) = code {
diff --git a/src/executor/stack/executor.rs b/src/executor/stack/executor.rs
@@ -672,7 +672,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>
 				let mut stream = rlp::RlpStream::new_list(2);
 				stream.append(&caller);
 				stream.append(&nonce);
-				H256::from_slice(Keccak256::digest(&stream.out()).as_slice()).into()
+				H256::from_slice(Keccak256::digest(stream.out()).as_slice()).into()
 			}
 			CreateScheme::Fixed(naddress) => naddress,
 		}
@@ -1087,8 +1087,8 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>
 pub struct StackExecutorCallInterrupt<'borrow>(TaggedRuntime<'borrow>);
 pub struct StackExecutorCreateInterrupt<'borrow>(TaggedRuntime<'borrow>);
 
-impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> Handler
-	for StackExecutor<'config, 'precompiles, S, P>
+impl<'config, S: StackState<'config>, P: PrecompileSet> Handler
+	for StackExecutor<'config, '_, S, P>
 {
 	type CreateInterrupt = StackExecutorCreateInterrupt<'static>;
 	type CreateFeedback = Infallible;
@@ -1210,12 +1210,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> Handler
 		Ok(())
 	}
 
-	fn set_transient_storage(
-		&mut self,
-		address: H160,
-		index: H256,
-		value: H256,
-	) {
+	fn set_transient_storage(&mut self, address: H160, index: H256, value: H256) {
 		self.state.set_transient_storage(address, index, value);
 	}
 
@@ -1402,8 +1397,8 @@ struct StackExecutorHandle<'inner, 'config, 'precompiles, S, P> {
 	is_static: bool,
 }
 
-impl<'inner, 'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> PrecompileHandle
-	for StackExecutorHandle<'inner, 'config, 'precompiles, S, P>
+impl<'config, S: StackState<'config>, P: PrecompileSet> PrecompileHandle
+	for StackExecutorHandle<'_, 'config, '_, S, P>
 {
 	// Perform subcall in provided context.
 	/// Precompile specifies in which context the subcall is executed.
diff --git a/src/executor/stack/memory.rs b/src/executor/stack/memory.rs
@@ -441,7 +441,7 @@ pub struct MemoryStackState<'backend, 'config, B> {
 	substate: MemoryStackSubstate<'config>,
 }
 
-impl<'backend, 'config, B: Backend> Backend for MemoryStackState<'backend, 'config, B> {
+impl<B: Backend> Backend for MemoryStackState<'_, '_, B> {
 	fn gas_price(&self) -> U256 {
 		self.backend.gas_price()
 	}
@@ -515,7 +515,7 @@ impl<'backend, 'config, B: Backend> Backend for MemoryStackState<'backend, 'conf
 	}
 }
 
-impl<'backend, 'config, B: Backend> StackState<'config> for MemoryStackState<'backend, 'config, B> {
+impl<'config, B: Backend> StackState<'config> for MemoryStackState<'_, 'config, B> {
 	fn metadata(&self) -> &StackSubstateMetadata<'config> {
 		self.substate.metadata()
 	}
diff --git a/src/maybe_borrowed.rs b/src/maybe_borrowed.rs
@@ -13,7 +13,7 @@ pub enum MaybeBorrowed<'a, T> {
 	Owned(T),
 }
 
-impl<'a, T> core::ops::Deref for MaybeBorrowed<'a, T> {
+impl<T> core::ops::Deref for MaybeBorrowed<'_, T> {
 	type Target = T;
 
 	fn deref(&self) -> &Self::Target {
@@ -24,7 +24,7 @@ impl<'a, T> core::ops::Deref for MaybeBorrowed<'a, T> {
 	}
 }
 
-impl<'a, T> core::ops::DerefMut for MaybeBorrowed<'a, T> {
+impl<T> core::ops::DerefMut for MaybeBorrowed<'_, T> {
 	fn deref_mut(&mut self) -> &mut Self::Target {
 		match self {
 			Self::Borrowed(x) => x,

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,9 @@ impl Machine {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/// Copy and get the return value of the machine, if any.`
	`106`	`+ #[allow(clippy::slow_vector_initialization)]`
	`107`	+ // Clippy complains about not using `no_std`. However, we need to support
	`108`	+ // `no_std` and we can't use that.
`106`	`109`	`pub fn return_value(&self) -> Vec<u8> {`
`107`	`110`	`if self.return_range.start > U256::from(usize::MAX) {`
`108`	`111`	`let mut ret = Vec::new();`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,10 @@ pub fn dynamic_opcode_cost<H: Handler>(`
`586`	`586`	`len: U256::from_big_endian(&stack.peek(3)?[..]),`
`587`	`587`	`}`
`588`	`588`	`}`
`589`		`- Opcode::CALLDATACOPY \| Opcode::CODECOPY \| Opcode::MCOPY => GasCost::VeryLowCopy {`
	`589`	`+ Opcode::CALLDATACOPY \| Opcode::CODECOPY => GasCost::VeryLowCopy {`
	`590`	`+ len: U256::from_big_endian(&stack.peek(2)?[..]),`
	`591`	`+ },`
	`592`	`+ Opcode::MCOPY if config.has_mcopy => GasCost::VeryLowCopy {`
`590`	`593`	`len: U256::from_big_endian(&stack.peek(2)?[..]),`
`591`	`594`	`},`
`592`	`595`	`Opcode::EXP => GasCost::Exp {`
`@@ -599,7 +602,7 @@ pub fn dynamic_opcode_cost<H: Handler>(`
`599`	`602`	`target_is_cold: handler.is_cold(address, Some(index))?,`
`600`	`603`	`}`
`601`	`604`	`}`
`602`		`- Opcode::TLOAD => GasCost::TLoad,`
	`605`	`+ Opcode::TLOAD if config.has_tloadstore => GasCost::TLoad,`
`603`	`606`
`604`	`607`	`Opcode::DELEGATECALL if config.has_delegate_call => {`
`605`	`608`	`let target = stack.peek(1)?.into();`
`@@ -633,7 +636,7 @@ pub fn dynamic_opcode_cost<H: Handler>(`
`633`	`636`	`target_is_cold: handler.is_cold(address, Some(index))?,`
`634`	`637`	`}`
`635`	`638`	`}`
`636`		`- Opcode::TSTORE if !is_static => GasCost::TStore,`
	`639`	`+ Opcode::TSTORE if config.has_tloadstore && !is_static => GasCost::TStore,`
`637`	`640`	`Opcode::LOG0 if !is_static => GasCost::Log {`
`638`	`641`	`n: 0,`
`639`	`642`	`len: U256::from_big_endian(&stack.peek(1)?[..]),`
`@@ -778,7 +781,7 @@ struct Inner<'config> {`
`778`	`781`	`config: &'config Config,`
`779`	`782`	`}`
`780`	`783`
`781`		`-impl<'config> Inner<'config> {`
	`784`	`+impl Inner<'_> {`
`782`	`785`	`fn memory_gas(&self, memory: MemoryCost) -> Result<u64, ExitError> {`
`783`	`786`	`let from = memory.offset;`
`784`	`787`	`let len = memory.len;`
Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,10 @@ pub struct Config {`
`286`	`286`	`pub has_base_fee: bool,`
`287`	`287`	`/// Has PUSH0 opcode. See [EIP-3855](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-3855.md)`
`288`	`288`	`pub has_push0: bool,`
	`289`	`+ /// Has TLOAD and TSTORE opcode.`
	`290`	`+ pub has_tloadstore: bool,`
	`291`	`+ /// Has MCOPY opcode.`
	`292`	`+ pub has_mcopy: bool,`
`289`	`293`	`/// Whether the gasometer is running in estimate mode.`
`290`	`294`	`pub estimate: bool,`
`291`	`295`	`/// Has EIP-6780. See [EIP-6780](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-6780.md)`
`@@ -343,6 +347,8 @@ impl Config {`
`343`	`347`	`has_ext_code_hash: false,`
`344`	`348`	`has_base_fee: false,`
`345`	`349`	`has_push0: false,`
	`350`	`+ has_tloadstore: false,`
	`351`	`+ has_mcopy: false,`
`346`	`352`	`estimate: false,`
`347`	`353`	`has_eip_6780: false,`
`348`	`354`	`}`
`@@ -398,6 +404,8 @@ impl Config {`
`398`	`404`	`has_ext_code_hash: true,`
`399`	`405`	`has_base_fee: false,`
`400`	`406`	`has_push0: false,`
	`407`	`+ has_tloadstore: false,`
	`408`	`+ has_mcopy: false,`
`401`	`409`	`estimate: false,`
`402`	`410`	`has_eip_6780: false,`
`403`	`411`	`}`
`@@ -440,6 +448,8 @@ impl Config {`
`440`	`448`	`warm_coinbase_address,`
`441`	`449`	`max_initcode_size,`
`442`	`450`	`has_eip_6780,`
	`451`	`+ has_tloadstore,`
	`452`	`+ has_mcopy,`
`443`	`453`	`} = inputs;`
`444`	`454`
`445`	`455`	`// See https://eips.ethereum.org/EIPS/eip-2929`
`@@ -504,6 +514,8 @@ impl Config {`
`504`	`514`	`has_push0,`
`505`	`515`	`estimate: false,`
`506`	`516`	`has_eip_6780,`
	`517`	`+ has_tloadstore,`
	`518`	`+ has_mcopy,`
`507`	`519`	`}`
`508`	`520`	`}`
`509`	`521`	`}`
`@@ -521,6 +533,8 @@ struct DerivedConfigInputs {`
`521`	`533`	`warm_coinbase_address: bool,`
`522`	`534`	`max_initcode_size: Option<usize>,`
`523`	`535`	`has_eip_6780: bool,`
	`536`	`+ has_tloadstore: bool,`
	`537`	`+ has_mcopy: bool,`
`524`	`538`	`}`
`525`	`539`
`526`	`540`	`impl DerivedConfigInputs {`
`@@ -536,6 +550,8 @@ impl DerivedConfigInputs {`
`536`	`550`	`warm_coinbase_address: false,`
`537`	`551`	`max_initcode_size: None,`
`538`	`552`	`has_eip_6780: false,`
	`553`	`+ has_tloadstore: false,`
	`554`	`+ has_mcopy: false,`
`539`	`555`	`}`
`540`	`556`	`}`
`541`	`557`
`@@ -551,6 +567,8 @@ impl DerivedConfigInputs {`
`551`	`567`	`warm_coinbase_address: false,`
`552`	`568`	`max_initcode_size: None,`
`553`	`569`	`has_eip_6780: false,`
	`570`	`+ has_tloadstore: false,`
	`571`	`+ has_mcopy: false,`
`554`	`572`	`}`
`555`	`573`	`}`
`556`	`574`
`@@ -566,6 +584,8 @@ impl DerivedConfigInputs {`
`566`	`584`	`warm_coinbase_address: false,`
`567`	`585`	`max_initcode_size: None,`
`568`	`586`	`has_eip_6780: false,`
	`587`	`+ has_tloadstore: false,`
	`588`	`+ has_mcopy: false,`
`569`	`589`	`}`
`570`	`590`	`}`
`571`	`591`
`@@ -582,6 +602,8 @@ impl DerivedConfigInputs {`
`582`	`602`	`// 2 * 24576 as per EIP-3860`
`583`	`603`	`max_initcode_size: Some(0xC000),`
`584`	`604`	`has_eip_6780: false,`
	`605`	`+ has_tloadstore: false,`
	`606`	`+ has_mcopy: false,`
`585`	`607`	`}`
`586`	`608`	`}`
`587`	`609`
`@@ -598,6 +620,8 @@ impl DerivedConfigInputs {`
`598`	`620`	`// 2 * 24576 as per EIP-3860`
`599`	`621`	`max_initcode_size: Some(0xC000),`
`600`	`622`	`has_eip_6780: true,`
	`623`	`+ has_tloadstore: true,`
	`624`	`+ has_mcopy: true,`
`601`	`625`	`}`
`602`	`626`	`}`
`603`	`627`	`}`