update restore (#255)

cmd/console/discover.go

@@ -6,55 +6,68 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/CESSProject/cess-bucket/node"
+	"github.com/CESSProject/cess-bucket/pkg/logger"
 	"github.com/CESSProject/p2p-go/core"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/discovery/mdns"
 )
 
-func subscribe(ctx context.Context, bootnode string, h host.Host) {
+func subscribe(ctx context.Context, peernode *core.PeerNode, minerRecord node.MinerRecord, l logger.Logger) {
 
 	var (
 		err      error
 		room     string
 		findpeer peer.AddrInfo
 	)
 
-	gossipSub, err := pubsub.NewGossipSub(ctx, h)
+	gossipSub, err := pubsub.NewGossipSub(ctx, peernode.GetHost())
 	if err != nil {
-
+		fmt.Printf("NewGossipSub: %v\n", err)
 		return
 	}
-
+	bootnode := peernode.GetBootnode()
 	if strings.Contains(bootnode, "12D3KooWRm2sQg65y2ZgCUksLsjWmKbBtZ4HRRsGLxbN76XTtC8T") {
 		room = fmt.Sprintf("%s-12D3KooWRm2sQg65y2ZgCUksLsjWmKbBtZ4HRRsGLxbN76XTtC8T", core.NetworkRoom)
 	} else if strings.Contains(bootnode, "12D3KooWEGeAp1MvvUrBYQtb31FE1LPg7aHsd1LtTXn6cerZTBBd") {
 		room = fmt.Sprintf("%s-12D3KooWEGeAp1MvvUrBYQtb31FE1LPg7aHsd1LtTXn6cerZTBBd", core.NetworkRoom)
 	} else if strings.Contains(bootnode, "12D3KooWGDk9JJ5F6UPNuutEKSbHrTXnF5eSn3zKaR27amgU6o9S") {
 		room = fmt.Sprintf("%s-12D3KooWGDk9JJ5F6UPNuutEKSbHrTXnF5eSn3zKaR27amgU6o9S", core.NetworkRoom)
+	} else if strings.Contains(bootnode, "12D3KooWS8a18xoBzwkmUsgGBctNo6QCr6XCpUDR946mTBBUTe83") {
+		room = fmt.Sprintf("%s-12D3KooWS8a18xoBzwkmUsgGBctNo6QCr6XCpUDR946mTBBUTe83", core.NetworkRoom)
+	} else if strings.Contains(bootnode, "12D3KooWDWeiiqbpNGAqA5QbDTdKgTtwX8LCShWkTpcyxpRf2jA9") {
+		room = fmt.Sprintf("%s-12D3KooWDWeiiqbpNGAqA5QbDTdKgTtwX8LCShWkTpcyxpRf2jA9", core.NetworkRoom)
+	} else if strings.Contains(bootnode, "12D3KooWNcTWWuUWKhjTVDF1xZ38yCoHXoF4aDjnbjsNpeVwj33U") {
+		room = fmt.Sprintf("%s-12D3KooWNcTWWuUWKhjTVDF1xZ38yCoHXoF4aDjnbjsNpeVwj33U", core.NetworkRoom)
 	} else {
 		room = core.NetworkRoom
 	}
 
+	fmt.Printf("room: %s\n", room)
+
 	// setup local mDNS discovery
-	if err := setupDiscovery(h); err != nil {
+	if err := setupDiscovery(peernode.GetHost()); err != nil {
+		fmt.Printf("setupDiscovery: %v", err)
 		return
 	}
 
 	// join the pubsub topic called librum
 	topic, err := gossipSub.Join(room)
 	if err != nil {
+		fmt.Printf("Join: %v", err)
 		return
 	}
 
 	// subscribe to topic
 	subscriber, err := topic.Subscribe()
 	if err != nil {
+		fmt.Printf("Subscribe: %v", err)
 		return
 	}
 
-	fmt.Println("Join room: ", room)
+	fmt.Printf("Join room: %s\n", room)
 
 	for {
 		msg, err := subscriber.Next(ctx)
@@ -63,7 +76,7 @@ func subscribe(ctx context.Context, bootnode string, h host.Host) {
 		}
 
 		// only consider messages delivered by other peers
-		if msg.ReceivedFrom == h.ID() {
+		if msg.ReceivedFrom == peernode.GetHost().ID() {
 			continue
 		}
 
@@ -73,6 +86,7 @@ func subscribe(ctx context.Context, bootnode string, h host.Host) {
 		}
 
 		fmt.Println("got peer: ", findpeer.ID.String())
+		minerRecord.SavePeer(findpeer)
 	}
 }