Add support for EIP-7939 (CLZ opcode) (#400)

* feat: ✨ add support for count leading zeros (CLZ) opcode

* style: 🎨 fmt

* refactor: ♻️ remove redundant check

* refactor: 🚨 clippy

* refactor: 🚨 more clippy

Author: manuelmauro

core/src/eval/bitwise.rs

@@ -102,3 +102,10 @@ pub fn sar(shift: U256, value: U256) -> U256 {
 		}
 	}
 }
+
+/// Count leading zeros in a 256-bit value.
+/// Returns 256 if the value is zero.
+#[inline]
+pub fn clz(value: U256) -> U256 {
+	U256::from(value.leading_zeros())
+}

core/src/eval/mod.rs

@@ -120,6 +120,10 @@ fn eval_sar(state: &mut Machine, _opcode: Opcode, _position: usize) -> Control {
 	op2_u256_fn!(state, self::bitwise::sar)
 }
 
+fn eval_clz(state: &mut Machine, _opcode: Opcode, _position: usize) -> Control {
+	op1_u256_fn!(state, self::bitwise::clz)
+}
+
 fn eval_codesize(state: &mut Machine, _opcode: Opcode, _position: usize) -> Control {
 	self::misc::codesize(state)
 }
@@ -487,6 +491,7 @@ pub fn eval(state: &mut Machine, opcode: Opcode, position: usize) -> Control {
 		table[Opcode::SHL.as_usize()] = eval_shl as _;
 		table[Opcode::SHR.as_usize()] = eval_shr as _;
 		table[Opcode::SAR.as_usize()] = eval_sar as _;
+		table[Opcode::CLZ.as_usize()] = eval_clz as _;
 		table[Opcode::CODESIZE.as_usize()] = eval_codesize as _;
 		table[Opcode::CODECOPY.as_usize()] = eval_codecopy as _;
 		table[Opcode::CALLDATALOAD.as_usize()] = eval_calldataload as _;

core/src/opcode.rs

@@ -79,6 +79,8 @@ impl Opcode {
 	pub const SHR: Opcode = Opcode(0x1c);
 	/// `SAR`
 	pub const SAR: Opcode = Opcode(0x1d);
+	/// `CLZ` - Count leading zeros (EIP-7939)
+	pub const CLZ: Opcode = Opcode(0x1e);
 
 	/// `POP`
 	pub const POP: Opcode = Opcode(0x50);

gasometer/src/lib.rs

@@ -592,6 +592,9 @@ pub fn dynamic_opcode_cost<H: Handler>(
 		Opcode::SHL | Opcode::SHR | Opcode::SAR if config.has_bitwise_shifting => GasCost::VeryLow,
 		Opcode::SHL | Opcode::SHR | Opcode::SAR => GasCost::Invalid(opcode),
 
+		Opcode::CLZ if config.has_eip_7939 => GasCost::Low,
+		Opcode::CLZ => GasCost::Invalid(opcode),
+
 		Opcode::SELFBALANCE if config.has_self_balance => GasCost::Low,
 		Opcode::SELFBALANCE => GasCost::Invalid(opcode),
 

runtime/src/eval/system.rs

@@ -21,7 +21,7 @@ pub fn sha3<H: Handler>(runtime: &mut Runtime) -> Control<H> {
 	};
 
 	let ret = Keccak256::digest(data.as_slice());
-	push!(runtime, H256::from_slice(ret.as_slice()));
+	push!(runtime, H256::from_slice(ret.as_ref()));
 
 	Control::Continue
 }
@@ -324,7 +324,7 @@ pub fn create<H: Handler>(runtime: &mut Runtime, is_create2: bool, handler: &mut
 
 	let scheme = if is_create2 {
 		pop!(runtime, salt);
-		let code_hash = H256::from_slice(Keccak256::digest(&code).as_slice());
+		let code_hash = H256::from_slice(Keccak256::digest(&code).as_ref());
 		CreateScheme::Create2 {
 			caller: runtime.context.address,
 			salt,

runtime/src/lib.rs

@@ -306,6 +306,8 @@ pub struct Config {
 	pub has_eip_7702: bool,
 	/// Has EIP-7623. See [EIP-7623](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7623.md)
 	pub has_eip_7623: bool,
+	/// Has EIP-7939. See [EIP-7939](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7939.md)
+	pub has_eip_7939: bool,
 }
 
 impl Config {
@@ -369,6 +371,7 @@ impl Config {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -432,6 +435,7 @@ impl Config {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -465,6 +469,11 @@ impl Config {
 		Self::config_with_derived_values(DerivedConfigInputs::pectra())
 	}
 
+	/// Osaka hard fork configuration.
+	pub const fn osaka() -> Config {
+		Self::config_with_derived_values(DerivedConfigInputs::osaka())
+	}
+
 	const fn config_with_derived_values(inputs: DerivedConfigInputs) -> Config {
 		let DerivedConfigInputs {
 			gas_storage_read_warm,
@@ -485,6 +494,7 @@ impl Config {
 			has_eip_7623,
 			gas_calldata_zero_floor,
 			gas_calldata_non_zero_floor,
+			has_eip_7939,
 		} = inputs;
 
 		// See https://eips.ethereum.org/EIPS/eip-2929
@@ -557,6 +567,7 @@ impl Config {
 			has_eip_7623,
 			gas_calldata_zero_floor,
 			gas_calldata_non_zero_floor,
+			has_eip_7939,
 		}
 	}
 }
@@ -582,6 +593,7 @@ struct DerivedConfigInputs {
 	has_eip_7623: bool,
 	gas_calldata_zero_floor: u64,
 	gas_calldata_non_zero_floor: u64,
+	has_eip_7939: bool,
 }
 
 impl DerivedConfigInputs {
@@ -605,6 +617,7 @@ impl DerivedConfigInputs {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -628,6 +641,7 @@ impl DerivedConfigInputs {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -651,6 +665,7 @@ impl DerivedConfigInputs {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -675,6 +690,7 @@ impl DerivedConfigInputs {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -699,6 +715,7 @@ impl DerivedConfigInputs {
 			has_eip_7623: false,
 			gas_calldata_zero_floor: 0,
 			gas_calldata_non_zero_floor: 0,
+			has_eip_7939: false,
 		}
 	}
 
@@ -726,6 +743,35 @@ impl DerivedConfigInputs {
 			has_eip_7623: true,
 			gas_calldata_zero_floor: 10,
 			gas_calldata_non_zero_floor: 40,
+			has_eip_7939: false,
+		}
+	}
+
+	/// Osaka hard fork configuration.
+	const fn osaka() -> Self {
+		Self {
+			gas_storage_read_warm: 100,
+			gas_sload_cold: 2100,
+			gas_access_list_storage_key: 1900,
+			decrease_clears_refund: true,
+			has_base_fee: true,
+			has_push0: true,
+			disallow_executable_format: true,
+			warm_coinbase_address: true,
+			// 2 * 24576 as per EIP-3860
+			max_initcode_size: Some(0xC000),
+			has_eip_6780: true,
+			has_tloadstore: true,
+			has_mcopy: true,
+			has_eip_7702: true,
+			// PER_AUTH_BASE_COST from EIP-7702
+			gas_auth_base_cost: 12500,
+			// PER_EMPTY_ACCOUNT_COST from EIP-7702
+			gas_per_empty_account_cost: 25000,
+			has_eip_7623: true,
+			gas_calldata_zero_floor: 10,
+			gas_calldata_non_zero_floor: 40,
+			has_eip_7939: true,
 		}
 	}
 }

src/executor/stack/executor.rs

@@ -239,7 +239,7 @@ pub trait StackState<'config>: Backend {
 	/// can be customized to use a more performant approach that don't need to
 	/// fetch the code.
 	fn code_hash(&self, address: H160) -> H256 {
-		H256::from_slice(Keccak256::digest(self.code(address)).as_slice())
+		H256::from_slice(Keccak256::digest(self.code(address)).as_ref())
 	}
 
 	fn record_external_operation(
@@ -540,7 +540,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>
 			}
 		}
 
-		let code_hash = H256::from_slice(Keccak256::digest(&init_code).as_slice());
+		let code_hash = H256::from_slice(Keccak256::digest(&init_code).as_ref());
 		event!(TransactCreate2 {
 			caller,
 			value,
@@ -792,14 +792,14 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>
 				hasher.update(&caller[..]);
 				hasher.update(&salt[..]);
 				hasher.update(&code_hash[..]);
-				H256::from_slice(hasher.finalize().as_slice()).into()
+				H256::from_slice(hasher.finalize().as_ref()).into()
 			}
 			CreateScheme::Legacy { caller } => {
 				let nonce = self.nonce(caller);
 				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_ref()).into()
 			}
 			CreateScheme::Fixed(naddress) => naddress,
 		}