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

Merge pull request #1466 from maticnetwork/lmartins/bug-concurrent-map-writes-triereader

Browse source 
Bug fix: concurrent map writes
This commit is contained in:
Lucca Martins 2025-02-28 03:02:13 -03:00 committed by GitHub
commit 08f81df254
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/state/reader.go
View file

@ -19,6 +19,7 @@ package state
import ( import (
"errors" "errors"
"maps" "maps"
"sync"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state/snapshot" "github.com/ethereum/go-ethereum/core/state/snapshot"
@ -139,12 +140,14 @@ func (r *stateReader) Copy() Reader {
// trieReader implements the Reader interface, providing functions to access // trieReader implements the Reader interface, providing functions to access
// state from the referenced trie. // state from the referenced trie.
type trieReader struct { type trieReader struct {
root common.Hash // State root which uniquely represent a state root common.Hash // State root which uniquely represent a state
db *triedb.Database // Database for loading trie db *triedb.Database // Database for loading trie
buff crypto.KeccakState // Buffer for keccak256 hashing buff crypto.KeccakState // Buffer for keccak256 hashing
mainTrie Trie // Main trie, resolved in constructor mainTrie Trie // Main trie, resolved in constructor
subRoots map[common.Address]common.Hash // Set of storage roots, cached when the account is resolved subRoots map[common.Address]common.Hash // Set of storage roots, cached when the account is resolved
subTries map[common.Address]Trie // Group of storage tries, cached when it's resolved subTries map[common.Address]Trie // Group of storage tries, cached when it's resolved
muSubRoot sync.Mutex
muSubTries sync.Mutex
} }
// trieReader constructs a trie reader of the specific state. An error will be // trieReader constructs a trie reader of the specific state. An error will be
@ -181,11 +184,14 @@ func (r *trieReader) Account(addr common.Address) (*types.StateAccount, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
r.muSubRoot.Lock()
if account == nil { if account == nil {
r.subRoots[addr] = types.EmptyRootHash r.subRoots[addr] = types.EmptyRootHash
} else { } else {
r.subRoots[addr] = account.Root r.subRoots[addr] = account.Root
} }
r.muSubRoot.Unlock()
return account, nil return account, nil
} }
@ -221,7 +227,9 @@ func (r *trieReader) Storage(addr common.Address, key common.Hash) (common.Hash,
if err != nil { if err != nil {
return common.Hash{}, err return common.Hash{}, err
} }
r.muSubTries.Lock()
r.subTries[addr] = tr r.subTries[addr] = tr
r.muSubTries.Unlock()
} }
} }
ret, err := tr.GetStorage(addr, key.Bytes()) ret, err := tr.GetStorage(addr, key.Bytes())