dex: redesign p2p network topology

- Let p2p server support direct connection and group connection.
- Introduce node meta table to maintain IP of all nodes in node set,
  in memory and let nodes in the network can sync this table.
- Let peerSet able to manage direct connections to notary set and dkg set.

The mechanism to refresh the network topology when configuration round
change is not done yet.

1 files changed, 17 insertions, 25 deletions

diff --git a/dex/protocol.go b/dex/protocol.go
index 0111edf18..7b01217ff 100644
--- a/dex/protocol.go
+++ b/dex/protocol.go
@@ -20,14 +20,11 @@ import (
 	"fmt"
 	"io"
 	"math/big"
-	"net"
 
 	"github.com/dexon-foundation/dexon/common"
 	"github.com/dexon-foundation/dexon/core"
 	"github.com/dexon-foundation/dexon/core/types"
-	"github.com/dexon-foundation/dexon/crypto/sha3"
 	"github.com/dexon-foundation/dexon/event"
-	"github.com/dexon-foundation/dexon/p2p/discover"
 	"github.com/dexon-foundation/dexon/p2p/enode"
 	"github.com/dexon-foundation/dexon/rlp"
 )
@@ -67,7 +64,7 @@ const (
 	ReceiptsMsg    = 0x10
 
 	// Protocol messages belonging to dex/64
-	NotaryNodeInfoMsg = 0x11
+	MetaMsg = 0x11
 )
 
 type errCode int
@@ -114,12 +111,26 @@ type txPool interface {
 	SubscribeNewTxsEvent(chan<- core.NewTxsEvent) event.Subscription
 }
 
+type governance interface {
+	GetChainNum(uint64) uint32
+
+	GetNotarySet(uint32, uint64) map[string]struct{}
+
+	GetDKGSet(uint64) map[string]struct{}
+
+	SubscribeNewCRSEvent(ch chan core.NewCRSEvent) event.Subscription
+}
+
 type p2pServer interface {
 	Self() *enode.Node
 
-	AddNotaryPeer(*discover.Node)
+	AddDirectPeer(*enode.Node)
+
+	RemoveDirectPeer(*enode.Node)
 
-	RemoveNotaryPeer(*discover.Node)
+	AddGroup(string, []*enode.Node, uint64)
+
+	RemoveGroup(string)
 }
 
 // statusData is the network packet for the status message.
@@ -195,22 +206,3 @@ type blockBody struct {
 
 // blockBodiesData is the network packet for block content distribution.
 type blockBodiesData []*blockBody
-
-// TODO(sonic): revisit this msg when dexon core SDK is finalized.
-// notartyNodeInfo is the network packet for notary node ip info.
-type notaryNodeInfo struct {
-	ID        discover.NodeID
-	IP        net.IP
-	UDP       uint16
-	TCP       uint16
-	Round     uint64
-	Sig       []byte
-	Timestamp int64
-}
-
-func (n *notaryNodeInfo) Hash() (h common.Hash) {
-	hw := sha3.NewKeccak256()
-	rlp.Encode(hw, n)
-	hw.Sum(h[:0])
-	return h
-}