vaporCfg "github.com/vapor/config"
"github.com/vapor/crypto/ed25519/chainkd"
dbm "github.com/vapor/database/leveldb"
+ "github.com/vapor/errors"
"github.com/vapor/event"
"github.com/vapor/netsync/chainmgr"
"github.com/vapor/netsync/consensusmgr"
chain *mock.Chain
txPool *mock.Mempool
// discvMap maps a node's public key to the node itself
- discvMap map[string]*dht.Node
- discvCh chan *dht.Node
- dialCh chan struct{}
- // TODO: maybe remove?
- checkStatusCh chan struct{}
+ discvMap map[string]*dht.Node
+ bestHeightSeen uint64
+ peers *peers.PeerSet
}
-// TODO: set myself as SPV?
func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
- //TODO: for test
- cfg.CheckFreqSeconds = 15
-
dbPath, err := makePath()
if err != nil {
- log.Fatal(err)
+ log.WithFields(log.Fields{"err": err}).Fatal("makePath")
}
nodeCfg := &vaporCfg.Config{
nodeCfg.ChainID = "mainnet"
privKey, err := signlib.NewPrivKey()
if err != nil {
- log.Fatal(err)
+ log.WithFields(log.Fields{"err": err}).Fatal("NewPrivKey")
}
chain, txPool, err := mockChainAndPool()
if err != nil {
- log.Fatal(err)
+ log.WithFields(log.Fields{"err": err}).Fatal("mockChainAndPool")
}
return &monitor{
- RWMutex: &sync.RWMutex{},
- cfg: cfg,
- db: db,
- nodeCfg: nodeCfg,
- privKey: privKey.(chainkd.XPrv),
- chain: chain,
- txPool: txPool,
- discvMap: make(map[string]*dht.Node),
- discvCh: make(chan *dht.Node),
- dialCh: make(chan struct{}, 1),
- checkStatusCh: make(chan struct{}, 1),
+ RWMutex: &sync.RWMutex{},
+ cfg: cfg,
+ db: db,
+ nodeCfg: nodeCfg,
+ privKey: privKey.(chainkd.XPrv),
+ chain: chain,
+ txPool: txPool,
+ discvMap: make(map[string]*dht.Node),
+ bestHeightSeen: uint64(0),
}
}
-// TODO: need to fix temp and "discover"
func makePath() (string, error) {
usr, err := user.Current()
if err != nil {
return "", err
}
- dataPath := usr.HomeDir + "/.precog"
+ dataPath := usr.HomeDir + "/.vapor/precog"
if err := os.MkdirAll(dataPath, os.ModePerm); err != nil {
return "", err
}
}
func (m *monitor) Run() {
- defer os.RemoveAll(m.nodeCfg.DBPath)
-
var seeds []string
for _, node := range m.cfg.Nodes {
- seeds = append(seeds, fmt.Sprintf("%s:%d", node.Host, node.Port))
- if err := m.upSertNode(&node); err != nil {
- log.Error(err)
+ seeds = append(seeds, fmt.Sprintf("%s:%d", node.IP, node.Port))
+ if err := m.upsertNode(&node); err != nil {
+ log.WithFields(log.Fields{"node": node, "err": err}).Error("upsertNode")
}
}
m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
if err := m.makeSwitch(); err != nil {
- log.Fatal(err)
+ log.WithFields(log.Fields{"err": err}).Fatal("makeSwitch")
}
- m.dialCh <- struct{}{}
- var discvWg sync.WaitGroup
- go m.discoveryRoutine(&discvWg)
- go m.collectDiscoveredNodes(&discvWg)
- go m.connectNodesRoutine()
- go m.checkStatusRoutine()
+ go m.discoveryRoutine()
+ go m.connectionRoutine()
}
func (m *monitor) makeSwitch() error {
// no need for lanDiscv, but passing &mdns.LANDiscover{} will cause NilPointer
lanDiscv := mdns.NewLANDiscover(mdns.NewProtocol(), int(l.ExternalAddress().Port))
- sw, err := p2p.NewSwitch(m.nodeCfg, discv, lanDiscv, l, m.privKey, listenAddr, m.cfg.NetworkID)
+ m.sw, err = p2p.NewSwitch(m.nodeCfg, discv, lanDiscv, l, m.privKey, listenAddr, m.cfg.NetworkID)
if err != nil {
return err
}
- m.sw = sw
- return nil
+ m.peers = peers.NewPeerSet(m.sw)
+ return m.prepareReactors(m.peers)
}
func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
_ = consensusmgr.NewManager(m.sw, m.chain, peers, dispatcher)
fastSyncDB := dbm.NewDB("fastsync", m.nodeCfg.DBBackend, m.nodeCfg.DBDir())
// add ProtocolReactor to handle msgs
- _, err := chainmgr.NewManager(m.nodeCfg, m.sw, m.chain, m.txPool, dispatcher, peers, fastSyncDB)
- if err != nil {
+ if _, err := chainmgr.NewManager(m.nodeCfg, m.sw, m.chain, m.txPool, dispatcher, peers, fastSyncDB); err != nil {
return err
}
for label, reactor := range m.sw.GetReactors() {
- log.Debugf("start reactor: (%s:%v)", label, reactor)
+ log.WithFields(log.Fields{"label": label, "reactor": reactor}).Debug("start reactor")
if _, err := reactor.Start(); err != nil {
- return nil
+ return err
}
}
m.sw.GetSecurity().RegisterFilter(m.sw.GetPeers())
return m.sw.GetSecurity().Start()
}
-
-func (m *monitor) checkStatusRoutine() {
- peers := peers.NewPeerSet(m.sw)
- if err := m.prepareReactors(peers); err != nil {
- log.Fatal(err)
- }
-
- bestHeight := uint64(0)
- for range m.checkStatusCh {
- for _, peer := range m.sw.GetPeers().List() {
- peer.Start()
- peers.AddPeer(peer)
- }
- log.Infof("%d connected peers: %v", len(m.sw.GetPeers().List()), m.sw.GetPeers().List())
-
- for _, peer := range m.sw.GetPeers().List() {
- p := peers.GetPeer(peer.ID())
- if p == nil {
- continue
- }
-
- if err := p.SendStatus(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
- log.Error(err)
- peers.RemovePeer(p.ID())
- }
- }
-
- for _, peerInfo := range peers.GetPeerInfos() {
- if peerInfo.Height > bestHeight {
- bestHeight = peerInfo.Height
- }
- }
- log.Info("bestHeight: ", bestHeight)
- m.processPeerInfos(peers.GetPeerInfos())
-
- for _, peer := range m.sw.GetPeers().List() {
- p := peers.GetPeer(peer.ID())
- if p == nil {
- continue
- }
-
- peers.RemovePeer(p.ID())
- }
- log.Info("Disonnect all peers.")
- m.Unlock()
- m.dialCh <- struct{}{}
- }
-}
OSDN Git Service
