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

Fix journal order in sys_selfdestruct (#1287)

Browse Source 
* Fix

* Minor
This commit is contained in:
wborgeaud 2023-10-11 16:24:00 +02:00 committed by GitHub
parent 49ca63ee0f
commit 9fd0425f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
evm/src/cpu/kernel/asm/core/terminate.asm
View File

@ -92,25 +92,20 @@ global sys_selfdestruct:
%mstore_trie_data
%stack (balance, address, recipient, kexit_info) ->
(address, recipient, balance, address, recipient, recipient, balance, kexit_info)
%journal_add_account_destroyed
(address, recipient, address, recipient, balance, kexit_info)
// If the recipient is the same as the address, then we're done.
// Otherwise, send the balance to the recipient.
// stack: address, recipient, recipient, balance, kexit_info
EQ %jumpi(sys_selfdestruct_same_addr)
// stack: recipient, balance, kexit_info
// stack: address, recipient, address, recipient, balance, kexit_info
EQ %jumpi(sys_selfdestruct_journal_add)
%stack (address, recipient, balance, kexit_info) -> (recipient, balance, address, recipient, balance, kexit_info)
%add_eth
// stack: kexit_info
%leftover_gas
// stack: leftover_gas
PUSH 1 // success
%jump(terminate_common)
sys_selfdestruct_journal_add:
// stack: address, recipient, balance, kexit_info
%journal_add_account_destroyed
sys_selfdestruct_same_addr:
// stack: recipient, balance, kexit_info
%pop2
// stack: kexit_info
%leftover_gas
// stack: leftover_gas
PUSH 1 // success