parent
fc1e162f3b
commit
e950bb831a
|
@ -83,9 +83,9 @@ func runListNodes(cmd *cobra.Command, args []string) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if showDetails {
|
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 {
|
} 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 {
|
} else {
|
||||||
if showDetails {
|
if showDetails {
|
||||||
fmt.Fprintf(w,
|
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.P2PNodeAddr,
|
||||||
h.RawHeartbeat.GuardianAddr,
|
h.RawHeartbeat.GuardianAddr,
|
||||||
h.RawHeartbeat.NodeName,
|
h.RawHeartbeat.NodeName,
|
||||||
|
@ -184,10 +184,13 @@ func runListNodes(cmd *cobra.Command, args []string) {
|
||||||
truncAddrs[vaa.ChainIDPolygon],
|
truncAddrs[vaa.ChainIDPolygon],
|
||||||
heights[vaa.ChainIDPolygon],
|
heights[vaa.ChainIDPolygon],
|
||||||
errors[vaa.ChainIDPolygon],
|
errors[vaa.ChainIDPolygon],
|
||||||
|
truncAddrs[vaa.ChainIDAvalanche],
|
||||||
|
heights[vaa.ChainIDAvalanche],
|
||||||
|
errors[vaa.ChainIDAvalanche],
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(w,
|
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.P2PNodeAddr,
|
||||||
h.RawHeartbeat.GuardianAddr,
|
h.RawHeartbeat.GuardianAddr,
|
||||||
h.RawHeartbeat.NodeName,
|
h.RawHeartbeat.NodeName,
|
||||||
|
@ -198,6 +201,7 @@ func runListNodes(cmd *cobra.Command, args []string) {
|
||||||
heights[vaa.ChainIDTerra],
|
heights[vaa.ChainIDTerra],
|
||||||
heights[vaa.ChainIDBSC],
|
heights[vaa.ChainIDBSC],
|
||||||
heights[vaa.ChainIDPolygon],
|
heights[vaa.ChainIDPolygon],
|
||||||
|
heights[vaa.ChainIDAvalanche],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -242,9 +242,9 @@ func runNode(cmd *cobra.Command, args []string) {
|
||||||
readiness.RegisterComponent(common.ReadinessTerraSyncing)
|
readiness.RegisterComponent(common.ReadinessTerraSyncing)
|
||||||
readiness.RegisterComponent(common.ReadinessBSCSyncing)
|
readiness.RegisterComponent(common.ReadinessBSCSyncing)
|
||||||
readiness.RegisterComponent(common.ReadinessPolygonSyncing)
|
readiness.RegisterComponent(common.ReadinessPolygonSyncing)
|
||||||
|
readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
|
||||||
if *testnetMode {
|
if *testnetMode {
|
||||||
readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
|
readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
|
||||||
readiness.RegisterComponent(common.ReadinessAvalancheSyncing)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if *statusAddr != "" {
|
if *statusAddr != "" {
|
||||||
|
@ -328,6 +328,9 @@ func runNode(cmd *cobra.Command, args []string) {
|
||||||
if *polygonContract == "" {
|
if *polygonContract == "" {
|
||||||
logger.Fatal("Please specify --polygonContract")
|
logger.Fatal("Please specify --polygonContract")
|
||||||
}
|
}
|
||||||
|
if *avalancheRPC == "" {
|
||||||
|
logger.Fatal("Please specify --avalancheRPC")
|
||||||
|
}
|
||||||
if *testnetMode {
|
if *testnetMode {
|
||||||
if *ethRopstenRPC == "" {
|
if *ethRopstenRPC == "" {
|
||||||
logger.Fatal("Please specify --ethRopstenRPC")
|
logger.Fatal("Please specify --ethRopstenRPC")
|
||||||
|
@ -335,9 +338,6 @@ func runNode(cmd *cobra.Command, args []string) {
|
||||||
if *ethRopstenContract == "" {
|
if *ethRopstenContract == "" {
|
||||||
logger.Fatal("Please specify --ethRopstenContract")
|
logger.Fatal("Please specify --ethRopstenContract")
|
||||||
}
|
}
|
||||||
if *avalancheRPC == "" {
|
|
||||||
logger.Fatal("Please specify --avalancheRPC")
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if *ethRopstenRPC != "" {
|
if *ethRopstenRPC != "" {
|
||||||
logger.Fatal("Please do not specify --ethRopstenRPC in non-testnet mode")
|
logger.Fatal("Please do not specify --ethRopstenRPC in non-testnet mode")
|
||||||
|
@ -345,9 +345,6 @@ func runNode(cmd *cobra.Command, args []string) {
|
||||||
if *ethRopstenContract != "" {
|
if *ethRopstenContract != "" {
|
||||||
logger.Fatal("Please do not specify --ethRopstenContract in non-testnet mode")
|
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 == "" {
|
if *nodeName == "" {
|
||||||
logger.Fatal("Please specify --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 {
|
ethereum.NewEthWatcher(*polygonRPC, polygonContractAddr, "polygon", common.ReadinessPolygonSyncing, vaa.ChainIDPolygon, lockC, nil).Run); err != nil {
|
||||||
return err
|
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 *testnetMode {
|
||||||
if err := supervisor.Run(ctx, "ethropstenwatch",
|
if err := supervisor.Run(ctx, "ethropstenwatch",
|
||||||
ethereum.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, setC).Run); err != nil {
|
ethereum.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, setC).Run); err != nil {
|
||||||
return err
|
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
|
// Start Terra watcher only if configured
|
||||||
|
|
Loading…
Reference in New Issue