Preserve VDB code

Author: Jeannette

core/genesis.go

@@ -97,7 +97,8 @@ func (ga *GenesisAlloc) deriveHash() (common.Hash, error) {
 			statedb.SetState(addr, key, value)
 		}
 	}
-	return statedb.Commit(false)
+	root, _, err := statedb.Commit(false)
+	return root, err
 }
 
 // flush is very similar with deriveHash, but the main difference is

core/state/statedb.go

@@ -945,7 +945,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, StateChanges, er
 			// Merge the dirty nodes of storage trie into global set
 			if set != nil {
 				if err := nodes.Merge(set); err != nil {
-					return common.Hash{}, err
+					return common.Hash{}, StateChanges{}, err
 				}
 				storageTrieNodes += set.Len()
 			}
@@ -974,7 +974,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, StateChanges, er
 	// Merge the dirty nodes of account trie into global set
 	if set != nil {
 		if err := nodes.Merge(set); err != nil {
-			return common.Hash{}, err
+			return common.Hash{}, StateChanges{}, err
 		}
 		accountTrieNodes = set.Len()
 	}
@@ -1012,7 +1012,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, StateChanges, er
 	}
 
 	if err := s.db.TrieDB().Update(nodes); err != nil {
-		return common.Hash{}, err
+		return common.Hash{}, StateChanges{}, err
 	}
 	s.originalRoot = root
 	return root, stateChanges, err

core/state/statedb_test.go

@@ -1043,7 +1043,7 @@ func TestFlushOrderDataLoss(t *testing.T) {
 			state.SetState(common.Address{a}, common.Hash{a, s}, common.Hash{a, s})
 		}
 	}
-	root, err := state.Commit(false)
+	root, _, err := state.Commit(false)
 	if err != nil {
 		t.Fatalf("failed to commit state trie: %v", err)
 	}

eth/filters/filter_system_test.go

@@ -741,8 +741,8 @@ func TestStateChangeSubscription(t *testing.T) {
 
 	var (
 		db             = rawdb.NewMemoryDatabase()
-		backend        = &testBackend{db: db}
-		api            = NewFilterAPI(backend, false, deadline)
+		backend, sys   = newTestFilterSystem(t, db, Config{})
+		api            = NewFilterAPI(sys, false)
 		genesis        = (&core.Genesis{BaseFee: big.NewInt(params.InitialBaseFee)}).MustCommit(db)
 		numberOfBlocks = 3
 		chain, _       = core.GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), db, numberOfBlocks, func(i int, gen *core.BlockGen) {})

internal/ethapi/transaction_args_test.go

@@ -338,5 +338,8 @@ func (b *backendMock) SubscribePendingLogsEvent(ch chan<- []*types.Log) event.Su
 func (b *backendMock) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription {
 	return nil
 }
+func (b *backendMock) SubscribeStateChangeEvent(ch chan<- core.StateChangeEvent) event.Subscription {
+	return nil
+}
 
 func (b *backendMock) Engine() consensus.Engine { return nil }