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

Update states.go

Browse source
This commit is contained in:
Felix Lange 2025-06-26 17:07:35 +02:00 committed by GitHub
parent 2ac16fcb9e
commit ed5eb7f637
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
triedb/pathdb/states.go
View file

@ -387,13 +387,8 @@ func (s *stateSet) decode(r *rlp.Stream) error {
if err := r.Decode(&dec); err != nil { if err := r.Decode(&dec); err != nil {
return fmt.Errorf("load diff accounts: %v", err) return fmt.Errorf("load diff accounts: %v", err)
} }
for i := 0; i < len(dec.AddrHashes); i++ { for i := range dec.AddrHashes {
if len(dec.Accounts[i]) > 0 { accountSet[dec.AddrHashes[i]] = empty2nil(dec.Accounts[i])
accountSet[dec.AddrHashes[i]] = dec.Accounts[i]
} else {
// RLP loses nil-ness, but `[]byte{}` is not a valid item, so reinterpret that
accountSet[dec.AddrHashes[i]] = nil
}
} }
s.accountData = accountSet s.accountData = accountSet
@ -412,13 +407,8 @@ func (s *stateSet) decode(r *rlp.Stream) error {
} }
for _, entry := range storages { for _, entry := range storages {
storageSet[entry.AddrHash] = make(map[common.Hash][]byte, len(entry.Keys)) storageSet[entry.AddrHash] = make(map[common.Hash][]byte, len(entry.Keys))
for i := 0; i < len(entry.Keys); i++ { for i := range entry.Keys {
if len(entry.Vals[i]) > 0 { storageSet[entry.AddrHash][entry.Keys[i]] = empty2nil(entry.Vals[i])
storageSet[entry.AddrHash][entry.Keys[i]] = entry.Vals[i]
} else {
// RLP loses nil-ness, but `[]byte{}` is not a valid item, so reinterpret that
storageSet[entry.AddrHash][entry.Keys[i]] = nil
}
} }
} }
s.storageData = storageSet s.storageData = storageSet
@ -560,13 +550,8 @@ func (s *StateSetWithOrigin) decode(r *rlp.Stream) error {
if err := r.Decode(&accounts); err != nil { if err := r.Decode(&accounts); err != nil {
return fmt.Errorf("load diff account origin set: %v", err) return fmt.Errorf("load diff account origin set: %v", err)
} }
for i := 0; i < len(accounts.Accounts); i++ { for i := range accounts.Accounts {
if len(accounts.Accounts[i]) > 0 { accountSet[accounts.Addresses[i]] = empty2nil(accounts.Accounts[i])
accountSet[accounts.Addresses[i]] = accounts.Accounts[i]
} else {
// RLP loses nil-ness, but `[]byte{}` is not a valid item, so reinterpret that
accountSet[accounts.Addresses[i]] = nil
}
} }
s.accountOrigin = accountSet s.accountOrigin = accountSet
@ -585,15 +570,17 @@ func (s *StateSetWithOrigin) decode(r *rlp.Stream) error {
} }
for _, storage := range storages { for _, storage := range storages {
storageSet[storage.Address] = make(map[common.Hash][]byte) storageSet[storage.Address] = make(map[common.Hash][]byte)
for i := 0; i < len(storage.Keys); i++ { for i := range storage.Keys {
if len(storage.Vals[i]) > 0 { storageSet[storage.Address][storage.Keys[i]] = empty2nil(storage.Vals[i])
storageSet[storage.Address][storage.Keys[i]] = storage.Vals[i]
} else {
// RLP loses nil-ness, but `[]byte{}` is not a valid item, so reinterpret that
storageSet[storage.Address][storage.Keys[i]] = nil
}
} }
} }
s.storageOrigin = storageSet s.storageOrigin = storageSet
return nil return nil
} }
func empty2nil(b []byte) []byte {
if len(b) == 0 {
return nil
}
return b
}