fix verkle

Author: jwasinger

core/state/statedb.go

@@ -567,7 +567,18 @@ func (s *StateDB) GetTransientState(addr common.Address, key common.Hash) common
 //
 
 // updateStateObject writes the given object to the trie.
-func (s *StateDB) updateStateObject(addr common.Address, resolver func() *types.StateAccount) {
+func (s *StateDB) updateStateObject(obj *stateObject) {
+	// Encode the account and update the account trie
+	if err := s.trie.UpdateAccount(obj.Address(), &obj.data, len(obj.code)); err != nil {
+		s.setError(fmt.Errorf("updateStateObject (%x) error: %v", obj.Address(), err))
+	}
+	if obj.dirtyCode {
+		s.trie.UpdateContractCode(obj.Address(), common.BytesToHash(obj.CodeHash()), obj.code)
+	}
+}
+
+// updateStateObject writes the given object to the trie.
+func (s *StateDB) updateStateObjectAsync(addr common.Address, resolver func() *types.StateAccount) {
 	if err := s.trie.UpdateAccountAsync(addr, resolver); err != nil {
 		s.setError(fmt.Errorf("updateStateObject (%x) error: %v", addr, err))
 	}
@@ -942,7 +953,11 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 		if op.isDelete() {
 			deletedAddrs = append(deletedAddrs, addr)
 		} else {
-			s.updateStateObject(addr, stateObjectsResolve[addr])
+			if s.db.TrieDB().IsVerkle() {
+				s.updateStateObject(s.stateObjects[addr])
+			} else {
+				s.updateStateObjectAsync(addr, stateObjectsResolve[addr])
+			}
 			s.AccountUpdated += 1
 		}
 		usedAddrs = append(usedAddrs, addr) // Copy needed for closure