tmp

core/state/statedb.go

@@ -1025,31 +1025,30 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 		usedAddrs    [][]byte
 		deletedAddrs []common.Address
 	)
-	if !s.noTrie {
-		for addr, op := range s.mutations {
-			if op.applied {
-				continue
-			}
-			op.applied = true
-
-			if op.isDelete() {
-				deletedAddrs = append(deletedAddrs, addr)
-			} else {
-				s.updateStateObject(s.stateObjects[addr])
-				s.AccountUpdated += 1
-			}
-			usedAddrs = append(usedAddrs, common.CopyBytes(addr[:])) // Copy needed for closure
-		}
-		for _, deletedAddr := range deletedAddrs {
-			s.deleteStateObject(deletedAddr)
-			s.AccountDeleted += 1
+	for addr, op := range s.mutations {
+		if op.applied {
+			continue
 		}
-		s.AccountUpdates += time.Since(start)
+		op.applied = true
 
-		if s.prefetcher != nil {
-			s.prefetcher.used(common.Hash{}, s.originalRoot, usedAddrs)
+		if op.isDelete() {
+			deletedAddrs = append(deletedAddrs, addr)
+		} else {
+			s.updateStateObject(s.stateObjects[addr])
+			s.AccountUpdated += 1
 		}
+		usedAddrs = append(usedAddrs, common.CopyBytes(addr[:])) // Copy needed for closure
+	}
+	for _, deletedAddr := range deletedAddrs {
+		s.deleteStateObject(deletedAddr)
+		s.AccountDeleted += 1
 	}
+	s.AccountUpdates += time.Since(start)
+
+	if s.prefetcher != nil && len(usedAddrs) > 0 {
+		s.prefetcher.used(common.Hash{}, s.originalRoot, usedAddrs)
+	}
+
 	// Track the amount of time wasted on hashing the account trie
 	defer func(start time.Time) { s.AccountHashes += time.Since(start) }(time.Now())