core/blockchain.go

@@ -44,7 +44,6 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
 	"github.com/hashicorp/golang-lru"
-	"github.com/ethereum/go-ethereum/statediff"
 )
 
 var (
@@ -73,7 +72,6 @@ type CacheConfig struct {
 	TrieCleanLimit int           // Memory allowance (MB) to use for caching trie nodes in memory
 	TrieDirtyLimit int           // Memory limit (MB) at which to start flushing dirty trie nodes to disk
 	TrieTimeLimit  time.Duration // Time limit after which to flush the current in-memory trie to disk
-	StateDiff      statediff.Config // Settings for state diff extraction
 }
 
 // BlockChain represents the canonical chain given a database with a genesis
@@ -135,8 +133,6 @@ type BlockChain struct {
 
 	badBlocks      *lru.Cache              // Bad block cache
 	shouldPreserve func(*types.Block) bool // Function used to determine whether should preserve the given block.
-
-	diffExtractor statediff.Extractor // State diff processing interface
 }
 
 // NewBlockChain returns a fully initialised block chain using information
@@ -178,12 +174,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
 	bc.SetProcessor(NewStateProcessor(chainConfig, bc, engine))
 
 	var err error
-	if cacheConfig.StateDiff.On {
-		bc.diffExtractor, err = statediff.NewExtractor(db, cacheConfig.StateDiff)
-		if err != nil {
-			return nil, err
-		}
-	}
 
 	bc.hc, err = NewHeaderChain(db, chainConfig, engine, bc.getProcInterrupt)
 	if err != nil {
@@ -1216,15 +1206,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
 		}
 		proctime := time.Since(bstart)
 
-		// If extracting statediffs, do so now
-		if bc.cacheConfig.StateDiff.On {
-			// Currently not doing anything with returned cid...
-			_, err = bc.diffExtractor.ExtractStateDiff(*parent, *block)
-			if err != nil {
-				return i, events, coalescedLogs, err
-			}
-		}
-
 		// Write the block to the chain and get the status.
 		status, err := bc.WriteBlockWithState(block, receipts, state)
 		if err != nil {

eth/backend.go

@@ -159,7 +159,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 			TrieCleanLimit: config.TrieCleanCache,
 			TrieDirtyLimit: config.TrieDirtyCache,
 			TrieTimeLimit: config.TrieTimeout,
-			StateDiff: config.StateDiff.On,
 		}
 	)
 	eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig, eth.shouldPreserve)