Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[R4R] fix pipecommit issue #932

Merged
merged 2 commits into from
Jun 13, 2022
Merged

[R4R] fix pipecommit issue #932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bf1d61
fix pipecommit issue
forcodedancing May 29, 2022
34ac190
Merge branch 'develop' into pipecommit_fix
forcodedancing Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,9 +901,9 @@ func (s *StateDB) GetRefund() uint64 {
return s.refund
}

// GetRefund returns the current value of the refund counter.
// WaitPipeVerification waits until the snapshot been verified
func (s *StateDB) WaitPipeVerification() error {
// We need wait for the parent trie to commit
// Need to wait for the parent trie to commit
if s.snap != nil {
if valid := s.snap.WaitAndGetVerifyRes(); !valid {
return fmt.Errorf("verification on parent snap failed")
Expand Down Expand Up @@ -990,7 +990,7 @@ func (s *StateDB) CorrectAccountsRoot(blockRoot common.Hash) {
if accounts, err := snapshot.Accounts(); err == nil && accounts != nil {
for _, obj := range s.stateObjects {
if !obj.deleted && !obj.rootCorrected && obj.data.Root == dummyRoot {
if account, exist := accounts[crypto.Keccak256Hash(obj.address[:])]; exist && len(account.Root) != 0 {
if account, exist := accounts[crypto.Keccak256Hash(obj.address[:])]; exist {
forcodedancing marked this conversation as resolved.
Show resolved Hide resolved
obj.data.Root = common.BytesToHash(account.Root)
obj.rootCorrected = true
}
Expand All @@ -1003,7 +1003,7 @@ func (s *StateDB) CorrectAccountsRoot(blockRoot common.Hash) {
func (s *StateDB) PopulateSnapAccountAndStorage() {
for addr := range s.stateObjectsPending {
if obj := s.stateObjects[addr]; !obj.deleted {
if s.snap != nil && !obj.deleted {
if s.snap != nil {
root := obj.data.Root
storageChanged := s.populateSnapStorage(obj)
if storageChanged {
Expand Down Expand Up @@ -1078,7 +1078,7 @@ func (s *StateDB) AccountsIntermediateRoot() {
// update mechanism is not symmetric to the deletion, because whereas it is
// enough to track account updates at commit time, deletions need tracking
// at transaction boundary level to ensure we capture state clearing.
if s.snap != nil && !obj.deleted {
if s.snap != nil {
s.snapAccountMux.Lock()
// It is possible to add unnecessary change, but it is fine.
s.snapAccounts[obj.address] = snapshot.SlimAccountRLP(obj.data.Nonce, obj.data.Balance, obj.data.Root, obj.data.CodeHash)
Expand Down