logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-03 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix run_syscall in interpreter. (#1351)

Browse Source 
* Fix syscall and change sload test to catch the error

* Update comment

* Cleanup
This commit is contained in:
Linda Guiga 2023-11-27 12:34:41 -05:00 committed by GitHub
parent 2039e18f29
commit ab70bc536d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evm/src/cpu/kernel/interpreter.rs
View File

@ -1047,7 +1047,7 @@ impl<'a> Interpreter<'a> {
let new_program_counter =
u256_to_usize(handler_addr).map_err(|_| anyhow!("The program counter is too large"))?;
let syscall_info = U256::from(self.generation_state.registers.program_counter + 1)
let syscall_info = U256::from(self.generation_state.registers.program_counter)
+ U256::from((self.generation_state.registers.is_kernel as usize) << 32)
+ (U256::from(self.generation_state.registers.gas_used) << 192);
self.generation_state.registers.program_counter = new_program_counter;
@ -1057,7 +1057,6 @@ impl<'a> Interpreter<'a> {
self.generation_state.registers.gas_used = 0;
self.push(syscall_info);
self.run().map_err(|_| anyhow!("Syscall failed"))?;
Ok(())
}

16
evm/src/cpu/kernel/tests/account_code.rs
View File

@ -322,8 +322,10 @@ fn sload() -> Result<()> {
let addr_nibbles = Nibbles::from_bytes_be(addr_hashed.as_bytes()).unwrap();
// This code is similar to the one in add11_yml's contract, but we pop the added value
// and carry out an SLOAD instead of an SSTORE.
let code = [0x60, 0x01, 0x60, 0x01, 0x01, 0x50, 0x60, 0x00, 0x54, 0x00];
// and carry out an SLOAD instead of an SSTORE. We also add a PUSH at the end.
let code = [
0x60, 0x01, 0x60, 0x01, 0x01, 0x50, 0x60, 0x00, 0x54, 0x60, 0x03, 0x00,
];
let code_hash = keccak(code);
let account_before = AccountRlp {
@ -350,9 +352,13 @@ fn sload() -> Result<()> {
prepare_interpreter_all_accounts(&mut interpreter, trie_inputs, addr, &code)?;
interpreter.run()?;
// We check that no value was found.
let value = interpreter.pop();
assert_eq!(value, 0.into());
// The SLOAD in the provided code should return 0, since
// the storage trie is empty. The last step in the code
// pushes the value 3.
assert_eq!(interpreter.stack(), vec![0x0.into(), 0x3.into()]);
interpreter.pop();
interpreter.pop();
// Now, execute mpt_hash_state_trie. We check that the state trie has not changed.
let mpt_hash_state_trie = KERNEL.global_labels["mpt_hash_state_trie"];
interpreter.generation_state.registers.program_counter = mpt_hash_state_trie;