fixes

Author: pgherveou

substrate/frame/revive/src/vm/evm.rs

@@ -138,6 +138,6 @@ fn run_plain<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Halt, Infa
 	loop {
 		let opcode = interpreter.bytecode.opcode();
 		interpreter.bytecode.relative_jump(1);
-		exec_instruction(opcode, interpreter)?;
+		exec_instruction(interpreter, opcode)?;
 	}
 }

substrate/frame/revive/src/vm/evm/instructions/bitwise.rs

@@ -17,7 +17,7 @@
 
 mod bits;
 
-use super::arithmetic::i256::i256_cmp;
+use super::{arithmetic::i256::i256_cmp, utility::as_usize_saturated};
 use crate::{
 	vm::{
 		evm::{interpreter::Halt, EVMGas, Interpreter},
@@ -162,7 +162,7 @@ pub fn shl<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Halt> {
 	interpreter.ext.charge_or_halt(EVMGas(VERYLOW))?;
 	let ([op1], op2) = interpreter.stack.popn_top()?;
 
-	let shift = as_usize_saturated!(op1);
+	let shift = as_usize_saturated(op1);
 	*op2 = if shift < 256 { *op2 << shift } else { U256::zero() };
 	ControlFlow::Continue(())
 }
@@ -172,7 +172,7 @@ pub fn shr<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Halt> {
 	interpreter.ext.charge_or_halt(EVMGas(VERYLOW))?;
 	let ([op1], op2) = interpreter.stack.popn_top()?;
 
-	let shift = as_usize_saturated!(op1);
+	let shift = as_usize_saturated(op1);
 	*op2 = if shift < 256 { *op2 >> shift } else { U256::zero() };
 	ControlFlow::Continue(())
 }
@@ -182,7 +182,7 @@ pub fn sar<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Halt> {
 	interpreter.ext.charge_or_halt(EVMGas(VERYLOW))?;
 	let ([op1], op2) = interpreter.stack.popn_top()?;
 
-	let shift = as_usize_saturated!(op1);
+	let shift = as_usize_saturated(op1);
 	*op2 = if shift < 256 {
 		op2.arithmetic_shr(shift)
 	} else if op2.bit(255) {

substrate/frame/revive/src/vm/evm/instructions/macros.rs

@@ -19,9 +19,8 @@
 
 use super::interpreter::Interpreter;
 use crate::vm::{evm::Halt, Ext};
+use revm::bytecode::opcode::*;
 
-#[macro_use]
-mod macros;
 /// Arithmetic operations (ADD, SUB, MUL, DIV, etc.).
 mod arithmetic;
 /// Bitwise operations (AND, OR, XOR, NOT, etc.).
@@ -49,11 +48,9 @@ mod tx_info;
 mod utility;
 
 pub fn exec_instruction<E: Ext>(
-	opcode: u8,
 	interpreter: &mut Interpreter<E>,
+	opcode: u8,
 ) -> core::ops::ControlFlow<Halt> {
-	use revm::bytecode::opcode::*;
-
 	match opcode {
 		STOP => control::stop(interpreter),
 		ADD => arithmetic::add(interpreter),

substrate/frame/revive/src/vm/evm/instructions/mod.rs

@@ -23,6 +23,7 @@ use crate::{
 	},
 	Config, U256,
 };
+use super::utility::as_usize_saturated;
 use core::{ops::ControlFlow, ptr};
 use revm::interpreter::gas::{BASE, VERYLOW};
 use sp_core::H256;
@@ -95,7 +96,7 @@ pub fn codecopy<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Halt> {
 	let Some(memory_offset) = memory_resize(interpreter, memory_offset, len)? else {
 		return ControlFlow::Continue(())
 	};
-	let code_offset = as_usize_saturated!(code_offset);
+	let code_offset = as_usize_saturated(code_offset);
 
 	interpreter.memory.set_data(
 		memory_offset,
@@ -113,7 +114,7 @@ pub fn calldataload<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Hal
 	interpreter.ext.charge_or_halt(EVMGas(VERYLOW))?;
 	let ([], offset_ptr) = interpreter.stack.popn_top()?;
 	let mut word = [0u8; 32];
-	let offset = as_usize_saturated!(offset_ptr);
+	let offset = as_usize_saturated(*offset_ptr);
 	let input = &interpreter.input;
 	let input_len = input.len();
 	if offset < input_len {
@@ -153,7 +154,7 @@ pub fn calldatacopy<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<Hal
 		return ControlFlow::Continue(());
 	};
 
-	let data_offset = as_usize_saturated!(data_offset);
+	let data_offset = as_usize_saturated(data_offset);
 	interpreter.memory.set_data(memory_offset, data_offset, len, &interpreter.input);
 	ControlFlow::Continue(())
 }
@@ -170,7 +171,7 @@ pub fn returndatacopy<E: Ext>(interpreter: &mut Interpreter<E>) -> ControlFlow<H
 	let [memory_offset, offset, len] = interpreter.stack.popn()?;
 
 	let len = as_usize_or_halt(len)?;
-	let data_offset = as_usize_saturated!(offset);
+	let data_offset = as_usize_saturated(offset);
 
 	// Old legacy behavior is to panic if data_end is out of scope of return buffer.
 	let data_end = data_offset.saturating_add(len);

substrate/frame/revive/src/vm/evm/instructions/system.rs

@@ -17,6 +17,18 @@
 
 use sp_core::{H160, U256};
 
+/// Converts a `U256` value to a `usize`, saturating to `MAX` if the value is too large.
+pub fn as_usize_saturated(v: U256) -> usize {
+	match &v.0 {
+		x =>
+			if (x[1] == 0) & (x[2] == 0) & (x[3] == 0) {
+				usize::try_from(x[0]).unwrap_or(usize::MAX)
+			} else {
+				usize::MAX
+			},
+	}
+}
+
 /// Pushes an arbitrary length slice of bytes onto the stack, padding the last word with zeros
 /// if necessary.
 ///