Merge dev branch

[bytom/bytom-spv.git] / netsync / handle.go

diff --git a/netsync/handle.go b/netsync/handle.go
index 41a3bc7..8c4c84f 100644 (file)
--- a/netsync/handle.go
+++ b/netsync/handle.go
@@ -8,6 +8,7 @@ import (
        "reflect"
        "strconv"
        "strings"
+       "sync"
 
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/go-crypto"
@@ -22,7 +23,6 @@ import (
        "github.com/bytom/protocol/bc/types"
        "github.com/bytom/version"
        "github.com/bytom/wallet"
-       "sync"
 )
 
 const (
@@ -39,7 +39,7 @@ type Chain interface {
        GetHeaderByHash(*bc.Hash) (*types.BlockHeader, error)
        GetHeaderByHeight(uint64) (*types.BlockHeader, error)
        InMainChain(bc.Hash) bool
-       ProcessBlock(*types.Block) (bool, error)
+       ProcessBlock(*types.Block, *bc.TransactionStatus) (bool, error)
 }
 
 //SyncManager Sync Manager is responsible for the business layer information synchronization
@@ -400,6 +400,7 @@ func initDiscover(config *cfg.Config, priv *crypto.PrivKeyEd25519, port uint16)
        }
        nodes := []*discover.Node{}
        for _, seed := range strings.Split(config.P2P.Seeds, ",") {
+               version.Status.AddSeed(seed)
                url := "enode://" + hex.EncodeToString(crypto.Sha256([]byte(seed))) + "@" + seed
                nodes = append(nodes, discover.MustParseNode(url))
        }