Refactor access lists (#30)

* Refactor access lists * Apply suggestions from code review Co-authored-by: Robin Salen <[email protected]> * Update evm_arithmetization/src/cpu/kernel/asm/core/access_lists.asm Co-authored-by: Robin Salen <[email protected]> * Apply suggestions from code review Co-authored-by: Robin Salen <[email protected]> * Address reviews --------- Co-authored-by: Alonso González <[email protected]> Co-authored-by: Alonso González <[email protected]>
0xPolygonZero · Feb 22, 2024 · 735855e · 735855e
1 parent c68baf9
commit 735855e
Show file tree

Hide file tree

Showing 8 changed files with 714 additions and 258 deletions.
diff --git a/evm_arithmetization/src/cpu/kernel/asm/core/access_lists.asm b/evm_arithmetization/src/cpu/kernel/asm/core/access_lists.asm
diff --git a/evm_arithmetization/src/cpu/kernel/asm/journal/account_loaded.asm b/evm_arithmetization/src/cpu/kernel/asm/journal/account_loaded.asm
@@ -1,7 +1,9 @@
 // struct AccountLoaded { address }
 
 %macro journal_add_account_loaded
+    // stack: address
     %journal_add_1(@JOURNAL_ENTRY_ACCOUNT_LOADED)
+    // stack: (empty)
 %endmacro
 
 global revert_account_loaded:

diff --git a/evm_arithmetization/src/cpu/kernel/asm/journal/journal.asm b/evm_arithmetization/src/cpu/kernel/asm/journal/journal.asm
@@ -24,6 +24,7 @@
     // stack: journal_size
     %increment
     %mstore_global_metadata(@GLOBAL_METADATA_JOURNAL_LEN)
+    // stack: (empty)
 %endmacro
 
 %macro journal_data_size
@@ -65,6 +66,7 @@
     %append_journal_data
     // stack: ptr
     %append_journal
+    // stack: (empty)
 %endmacro
 
 %macro journal_add_2(type)
@@ -78,6 +80,7 @@
     SWAP1 %append_journal_data
     // stack: ptr
     %append_journal
+    // stack: (empty)
 %endmacro
 
 %macro journal_add_3(type)
@@ -93,6 +96,7 @@
     SWAP1 %append_journal_data
     // stack: ptr
     %append_journal
+    // stack: (empty)
 %endmacro
 
 %macro journal_add_4(type)
@@ -110,6 +114,7 @@
     SWAP1 %append_journal_data
     // stack: ptr
     %append_journal
+    // stack: (empty)
 %endmacro
 
 %macro journal_load_1

diff --git a/evm_arithmetization/src/cpu/kernel/asm/main.asm b/evm_arithmetization/src/cpu/kernel/asm/main.asm
@@ -12,6 +12,9 @@ global main:
     // Initialise the shift table
     %shift_table_init
 
+    // Initialize accessed addresses and storage keys lists
+    %init_access_lists
+
     // Initialize the RLP DATA pointer to its initial position (ctx == virt == 0, segment = RLP)
     PUSH @SEGMENT_RLP_RAW
     %mstore_global_metadata(@GLOBAL_METADATA_RLP_DATA_SIZE)

diff --git a/evm_arithmetization/src/cpu/kernel/asm/util/assertions.asm b/evm_arithmetization/src/cpu/kernel/asm/util/assertions.asm
@@ -34,10 +34,8 @@ global panic:
 %endmacro
 
 %macro assert_lt
-    // %assert_zero is cheaper than %assert_nonzero, so we will leverage the
-    // fact that (x < y) == !(x >= y).
-    GE
-    %assert_zero
+    LT
+    %assert_nonzero
 %endmacro
 
 %macro assert_lt(ret)

diff --git a/evm_arithmetization/src/cpu/kernel/tests/account_code.rs b/evm_arithmetization/src/cpu/kernel/tests/account_code.rs
@@ -198,6 +198,12 @@ fn test_extcodecopy() -> Result<()> {
         [Segment::ContextMetadata.unscale()]
     .set(GasLimit.unscale(), U256::from(1000000000000u64));
 
+    // Pre-initialize the accessed addresses list.
+    let init_accessed_addresses = KERNEL.global_labels["init_access_lists"];
+    interpreter.generation_state.registers.program_counter = init_accessed_addresses;
+    interpreter.push(0xdeadbeefu32.into());
+    interpreter.run()?;
+
     let extcodecopy = KERNEL.global_labels["sys_extcodecopy"];
 
     // Put random data in main memory and the `KernelAccountCode` segment for
@@ -327,6 +333,12 @@ fn sstore() -> Result<()> {
     let initial_stack = vec![];
     let mut interpreter: Interpreter<F> = Interpreter::new_with_kernel(0, initial_stack);
 
+    // Pre-initialize the accessed addresses list.
+    let init_accessed_addresses = KERNEL.global_labels["init_access_lists"];
+    interpreter.generation_state.registers.program_counter = init_accessed_addresses;
+    interpreter.push(0xdeadbeefu32.into());
+    interpreter.run()?;
+
     // Prepare the interpreter by inserting the account in the state trie.
     prepare_interpreter_all_accounts(&mut interpreter, trie_inputs, addr, &code)?;
 
@@ -417,6 +429,12 @@ fn sload() -> Result<()> {
     let initial_stack = vec![];
     let mut interpreter: Interpreter<F> = Interpreter::new_with_kernel(0, initial_stack);
 
+    // Pre-initialize the accessed addresses list.
+    let init_accessed_addresses = KERNEL.global_labels["init_access_lists"];
+    interpreter.generation_state.registers.program_counter = init_accessed_addresses;
+    interpreter.push(0xdeadbeefu32.into());
+    interpreter.run()?;
+
     // Prepare the interpreter by inserting the account in the state trie.
     prepare_interpreter_all_accounts(&mut interpreter, trie_inputs, addr, &code)?;
     interpreter.run()?;