forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-15 20:46:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more cleanup

Browse source
This commit is contained in:
Jared Wasinger 2025-11-13 01:44:32 +08:00
parent 74ca164123
commit b3d8591cb0
2 changed files with 5 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/state/bal_reader.go
View file

@ -104,36 +104,6 @@ func (r *BALReader) initObjFromDiff(db *StateDB, addr common.Address, a *types.S
return obj return obj
} }
func (s *BALReader) initMutatedObjFromDiff(db *StateDB, addr common.Address, a *types.StateAccount, diff *bal.AccountMutations) *stateObject {
var acct *types.StateAccount
if a == nil {
acct = &types.StateAccount{
Nonce: 0,
Balance: uint256.NewInt(0),
Root: types.EmptyRootHash,
CodeHash: types.EmptyCodeHash[:],
}
} else {
acct = a.Copy()
}
obj := newObject(db, addr, acct)
if diff.Nonce != nil {
obj.SetNonce(*diff.Nonce)
}
if diff.Balance != nil {
obj.SetBalance(new(uint256.Int).Set(diff.Balance))
}
if diff.Code != nil {
obj.SetCode(crypto.Keccak256Hash(diff.Code), diff.Code)
}
if diff.StorageWrites != nil {
for key, val := range diff.StorageWrites {
obj.SetState(key, val)
}
}
return obj
}
// BALReader provides methods for reading account state from a block access // BALReader provides methods for reading account state from a block access
// list. State values returned from the Reader methods must not be modified. // list. State values returned from the Reader methods must not be modified.
type BALReader struct { type BALReader struct {

39
core/state/statedb.go
View file

@ -931,31 +931,16 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
} }
var updatedAddrs []common.Address var updatedAddrs []common.Address
if s.blockAccessList != nil { for addr, op := range s.mutations {
updatedAddrs = s.blockAccessList.ModifiedAccounts() if op.applied || op.isDelete() {
} else { continue
for addr, op := range s.mutations {
if op.applied || op.isDelete() {
continue
}
updatedAddrs = append(updatedAddrs, addr)
} }
updatedAddrs = append(updatedAddrs, addr)
} }
var m sync.Mutex
for _, addr := range updatedAddrs { for _, addr := range updatedAddrs {
workers.Go(func() error { workers.Go(func() error {
var obj *stateObject obj := s.stateObjects[addr] // closure for the task runner below
if s.blockAccessList != nil {
lastIdx := len(s.blockAccessList.block.Transactions()) + 1
diff := s.blockAccessList.readAccountDiff(addr, lastIdx)
acct := s.blockAccessList.prestateReader.account(addr)
m.Lock()
obj = s.blockAccessList.initMutatedObjFromDiff(s, addr, acct, diff)
m.Unlock()
} else {
obj = s.stateObjects[addr] // closure for the task runner below
}
if s.db.TrieDB().IsVerkle() { if s.db.TrieDB().IsVerkle() {
obj.updateTrie() obj.updateTrie()
} else { } else {
@ -1081,20 +1066,6 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
// Track the amount of time wasted on hashing the account trie // Track the amount of time wasted on hashing the account trie
defer func(start time.Time) { s.AccountHashes += time.Since(start) }(time.Now()) defer func(start time.Time) { s.AccountHashes += time.Since(start) }(time.Now())
hash := s.trie.Hash() hash := s.trie.Hash()
/*
it, err := s.trie.NodeIterator([]byte{})
if err != nil {
panic(err)
}
fmt.Println("state trie")
for it.Next(true) {
if it.Leaf() {
fmt.Printf("%x: %x\n", it.Path(), it.LeafBlob())
} else {
fmt.Printf("%x: %x\n", it.Path(), it.Hash())
}
}
*/
// If witness building is enabled, gather the account trie witness // If witness building is enabled, gather the account trie witness
if s.witness != nil { if s.witness != nil {
witness := s.trie.Witness() witness := s.trie.Witness()