forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/state: do not journal preimages

Browse source 
We do not strictly need to journal preimages: preimages are stored and
served for the benefit of remote RPC users, e.g. for debugging solidity
storage. There is no 'consensus requirement' for these keys to be
reverted in case of reverted scopes.
This commit is contained in:
Martin Holst Swende 2024-01-29 12:55:25 +01:00
parent dad62bc5ab
commit 66fc14ad58
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/state/journal.go
View file

@ -160,10 +160,6 @@ func (j *journal) JournalLog(txHash common.Hash) {
j.append(addLogChange{txhash: txHash}) j.append(addLogChange{txhash: txHash})
} }
func (j *journal) JournalAddPreimage(hash common.Hash) {
j.append(addPreimageChange{hash: hash})
}
func (j *journal) JournalCreate(addr common.Address) { func (j *journal) JournalCreate(addr common.Address) {
j.append(createObjectChange{account: &addr}) j.append(createObjectChange{account: &addr})
} }
@ -265,9 +261,6 @@ type (
addLogChange struct { addLogChange struct {
txhash common.Hash txhash common.Hash
} }
addPreimageChange struct {
hash common.Hash
}
touchChange struct { touchChange struct {
account *common.Address account *common.Address
} }
@ -456,20 +449,6 @@ func (ch addLogChange) copy() journalEntry {
} }
} }
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) { func (ch accessListAddAccountChange) revert(s *StateDB) {
/* /*
One important invariant here, is that whenever a (addr, slot) is added, if the One important invariant here, is that whenever a (addr, slot) is added, if the

1
core/state/statedb.go
View file

@ -282,7 +282,6 @@ func (s *StateDB) Logs() []*types.Log {
// AddPreimage records a SHA3 preimage seen by the VM. // AddPreimage records a SHA3 preimage seen by the VM.
func (s *StateDB) AddPreimage(hash common.Hash, preimage []byte) { func (s *StateDB) AddPreimage(hash common.Hash, preimage []byte) {
if _, ok := s.preimages[hash]; !ok { if _, ok := s.preimages[hash]; !ok {
s.journal.JournalAddPreimage(hash)
s.preimages[hash] = slices.Clone(preimage) s.preimages[hash] = slices.Clone(preimage)
} }
} }