From e950bb831a0c1728b6b9dbb41d5d0cae35fde24f Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Tue, 14 Dec 2021 23:27:17 +0100
Subject: [PATCH] node: enabled avalanche on mainnet

commit-id:45e694bd
---
 node/cmd/guardiand/adminnodes.go | 12 ++++++++----
 node/cmd/guardiand/node.go       | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/node/cmd/guardiand/adminnodes.go b/node/cmd/guardiand/adminnodes.go
index 44da4adea..1e4d34597 100644
--- a/node/cmd/guardiand/adminnodes.go
+++ b/node/cmd/guardiand/adminnodes.go
@@ -83,9 +83,9 @@ func runListNodes(cmd *cobra.Command, args []string) {
 		}
 	} else {
 		if showDetails {
-			_, _ = w.Write([]byte("Node key\tGuardian key\tNode name\tVersion\tLast seen\tUptime\tSolana\tEthereum\tTerra\tBSC\tPolygon\n"))
+			_, _ = w.Write([]byte("Node key\tGuardian key\tNode name\tVersion\tLast seen\tUptime\tSolana\tEthereum\tTerra\tBSC\tPolygon\tAvalanche\n"))
 		} else {
-			_, _ = w.Write([]byte("Node key\tGuardian key\tNode name\tVersion\tLast seen\tSolana\tEthereum\tTerra\tBSC\tPolygon\n"))
+			_, _ = w.Write([]byte("Node key\tGuardian key\tNode name\tVersion\tLast seen\tSolana\tEthereum\tTerra\tBSC\tPolygon\tAvalanche\n"))
 		}
 	}
 
@@ -162,7 +162,7 @@ func runListNodes(cmd *cobra.Command, args []string) {
 		} else {
 			if showDetails {
 				fmt.Fprintf(w,
-					"%s\t%s\t%s\t%s\t%s\t%s\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\n",
+					"%s\t%s\t%s\t%s\t%s\t%s\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\t%s %d (%d)\n",
 					h.P2PNodeAddr,
 					h.RawHeartbeat.GuardianAddr,
 					h.RawHeartbeat.NodeName,
@@ -184,10 +184,13 @@ func runListNodes(cmd *cobra.Command, args []string) {
 					truncAddrs[vaa.ChainIDPolygon],
 					heights[vaa.ChainIDPolygon],
 					errors[vaa.ChainIDPolygon],
+					truncAddrs[vaa.ChainIDAvalanche],
+					heights[vaa.ChainIDAvalanche],
+					errors[vaa.ChainIDAvalanche],
 				)
 			} else {
 				fmt.Fprintf(w,
-					"%s\t%s\t%s\t%s\t%s\t%d\t%d\t%d\t%d\t%d\n",
+					"%s\t%s\t%s\t%s\t%s\t%d\t%d\t%d\t%d\t%d\t%d\n",
 					h.P2PNodeAddr,
 					h.RawHeartbeat.GuardianAddr,
 					h.RawHeartbeat.NodeName,
@@ -198,6 +201,7 @@ func runListNodes(cmd *cobra.Command, args []string) {
 					heights[vaa.ChainIDTerra],
 					heights[vaa.ChainIDBSC],
 					heights[vaa.ChainIDPolygon],
+					heights[vaa.ChainIDAvalanche],
 				)
 			}
 		}
diff --git a/node/cmd/guardiand/node.go b/node/cmd/guardiand/node.go
index 953523d46..a6caa894b 100644
--- a/node/cmd/guardiand/node.go
+++ b/node/cmd/guardiand/node.go
@@ -242,9 +242,9 @@ func runNode(cmd *cobra.Command, args []string) {
 	readiness.RegisterComponent(common.ReadinessTerraSyncing)
 	readiness.RegisterComponent(common.ReadinessBSCSyncing)
 	readiness.RegisterComponent(common.ReadinessPolygonSyncing)
+	readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
 	if *testnetMode {
 		readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
-		readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
 	}
 
 	if *statusAddr != "" {
@@ -328,6 +328,9 @@ func runNode(cmd *cobra.Command, args []string) {
 	if *polygonContract == "" {
 		logger.Fatal("Please specify --polygonContract")
 	}
+	if *avalancheRPC == "" {
+		logger.Fatal("Please specify --avalancheRPC")
+	}
 	if *testnetMode {
 		if *ethRopstenRPC == "" {
 			logger.Fatal("Please specify --ethRopstenRPC")
@@ -335,9 +338,6 @@ func runNode(cmd *cobra.Command, args []string) {
 		if *ethRopstenContract == "" {
 			logger.Fatal("Please specify --ethRopstenContract")
 		}
-		if *avalancheRPC == "" {
-			logger.Fatal("Please specify --avalancheRPC")
-		}
 	} else {
 		if *ethRopstenRPC != "" {
 			logger.Fatal("Please do not specify --ethRopstenRPC in non-testnet mode")
@@ -345,9 +345,6 @@ func runNode(cmd *cobra.Command, args []string) {
 		if *ethRopstenContract != "" {
 			logger.Fatal("Please do not specify --ethRopstenContract in non-testnet mode")
 		}
-		if *avalancheRPC != "" {
-			logger.Fatal("Please do not specify --avalancheRPC in non-testnet mode")
-		}
 	}
 	if *nodeName == "" {
 		logger.Fatal("Please specify --nodeName")
@@ -547,16 +544,16 @@ func runNode(cmd *cobra.Command, args []string) {
 			ethereum.NewEthWatcher(*polygonRPC, polygonContractAddr, "polygon", common.ReadinessPolygonSyncing, vaa.ChainIDPolygon, lockC, nil).Run); err != nil {
 			return err
 		}
+		if err := supervisor.Run(ctx, "avalanchewatch",
+			ethereum.NewEthWatcher(*avalancheRPC, avalancheContractAddr, "avalanche", common.ReadinessAvalancheSyncing, vaa.ChainIDAvalanche, lockC, nil).Run); err != nil {
+			return err
+		}
 
 		if *testnetMode {
 			if err := supervisor.Run(ctx, "ethropstenwatch",
 				ethereum.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, setC).Run); err != nil {
 				return err
 			}
-			if err := supervisor.Run(ctx, "avalanchewatch",
-				ethereum.NewEthWatcher(*avalancheRPC, avalancheContractAddr, "avalanche", common.ReadinessAvalancheSyncing, vaa.ChainIDAvalanche, lockC, nil).Run); err != nil {
-				return err
-			}
 		}
 
 		// Start Terra watcher only if configured