node: enabled avalanche on mainnet

commit-id:45e694bd
This commit is contained in:
Leo 2021-12-14 23:27:17 +01:00 committed by Leopold Schabel
parent fc1e162f3b
commit e950bb831a
2 changed files with 16 additions and 15 deletions

View File

@ -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],
)
}
}

View File

@ -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