disable grpc

notional-labs · May 6, 2024 · f00271b · f00271b
1 parent 2b11cf4
commit f00271b
Show file tree

Hide file tree

Showing 3 changed files with 2,426 additions and 2,244 deletions.
diff --git a/lib/checknode.go b/lib/checknode.go
@@ -30,6 +30,16 @@ var (
 )
 
 func CheckNode(nodeAddr string) {
+	rpcAddrMu.Lock()
+	defer rpcAddrMu.Unlock()
+
+	if _, exists := rpcAddr[nodeAddr]; exists {
+		return // Node already processed
+	}
+
+	// Proceed with processing
+	rpcAddr[nodeAddr] = true
+
 	if IsNodeVisited(nodeAddr) {
 		return
 	}
@@ -102,10 +112,9 @@ func CheckNode(nodeAddr string) {
 	netinfo, err := FetchNetInfo(client)
 	if err == nil {
 		color.Green("[%s] Got net info from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddr)
-		CheckNodeGRPC(nodeAddr)
+		//		CheckNodeGRPC(nodeAddr)
 		ctx := context.TODO()
 		status, err := client.Status(ctx)
-		moniker[nodeAddr] = status.NodeInfo.Moniker
 		if err != nil {
 			color.Red("[%s] Failed to fetch client from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddr)
 			return
@@ -114,6 +123,8 @@ func CheckNode(nodeAddr string) {
 			color.Red("[%s] Status is nil for %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddr)
 			return
 		}
+		moniker[nodeAddr] = status.NodeInfo.Moniker
+
 		// Verify chain_id
 		if status.NodeInfo.Network != initialChainID {
 			color.Red("[%s] Node %s is on a different chain_id\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddr)
@@ -137,25 +148,25 @@ func CheckNode(nodeAddr string) {
 		wg.Wait()
 	} else {
 		color.Red("[%s] Failed to fetch net_info from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddr)
-		CheckNodeGRPC(nodeAddr)
+		//		CheckNodeGRPC(nodeAddr)
 		// Add to unsuccessful nodes
 		rpcAddr[nodeAddr] = false
 		return
 	}
 }
 
-func CheckNodeGRPC(nodeAddr string) {
-	nodeAddrGRPC = strings.Replace(nodeAddr, "26657", "9090", 1)
-	nodeAddrGRPC = strings.Replace(nodeAddrGRPC, "http://", "", 1)
-	nodeAddrGRPC = strings.Replace(nodeAddrGRPC, "https://", "", 1)
-	err := FetchNodeInfoGRPC(nodeAddrGRPC)
-	if err == nil {
-		color.Green("[%s] Got node info GRPC from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddrGRPC)
-		// Add to successful nodes
-		grpcAddr[nodeAddr] = true
-	} else {
-		color.Red("[%s] Failed to fetch node info GRPC from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddrGRPC)
-		// Add to unsuccessful nodes
-		grpcAddr[nodeAddr] = false
-	}
-}
+// func CheckNodeGRPC(nodeAddr string) {
+// 	nodeAddrGRPC = strings.Replace(nodeAddr, "26657", "9090", 1)
+// 	nodeAddrGRPC = strings.Replace(nodeAddrGRPC, "http://", "", 1)
+// 	nodeAddrGRPC = strings.Replace(nodeAddrGRPC, "https://", "", 1)
+// 	err := FetchNodeInfoGRPC(nodeAddrGRPC)
+// 	if err == nil {
+// 		color.Green("[%s] Got node info GRPC from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddrGRPC)
+// 		// Add to successful nodes
+// 		grpcAddr[nodeAddr] = true
+// 	} else {
+// 		color.Red("[%s] Failed to fetch node info GRPC from %s\n", time.Now().Format("2006-01-02 15:04:05"), nodeAddrGRPC)
+// 		// Add to unsuccessful nodes
+// 		grpcAddr[nodeAddr] = false
+// 	}
+// }
diff --git a/lib/lib.go b/lib/lib.go
@@ -23,7 +23,7 @@ var visited = struct {
 }{nodes: make(map[string]bool)}
 
 func FetchClient(nodeAddr string) (client *http.HTTP, err error) {
-	client, err = http.New(nodeAddr, "websocket")
+	client, err = http.NewWithTimeout(nodeAddr, "websocket", 500)
 	if err != nil {
 		return nil, err
 	}
@@ -88,28 +88,28 @@ func ProcessPeer(peer coretypes.Peer) {
 }
 
 func FetchNodeInfoGRPC(nodeAddr string) error {
-	grpcConn, err := grpc.Dial(
-		nodeAddr,
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-	)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	grpcConn, err := grpc.DialContext(ctx, nodeAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
 	if err != nil {
 		return err
 	}
 	defer grpcConn.Close()
+
 	serviceClient := tmservice.NewServiceClient(grpcConn)
-	_, err = serviceClient.GetNodeInfo(
-		context.Background(),
-		&tmservice.GetNodeInfoRequest{},
-	)
+	_, err = serviceClient.GetNodeInfo(ctx, &tmservice.GetNodeInfoRequest{})
 	if err != nil {
 		color.Red("[%s] %v\n", time.Now().Format("2006-01-02 15:04:05"), err)
 		return err
 	}
-	return err
+	return nil
 }
 
 func FetchNetInfo(client *http.HTTP) (*coretypes.ResultNetInfo, error) {
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
 	netinfo, err := client.NetInfo(ctx)
 	return netinfo, err
 }