cmd/geth/config.go

@@ -178,6 +178,10 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	if cfg.Ethstats.URL != "" {
 		utils.RegisterEthStatsService(stack, cfg.Ethstats.URL)
 	}
+
+	if ctx.GlobalBool(utils.StateDiffFlag.Name) {
+		utils.RegisterStateDiffService(stack)
+	}
 	return stack
 }
 

cmd/geth/usage.go

@@ -245,6 +245,12 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.MinerLegacyExtraDataFlag,
 		},
 	},
+	{
+		Name: "STATE DIFF",
+		Flags: []cli.Flag{
+			utils.StateDiffFlag,
+		},
+	},
 	{
 		Name: "MISC",
 	},

cmd/utils/flags.go

@@ -58,6 +58,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
 	"gopkg.in/urfave/cli.v1"
+	"github.com/ethereum/go-ethereum/statediff"
 )
 
 var (
@@ -1133,13 +1134,6 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
 	}
 }
 
-// Check if state diff flags are on and applies them to eth context
-func setStateDiff(ctx *cli.Context, cfg *eth.Config) {
-	if ctx.GlobalBool(StateDiffFlag.Name) && cfg.NoPruning && cfg.SyncMode == downloader.FullSync {
-		cfg.StateDiff.On = true
-	}
-}
-
 // SetEthConfig applies eth-related command line flags to the config.
 func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	// Avoid conflicting network flags
@@ -1175,10 +1169,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	}
 	cfg.NoPruning = ctx.GlobalString(GCModeFlag.Name) == "archive"
 
-	if ctx.GlobalIsSet(StateDiffFlag.Name) {
-		setStateDiff(ctx, cfg)
-	}
-
 	if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheTrieFlag.Name) {
 		cfg.TrieCleanCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheTrieFlag.Name) / 100
 	}
@@ -1338,6 +1328,18 @@ func RegisterEthStatsService(stack *node.Node, url string) {
 	}
 }
 
+func RegisterStateDiffService(stack *node.Node) {
+	if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
+		var ethServ *eth.Ethereum
+		ctx.Service(&ethServ)
+		chainDb := ethServ.ChainDb()
+		blockChain := ethServ.BlockChain()
+		return statediff.NewStateDiffService(chainDb, blockChain)
+	}); err != nil {
+		Fatalf("Failed to register State Diff Service", err)
+	}
+}
+
 func SetupMetrics(ctx *cli.Context) {
 	if metrics.Enabled {
 		log.Info("Enabling metrics collection")

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)

eth/config.go

@@ -17,7 +17,6 @@
 package eth
 
 import (
-	"github.com/ethereum/go-ethereum/statediff"
 	"math/big"
 	"os"
 	"os/user"
@@ -129,9 +128,6 @@ type Config struct {
 	EWASMInterpreter string
 	// Type of the EVM interpreter ("" for default)
 	EVMInterpreter string
-
-	// Config for state diff building
-	StateDiff statediff.Config
 }
 
 type configMarshaling struct {

statediff/builder.go

@@ -49,10 +49,13 @@ func (sdb *builder) BuildStateDiff(oldStateRoot, newStateRoot common.Hash, block
 	// Generate tries for old and new states
 	oldTrie, err := trie.New(oldStateRoot, sdb.trieDB)
 	if err != nil {
+		log.Debug("error creating oldTrie", err)
+		//getting this error: error creating oldTrie missing trie node ddfbb83966d870891aa47147269447a83564d1defaefad5f9844a3a3a2a08433 (path )
 		return nil, err
 	}
 	newTrie, err := trie.New(newStateRoot, sdb.trieDB)
 	if err != nil {
+		log.Debug("error creating newTrie", err)
 		return nil, err
 	}
 
@@ -61,6 +64,7 @@ func (sdb *builder) BuildStateDiff(oldStateRoot, newStateRoot common.Hash, block
 	newIt := newTrie.NodeIterator([]byte{})
 	creations, err := sdb.collectDiffNodes(oldIt, newIt)
 	if err != nil {
+		log.Debug("error collecting creation diff nodes", err)
 		return nil, err
 	}
 
@@ -69,6 +73,7 @@ func (sdb *builder) BuildStateDiff(oldStateRoot, newStateRoot common.Hash, block
 	newIt = newTrie.NodeIterator(make([]byte, 0))
 	deletions, err := sdb.collectDiffNodes(newIt, oldIt)
 	if err != nil {
+		log.Debug("error collecting deletion diff nodes", err)
 		return nil, err
 	}
 
@@ -80,14 +85,17 @@ func (sdb *builder) BuildStateDiff(oldStateRoot, newStateRoot common.Hash, block
 	// Build and return the statediff
 	updatedAccounts, err := sdb.buildDiffIncremental(creations, deletions, updatedKeys)
 	if err != nil {
+		log.Debug("error building diff incremental for updated", err)
 		return nil, err
 	}
 	createdAccounts, err := sdb.buildDiffEventual(creations, true)
 	if err != nil {
+		log.Debug("error building diff incremental for created", err)
 		return nil, err
 	}
 	deletedAccounts, err := sdb.buildDiffEventual(deletions, false)
 	if err != nil {
+		log.Debug("error building diff incremental for deleted", err)
 		return nil, err
 	}
 

statediff/ipfs/dag_putter.go

@@ -22,9 +22,10 @@ package ipfs
 import (
 	"bytes"
 	"encoding/gob"
-	"github.com/i-norden/go-ethereum/statediff"
 
 	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
+	"github.com/ethereum/go-ethereum/statediff"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 const (

statediff/publisher.go

@@ -21,7 +21,7 @@ package statediff
 
 import (
 	"errors"
-	"github.com/i-norden/go-ethereum/statediff/ipfs"
+	"github.com/ethereum/go-ethereum/statediff/ipfs"
 )
 
 type Publisher interface {

statediff/service.go

@@ -0,0 +1,64 @@
+package statediff
+
+import (
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/ethereum/go-ethereum/event"
+	"log"
+)
+
+type StateDiffService struct {
+	builder    *builder
+	extractor  *extractor
+	blockchain *core.BlockChain
+}
+
+func NewStateDiffService(db ethdb.Database, blockChain *core.BlockChain) (*StateDiffService, error) {
+	config := Config{}
+	extractor, _ := NewExtractor(db, config)
+	return &StateDiffService{
+		blockchain: blockChain,
+		extractor:  extractor,
+	}, nil
+}
+
+func (StateDiffService) Protocols() []p2p.Protocol {
+	return []p2p.Protocol{}
+
+}
+
+func (StateDiffService) APIs() []rpc.API {
+	return []rpc.API{}
+}
+
+func (sds *StateDiffService) loop (sub event.Subscription, events chan core.ChainHeadEvent) {
+	defer sub.Unsubscribe()
+
+	for {
+		select {
+		case ev, ok := <-events:
+			if !ok {
+				log.Fatalf("Error getting chain head event from subscription.")
+			}
+			log.Println("doing something with an event", ev)
+		    previousBlock := ev.Block
+			//TODO: figure out the best way to get the previous block
+			currentBlock := ev.Block
+			sds.extractor.ExtractStateDiff(*previousBlock, *currentBlock)
+		}
+	}
+
+}
+func (sds *StateDiffService) Start(server *p2p.Server) error {
+	events := make(chan core.ChainHeadEvent, 10)
+	sub := sds.blockchain.SubscribeChainHeadEvent(events)
+
+	go sds.loop(sub, events)
+
+	return nil
+}
+func (StateDiffService) Stop() error {
+	return nil
+}