From 9c4947e0f0663eb7bc5801482e3bfac4bb094d43 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Thu, 7 Jul 2022 18:06:24 +0200 Subject: [PATCH] EC ops test --- evm/src/cpu/kernel/aggregator.rs | 138 ++++++++++++++++++++++++++++++ evm/src/cpu/kernel/assembler.rs | 2 +- evm/src/cpu/kernel/interpreter.rs | 48 +++++++---- 3 files changed, 169 insertions(+), 19 deletions(-) diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index ac0d6f7c..d58208fd 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -23,11 +23,149 @@ pub(crate) fn combined_kernel() -> Kernel { #[cfg(test)] mod tests { + use std::str::FromStr; + + use anyhow::Result; + use ethereum_types::U256; + use crate::cpu::kernel::aggregator::combined_kernel; + use crate::cpu::kernel::interpreter::run; #[test] fn make_kernel() { // Make sure we can parse and assemble the entire kernel. combined_kernel(); } + + fn u256ify<'a>(hexes: impl IntoIterator) -> Result> { + Ok(hexes + .into_iter() + .map(U256::from_str) + .collect::, _>>()?) + } + + #[test] + fn test_ec_ops() -> Result<()> { + // Make sure we can parse and assemble the entire kernel. + let kernel = combined_kernel(); + let ec_add = kernel.global_labels["ec_add"]; + let ec_double = kernel.global_labels["ec_double"]; + let ec_mul = kernel.global_labels["ec_mul"]; + let identity = ("0x0", "0x0"); + let invalid = ("0x0", "0x3"); // Not on curve + let point0 = ( + "0x1feee7ec986e198890cb83be8b8ba09ee953b3f149db6d9bfdaa5c308a33e58d", + "0x2051cc9a9edd46231604fd88f351e95ec72a285be93e289ac59cb48561efb2c6", + ); + let point1 = ( + "0x15b64d0a5f329fb672029298be8050f444626e6de11903caffa74b388075be1b", + "0x2d9e07340bd5cd7b70687b98f2500ff930a89a30d7b6a3e04b1b4d345319d234", + ); + // point2 = point0 + point1 + let point2 = ( + "0x18659c0e0a8fedcb8747cf463fc7cfa05f667d84e771d0a9521fc1a550688f0c", + "0x283ed10b42703e187e7a808aeb45c6b457bc4cc7d704e53b3348a1e3b0bfa55b", + ); + // point3 = 2 * point0 + let point3 = ( + "0x17da2b7b1a01c8dfdf0f5a6415833c7d755d219aa7e2c4cd0ac83d87d0ca4217", + "0xc9ace9de14aac8114541b50c19320eb40f0eeac3621526d9e34dbcf4c3a6c0f", + ); + let s = "0xabb2a34c0e7956cfe6cef9ddb7e810c45ea19a6ebadd79c21959af09f5ba480a"; + // point4 = s * point0 + let point4 = ( + "0xe519344959cc17021fe98878f947f5c1b1675325533a620c1684cfa6367e6c0", + "0x7496a7575b0b6a821e19ce780ecc3e0b156e605327798693defeb9f265b7a6f", + ); + + // Standard addition #1 + let initial_stack = u256ify(["0xdeadbeef", point0.1, point0.0, point1.1, point1.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point2.1, point2.0])?); + // Standard addition #2 + let initial_stack = u256ify(["0xdeadbeef", point1.1, point1.0, point0.1, point0.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point2.1, point2.0])?); + + // Standard doubling #1 + let initial_stack = u256ify(["0xdeadbeef", point0.1, point0.0, point0.1, point0.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point3.1, point3.0])?); + // Standard doubling #2 + let initial_stack = u256ify(["0xdeadbeef", point0.1, point0.0])?; + let stack = run(&kernel.code, ec_double, initial_stack); + assert_eq!(stack, u256ify([point3.1, point3.0])?); + // Standard doubling #3 + let initial_stack = u256ify(["0xdeadbeef", "0x2", point0.1, point0.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, u256ify([point3.1, point3.0])?); + + // Addition with identity #1 + let initial_stack = u256ify(["0xdeadbeef", identity.1, identity.0, point1.1, point1.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point1.1, point1.0])?); + // Addition with identity #2 + let initial_stack = u256ify(["0xdeadbeef", point1.1, point1.0, identity.1, identity.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point1.1, point1.0])?); + // Addition with identity #3 + let initial_stack = + u256ify(["0xdeadbeef", identity.1, identity.0, identity.1, identity.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([identity.1, identity.0])?); + + // Addition with invalid point(s) #1 + let initial_stack = u256ify(["0xdeadbeef", point0.1, point0.0, invalid.1, invalid.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, vec![U256::MAX, U256::MAX]); + // Addition with invalid point(s) #2 + let initial_stack = u256ify(["0xdeadbeef", invalid.1, invalid.0, point0.1, point0.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, vec![U256::MAX, U256::MAX]); + // Addition with invalid point(s) #3 + let initial_stack = u256ify(["0xdeadbeef", invalid.1, invalid.0, identity.1, identity.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, vec![U256::MAX, U256::MAX]); + // Addition with invalid point(s) #4 + let initial_stack = u256ify(["0xdeadbeef", invalid.1, invalid.0, invalid.1, invalid.0])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, vec![U256::MAX, U256::MAX]); + + // Scalar multiplication #1 + let initial_stack = u256ify(["0xdeadbeef", s, point0.1, point0.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, u256ify([point4.1, point4.0])?); + // Scalar multiplication #2 + let initial_stack = u256ify(["0xdeadbeef", "0x0", point0.1, point0.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, u256ify([identity.1, identity.0])?); + // Scalar multiplication #3 + let initial_stack = u256ify(["0xdeadbeef", "0x1", point0.1, point0.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, u256ify([point0.1, point0.0])?); + // Scalar multiplication #4 + let initial_stack = u256ify(["0xdeadbeef", s, identity.1, identity.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, u256ify([identity.1, identity.0])?); + // Scalar multiplication #5 + let initial_stack = u256ify(["0xdeadbeef", s, invalid.1, invalid.0])?; + let stack = run(&kernel.code, ec_mul, initial_stack); + assert_eq!(stack, vec![U256::MAX, U256::MAX]); + + // Multiple calls + let ec_mul_hex = format!("0x{:x}", ec_mul); + let initial_stack = u256ify([ + "0xdeadbeef", + s, + &ec_mul_hex, + identity.1, + identity.0, + point0.1, + point0.0, + ])?; + let stack = run(&kernel.code, ec_add, initial_stack); + assert_eq!(stack, u256ify([point4.1, point4.0])?); + + Ok(()) + } } diff --git a/evm/src/cpu/kernel/assembler.rs b/evm/src/cpu/kernel/assembler.rs index d7e40f24..91f64a42 100644 --- a/evm/src/cpu/kernel/assembler.rs +++ b/evm/src/cpu/kernel/assembler.rs @@ -16,7 +16,7 @@ const BYTES_PER_OFFSET: u8 = 3; #[derive(PartialEq, Eq, Debug)] pub struct Kernel { pub code: Vec, - global_labels: HashMap, + pub(crate) global_labels: HashMap, } pub(crate) fn assemble(files: Vec) -> Kernel { diff --git a/evm/src/cpu/kernel/interpreter.rs b/evm/src/cpu/kernel/interpreter.rs index f344befd..c1f69108 100644 --- a/evm/src/cpu/kernel/interpreter.rs +++ b/evm/src/cpu/kernel/interpreter.rs @@ -1,12 +1,12 @@ use ethereum_types::{U256, U512}; -struct Interpreter { - code: Vec, +struct Interpreter<'a> { + code: &'a [u8], offset: usize, stack: Vec, } -pub fn run(code: Vec, initial_offset: usize, initial_stack: Vec) -> Vec { +pub fn run(code: &[u8], initial_offset: usize, initial_stack: Vec) -> Vec { let mut interpreter = Interpreter { code, offset: initial_offset, @@ -18,7 +18,7 @@ pub fn run(code: Vec, initial_offset: usize, initial_stack: Vec) -> Ve interpreter.stack } -impl Interpreter { +impl<'a> Interpreter<'a> { fn slice(&self, n: usize) -> &[u8] { &self.code[self.offset..self.offset + n] } @@ -37,12 +37,12 @@ impl Interpreter { fn run_opcode(&mut self) { let opcode = self.code[self.offset]; - self.incr(1); match opcode { 0x00 => todo!(), // "STOP", 0x01 => self.run_add(), // "ADD", 0x02 => self.run_mul(), // "MUL", 0x03 => self.run_sub(), // "SUB", + 0x04 => self.run_div(), // "DIV", 0x05 => todo!(), // "SDIV", 0x06 => self.run_mod(), // "MOD", 0x07 => todo!(), // "SMOD", @@ -89,7 +89,7 @@ impl Interpreter { 0x45 => todo!(), // "GASLIMIT", 0x46 => todo!(), // "CHAINID", 0x48 => todo!(), // "BASEFEE", - 0x50 => todo!(), // "POP", + 0x50 => self.run_pop(), // "POP", 0x51 => todo!(), // "MLOAD", 0x52 => todo!(), // "MSTORE", 0x53 => todo!(), // "MSTORE8", @@ -119,7 +119,7 @@ impl Interpreter { 0xfd => todo!(), // "REVERT", 0xfe => todo!(), // "INVALID", 0xff => todo!(), // "SELFDESTRUCT", - _ => panic!("Unrecognized mnemonic."), + _ => panic!("Unrecognized opcode {}.", opcode), }; } @@ -144,6 +144,13 @@ impl Interpreter { self.incr(1); } + fn run_div(&mut self) { + let x = self.pop(); + let y = self.pop(); + self.push(x / y); + self.incr(1); + } + fn run_mod(&mut self) { let x = self.pop(); let y = self.pop(); @@ -234,13 +241,17 @@ impl Interpreter { self.incr(1); } + fn run_pop(&mut self) { + self.pop(); + self.incr(1); + } + fn run_jump(&mut self) { let x = self.pop().as_usize(); self.offset = x; - assert_eq!( - self.code[self.offset], 0x5b, - "Destination is not a JUMPDEST." - ); + if let Some(&landing_opcode) = self.code.get(self.offset) { + assert_eq!(landing_opcode, 0x5b, "Destination is not a JUMPDEST."); + } } fn run_jumpi(&mut self) { @@ -248,28 +259,29 @@ impl Interpreter { let b = self.pop(); if !b.is_zero() { self.offset = x; - assert_eq!( - self.code[self.offset], 0x5b, - "Destination is not a JUMPDEST." - ); + if let Some(&landing_opcode) = self.code.get(self.offset) { + assert_eq!(landing_opcode, 0x5b, "Destination is not a JUMPDEST."); + } } else { self.incr(1); } } fn run_push(&mut self, num_bytes: u8) { + self.incr(1); let x = U256::from_big_endian(self.slice(num_bytes as usize)); self.incr(num_bytes as usize); self.push(x); } fn run_dup(&mut self, n: u8) { - self.push(self.stack[n as usize - 1]); + self.push(self.stack[self.stack.len() - n as usize]); self.incr(1); } fn run_swap(&mut self, n: u8) { - self.stack.swap(0, n as usize); + let len = self.stack.len(); + self.stack.swap(len - 1, len - n as usize - 1); self.incr(1); } } @@ -282,6 +294,6 @@ mod tests { fn test_run() { // PUSH1 1 PUSH1 2 ADD let code = vec![0x60, 0x1, 0x60, 0x2, 0x1]; - assert_eq!(run(code, 0, vec![]), vec![0x3.into()]); + assert_eq!(run(&code, 0, vec![]), vec![0x3.into()]); } }