4f4f9d88d3
Currently our state journal tracks each storage update to a contract, having the ability to revert those changes to the previously set value. For the very first modification however, it behaves a bit wonky. Reverting the update doesn't actually remove the dirty-ness of the slot, rather leaves it as "change this slot to it's original value". This can cause issues down the line with for example write witnesses needing to gather an unneeded proof. This PR modifies the storageChange journal entry to not only track the previous value of a slot, but also whether there was any previous value at all set in the current execution context. In essence, the PR changes the semantic of storageChange so it does not simply track storage changes, rather it tracks dirty storage changes, an important distinction for being able to cleanly revert the journal item.
397 lines
9.3 KiB
Go
397 lines
9.3 KiB
Go
// Copyright 2016 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package state
|
|
|
|
import (
|
|
"maps"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/holiman/uint256"
|
|
)
|
|
|
|
// journalEntry is a modification entry in the state change journal that can be
|
|
// reverted on demand.
|
|
type journalEntry interface {
|
|
// revert undoes the changes introduced by this journal entry.
|
|
revert(*StateDB)
|
|
|
|
// dirtied returns the Ethereum address modified by this journal entry.
|
|
dirtied() *common.Address
|
|
|
|
// copy returns a deep-copied journal entry.
|
|
copy() journalEntry
|
|
}
|
|
|
|
// journal contains the list of state modifications applied since the last state
|
|
// commit. These are tracked to be able to be reverted in the case of an execution
|
|
// exception or request for reversal.
|
|
type journal struct {
|
|
entries []journalEntry // Current changes tracked by the journal
|
|
dirties map[common.Address]int // Dirty accounts and the number of changes
|
|
}
|
|
|
|
// newJournal creates a new initialized journal.
|
|
func newJournal() *journal {
|
|
return &journal{
|
|
dirties: make(map[common.Address]int),
|
|
}
|
|
}
|
|
|
|
// append inserts a new modification entry to the end of the change journal.
|
|
func (j *journal) append(entry journalEntry) {
|
|
j.entries = append(j.entries, entry)
|
|
if addr := entry.dirtied(); addr != nil {
|
|
j.dirties[*addr]++
|
|
}
|
|
}
|
|
|
|
// revert undoes a batch of journalled modifications along with any reverted
|
|
// dirty handling too.
|
|
func (j *journal) revert(statedb *StateDB, snapshot int) {
|
|
for i := len(j.entries) - 1; i >= snapshot; i-- {
|
|
// Undo the changes made by the operation
|
|
j.entries[i].revert(statedb)
|
|
|
|
// Drop any dirty tracking induced by the change
|
|
if addr := j.entries[i].dirtied(); addr != nil {
|
|
if j.dirties[*addr]--; j.dirties[*addr] == 0 {
|
|
delete(j.dirties, *addr)
|
|
}
|
|
}
|
|
}
|
|
j.entries = j.entries[:snapshot]
|
|
}
|
|
|
|
// dirty explicitly sets an address to dirty, even if the change entries would
|
|
// otherwise suggest it as clean. This method is an ugly hack to handle the RIPEMD
|
|
// precompile consensus exception.
|
|
func (j *journal) dirty(addr common.Address) {
|
|
j.dirties[addr]++
|
|
}
|
|
|
|
// length returns the current number of entries in the journal.
|
|
func (j *journal) length() int {
|
|
return len(j.entries)
|
|
}
|
|
|
|
// copy returns a deep-copied journal.
|
|
func (j *journal) copy() *journal {
|
|
entries := make([]journalEntry, 0, j.length())
|
|
for i := 0; i < j.length(); i++ {
|
|
entries = append(entries, j.entries[i].copy())
|
|
}
|
|
return &journal{
|
|
entries: entries,
|
|
dirties: maps.Clone(j.dirties),
|
|
}
|
|
}
|
|
|
|
type (
|
|
// Changes to the account trie.
|
|
createObjectChange struct {
|
|
account *common.Address
|
|
}
|
|
|
|
// createContractChange represents an account becoming a contract-account.
|
|
// This event happens prior to executing initcode. The journal-event simply
|
|
// manages the created-flag, in order to allow same-tx destruction.
|
|
createContractChange struct {
|
|
account common.Address
|
|
}
|
|
|
|
selfDestructChange struct {
|
|
account *common.Address
|
|
prev bool // whether account had already self-destructed
|
|
prevbalance *uint256.Int
|
|
}
|
|
|
|
// Changes to individual accounts.
|
|
balanceChange struct {
|
|
account *common.Address
|
|
prev *uint256.Int
|
|
}
|
|
nonceChange struct {
|
|
account *common.Address
|
|
prev uint64
|
|
}
|
|
storageChange struct {
|
|
account *common.Address
|
|
key common.Hash
|
|
prevvalue *common.Hash
|
|
}
|
|
codeChange struct {
|
|
account *common.Address
|
|
prevcode, prevhash []byte
|
|
}
|
|
|
|
// Changes to other state values.
|
|
refundChange struct {
|
|
prev uint64
|
|
}
|
|
addLogChange struct {
|
|
txhash common.Hash
|
|
}
|
|
addPreimageChange struct {
|
|
hash common.Hash
|
|
}
|
|
touchChange struct {
|
|
account *common.Address
|
|
}
|
|
|
|
// Changes to the access list
|
|
accessListAddAccountChange struct {
|
|
address *common.Address
|
|
}
|
|
accessListAddSlotChange struct {
|
|
address *common.Address
|
|
slot *common.Hash
|
|
}
|
|
|
|
// Changes to transient storage
|
|
transientStorageChange struct {
|
|
account *common.Address
|
|
key, prevalue common.Hash
|
|
}
|
|
)
|
|
|
|
func (ch createObjectChange) revert(s *StateDB) {
|
|
delete(s.stateObjects, *ch.account)
|
|
}
|
|
|
|
func (ch createObjectChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch createObjectChange) copy() journalEntry {
|
|
return createObjectChange{
|
|
account: ch.account,
|
|
}
|
|
}
|
|
|
|
func (ch createContractChange) revert(s *StateDB) {
|
|
s.getStateObject(ch.account).newContract = false
|
|
}
|
|
|
|
func (ch createContractChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch createContractChange) copy() journalEntry {
|
|
return createContractChange{
|
|
account: ch.account,
|
|
}
|
|
}
|
|
|
|
func (ch selfDestructChange) revert(s *StateDB) {
|
|
obj := s.getStateObject(*ch.account)
|
|
if obj != nil {
|
|
obj.selfDestructed = ch.prev
|
|
obj.setBalance(ch.prevbalance)
|
|
}
|
|
}
|
|
|
|
func (ch selfDestructChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch selfDestructChange) copy() journalEntry {
|
|
return selfDestructChange{
|
|
account: ch.account,
|
|
prev: ch.prev,
|
|
prevbalance: new(uint256.Int).Set(ch.prevbalance),
|
|
}
|
|
}
|
|
|
|
var ripemd = common.HexToAddress("0000000000000000000000000000000000000003")
|
|
|
|
func (ch touchChange) revert(s *StateDB) {
|
|
}
|
|
|
|
func (ch touchChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch touchChange) copy() journalEntry {
|
|
return touchChange{
|
|
account: ch.account,
|
|
}
|
|
}
|
|
|
|
func (ch balanceChange) revert(s *StateDB) {
|
|
s.getStateObject(*ch.account).setBalance(ch.prev)
|
|
}
|
|
|
|
func (ch balanceChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch balanceChange) copy() journalEntry {
|
|
return balanceChange{
|
|
account: ch.account,
|
|
prev: new(uint256.Int).Set(ch.prev),
|
|
}
|
|
}
|
|
|
|
func (ch nonceChange) revert(s *StateDB) {
|
|
s.getStateObject(*ch.account).setNonce(ch.prev)
|
|
}
|
|
|
|
func (ch nonceChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch nonceChange) copy() journalEntry {
|
|
return nonceChange{
|
|
account: ch.account,
|
|
prev: ch.prev,
|
|
}
|
|
}
|
|
|
|
func (ch codeChange) revert(s *StateDB) {
|
|
s.getStateObject(*ch.account).setCode(common.BytesToHash(ch.prevhash), ch.prevcode)
|
|
}
|
|
|
|
func (ch codeChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch codeChange) copy() journalEntry {
|
|
return codeChange{
|
|
account: ch.account,
|
|
prevhash: common.CopyBytes(ch.prevhash),
|
|
prevcode: common.CopyBytes(ch.prevcode),
|
|
}
|
|
}
|
|
|
|
func (ch storageChange) revert(s *StateDB) {
|
|
s.getStateObject(*ch.account).setState(ch.key, ch.prevvalue)
|
|
}
|
|
|
|
func (ch storageChange) dirtied() *common.Address {
|
|
return ch.account
|
|
}
|
|
|
|
func (ch storageChange) copy() journalEntry {
|
|
return storageChange{
|
|
account: ch.account,
|
|
key: ch.key,
|
|
prevvalue: ch.prevvalue,
|
|
}
|
|
}
|
|
|
|
func (ch transientStorageChange) revert(s *StateDB) {
|
|
s.setTransientState(*ch.account, ch.key, ch.prevalue)
|
|
}
|
|
|
|
func (ch transientStorageChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch transientStorageChange) copy() journalEntry {
|
|
return transientStorageChange{
|
|
account: ch.account,
|
|
key: ch.key,
|
|
prevalue: ch.prevalue,
|
|
}
|
|
}
|
|
|
|
func (ch refundChange) revert(s *StateDB) {
|
|
s.refund = ch.prev
|
|
}
|
|
|
|
func (ch refundChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch refundChange) copy() journalEntry {
|
|
return refundChange{
|
|
prev: ch.prev,
|
|
}
|
|
}
|
|
|
|
func (ch addLogChange) revert(s *StateDB) {
|
|
logs := s.logs[ch.txhash]
|
|
if len(logs) == 1 {
|
|
delete(s.logs, ch.txhash)
|
|
} else {
|
|
s.logs[ch.txhash] = logs[:len(logs)-1]
|
|
}
|
|
s.logSize--
|
|
}
|
|
|
|
func (ch addLogChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch addLogChange) copy() journalEntry {
|
|
return addLogChange{
|
|
txhash: ch.txhash,
|
|
}
|
|
}
|
|
|
|
func (ch addPreimageChange) revert(s *StateDB) {
|
|
delete(s.preimages, ch.hash)
|
|
}
|
|
|
|
func (ch addPreimageChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch addPreimageChange) copy() journalEntry {
|
|
return addPreimageChange{
|
|
hash: ch.hash,
|
|
}
|
|
}
|
|
|
|
func (ch accessListAddAccountChange) revert(s *StateDB) {
|
|
/*
|
|
One important invariant here, is that whenever a (addr, slot) is added, if the
|
|
addr is not already present, the add causes two journal entries:
|
|
- one for the address,
|
|
- one for the (address,slot)
|
|
Therefore, when unrolling the change, we can always blindly delete the
|
|
(addr) at this point, since no storage adds can remain when come upon
|
|
a single (addr) change.
|
|
*/
|
|
s.accessList.DeleteAddress(*ch.address)
|
|
}
|
|
|
|
func (ch accessListAddAccountChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch accessListAddAccountChange) copy() journalEntry {
|
|
return accessListAddAccountChange{
|
|
address: ch.address,
|
|
}
|
|
}
|
|
|
|
func (ch accessListAddSlotChange) revert(s *StateDB) {
|
|
s.accessList.DeleteSlot(*ch.address, *ch.slot)
|
|
}
|
|
|
|
func (ch accessListAddSlotChange) dirtied() *common.Address {
|
|
return nil
|
|
}
|
|
|
|
func (ch accessListAddSlotChange) copy() journalEntry {
|
|
return accessListAddSlotChange{
|
|
address: ch.address,
|
|
slot: ch.slot,
|
|
}
|
|
}
|