From 3c4bc1d8246107060b0008255f31a4aa2ff286b1 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 20 Mar 2023 18:02:20 -0700 Subject: [PATCH] Fix GAS and implement storage value parsing --- evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm | 5 ++++- evm/src/witness/transition.rs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm b/evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm index b93b36e4..80c6dbbe 100644 --- a/evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm +++ b/evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm @@ -37,4 +37,7 @@ global mpt_load_receipt_trie_value: global mpt_load_storage_trie_value: // stack: retdest - PANIC // TODO + PROVER_INPUT(mpt) + %append_to_trie_data + // stack: retdest + JUMP diff --git a/evm/src/witness/transition.rs b/evm/src/witness/transition.rs index d48561db..be6aba94 100644 --- a/evm/src/witness/transition.rs +++ b/evm/src/witness/transition.rs @@ -108,6 +108,7 @@ fn decode(registers: RegistersState, opcode: u8) -> Result Ok(Operation::Jumpi), (0x58, _) => Ok(Operation::Pc), (0x59, _) => Ok(Operation::Syscall(opcode)), + (0x5a, _) => Ok(Operation::Syscall(opcode)), (0x5b, _) => Ok(Operation::Jumpdest), (0x60..=0x7f, _) => Ok(Operation::Push(opcode & 0x1f)), (0x80..=0x8f, _) => Ok(Operation::Dup(opcode & 0xf)),