forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "core/state, light, trie: add UpdateContractCode to the Trie interface (#27476)"

Browse source 
This reverts commit 7e3ba8b727.
This commit is contained in:
devopsbo3 2023-11-10 12:27:53 -06:00 committed by GitHub
parent 40e7d96a2d
commit a12cc85feb
4 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/state/database.go
View file

@ -93,10 +93,6 @@ type Trie interface {
// in the trie with provided address. // in the trie with provided address.
UpdateAccount(address common.Address, account *types.StateAccount) error UpdateAccount(address common.Address, account *types.StateAccount) error
// UpdateContractCode abstracts code write to the trie. It is expected
// to be moved to the stateWriter interface when the latter is ready.
UpdateContractCode(address common.Address, codeHash common.Hash, code []byte) error
// DeleteStorage removes any existing value for key from the trie. If a node // DeleteStorage removes any existing value for key from the trie. If a node
// was not found in the database, a trie.MissingNodeError is returned. // was not found in the database, a trie.MissingNodeError is returned.
DeleteStorage(addr common.Address, key []byte) error DeleteStorage(addr common.Address, key []byte) error

1
core/state/statedb.go
View file

@ -1012,7 +1012,6 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
if obj := s.stateObjects[addr]; !obj.deleted { if obj := s.stateObjects[addr]; !obj.deleted {
// Write any contract code associated with the state object // Write any contract code associated with the state object
if obj.code != nil && obj.dirtyCode { if obj.code != nil && obj.dirtyCode {
s.trie.UpdateContractCode(obj.Address(), common.BytesToHash(obj.CodeHash()), obj.code)
rawdb.WriteCode(codeWriter, common.BytesToHash(obj.CodeHash()), obj.code) rawdb.WriteCode(codeWriter, common.BytesToHash(obj.CodeHash()), obj.code)
obj.dirtyCode = false obj.dirtyCode = false
} }

4
light/trie.go
View file

@ -147,10 +147,6 @@ func (t *odrTrie) UpdateAccount(address common.Address, acc *types.StateAccount)
}) })
} }
func (t *odrTrie) UpdateContractCode(_ common.Address, _ common.Hash, _ []byte) error {
return nil
}
func (t *odrTrie) UpdateStorage(_ common.Address, key, value []byte) error { func (t *odrTrie) UpdateStorage(_ common.Address, key, value []byte) error {
key = crypto.Keccak256(key) key = crypto.Keccak256(key)
v, _ := rlp.EncodeToBytes(value) v, _ := rlp.EncodeToBytes(value)

4
trie/secure_trie.go
View file

@ -176,10 +176,6 @@ func (t *StateTrie) UpdateAccount(address common.Address, acc *types.StateAccoun
return nil return nil
} }
func (t *StateTrie) UpdateContractCode(_ common.Address, _ common.Hash, _ []byte) error {
return nil
}
// MustDelete removes any existing value for key from the trie. This function // MustDelete removes any existing value for key from the trie. This function
// will omit any encountered error but just print out an error message. // will omit any encountered error but just print out an error message.
func (t *StateTrie) MustDelete(key []byte) { func (t *StateTrie) MustDelete(key []byte) {