|
|
@@ -328,12 +328,12 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
readiness.RegisterComponent(common.ReadinessAuroraSyncing)
|
|
|
readiness.RegisterComponent(common.ReadinessFantomSyncing)
|
|
|
readiness.RegisterComponent(common.ReadinessKaruraSyncing)
|
|
|
+ readiness.RegisterComponent(common.ReadinessKlaytnSyncing)
|
|
|
readiness.RegisterComponent(common.ReadinessCeloSyncing)
|
|
|
|
|
|
if *testnetMode {
|
|
|
readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
|
|
|
readiness.RegisterComponent(common.ReadinessAcalaSyncing)
|
|
|
- readiness.RegisterComponent(common.ReadinessKlaytnSyncing)
|
|
|
readiness.RegisterComponent(common.ReadinessMoonbeamSyncing)
|
|
|
}
|
|
|
|
|
|
@@ -443,6 +443,12 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
if *karuraContract == "" && !*unsafeDevMode {
|
|
|
logger.Fatal("Please specify --karuraContract")
|
|
|
}
|
|
|
+ if *klaytnRPC == "" {
|
|
|
+ logger.Fatal("Please specify --klaytnRPC")
|
|
|
+ }
|
|
|
+ if *klaytnContract == "" && !*unsafeDevMode {
|
|
|
+ logger.Fatal("Please specify --klaytnContract")
|
|
|
+ }
|
|
|
if *celoRPC == "" {
|
|
|
logger.Fatal("Please specify --celoRPC")
|
|
|
}
|
|
|
@@ -462,12 +468,6 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
if *acalaContract == "" {
|
|
|
logger.Fatal("Please specify --acalaContract")
|
|
|
}
|
|
|
- if *klaytnRPC == "" {
|
|
|
- logger.Fatal("Please specify --klaytnRPC")
|
|
|
- }
|
|
|
- if *klaytnContract == "" {
|
|
|
- logger.Fatal("Please specify --klaytnContract")
|
|
|
- }
|
|
|
if *moonbeamRPC == "" {
|
|
|
logger.Fatal("Please specify --moonbeamRPC")
|
|
|
}
|
|
|
@@ -487,12 +487,6 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
if *acalaContract != "" && !*unsafeDevMode {
|
|
|
logger.Fatal("Please do not specify --acalaContract")
|
|
|
}
|
|
|
- if *klaytnRPC != "" && !*unsafeDevMode {
|
|
|
- logger.Fatal("Please do not specify --klaytnRPC")
|
|
|
- }
|
|
|
- if *klaytnContract != "" && !*unsafeDevMode {
|
|
|
- logger.Fatal("Please do not specify --klaytnContract")
|
|
|
- }
|
|
|
if *moonbeamRPC != "" && !*unsafeDevMode {
|
|
|
logger.Fatal("Please do not specify --moonbeamRPC")
|
|
|
}
|
|
|
@@ -683,10 +677,10 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
chainObsvReqC[vaa.ChainIDAurora] = make(chan *gossipv1.ObservationRequest)
|
|
|
chainObsvReqC[vaa.ChainIDFantom] = make(chan *gossipv1.ObservationRequest)
|
|
|
chainObsvReqC[vaa.ChainIDKarura] = make(chan *gossipv1.ObservationRequest)
|
|
|
+ chainObsvReqC[vaa.ChainIDKlaytn] = make(chan *gossipv1.ObservationRequest)
|
|
|
chainObsvReqC[vaa.ChainIDCelo] = make(chan *gossipv1.ObservationRequest)
|
|
|
if *testnetMode {
|
|
|
chainObsvReqC[vaa.ChainIDAcala] = make(chan *gossipv1.ObservationRequest)
|
|
|
- chainObsvReqC[vaa.ChainIDKlaytn] = make(chan *gossipv1.ObservationRequest)
|
|
|
chainObsvReqC[vaa.ChainIDMoonbeam] = make(chan *gossipv1.ObservationRequest)
|
|
|
chainObsvReqC[vaa.ChainIDEthereumRopsten] = make(chan *gossipv1.ObservationRequest)
|
|
|
}
|
|
|
@@ -838,6 +832,10 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
ethereum.NewEthWatcher(*karuraRPC, karuraContractAddr, "karura", common.ReadinessKaruraSyncing, vaa.ChainIDKarura, lockC, nil, 1, chainObsvReqC[vaa.ChainIDKarura], *unsafeDevMode).Run); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+ if err := supervisor.Run(ctx, "klaytnwatch",
|
|
|
+ ethereum.NewEthWatcher(*klaytnRPC, klaytnContractAddr, "klaytn", common.ReadinessKlaytnSyncing, vaa.ChainIDKlaytn, lockC, nil, 1, chainObsvReqC[vaa.ChainIDKlaytn], *unsafeDevMode).Run); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
if err := supervisor.Run(ctx, "celowatch",
|
|
|
ethereum.NewEthWatcher(*celoRPC, celoContractAddr, "celo", common.ReadinessCeloSyncing, vaa.ChainIDCelo, lockC, nil, 1, chainObsvReqC[vaa.ChainIDCelo], *unsafeDevMode).Run); err != nil {
|
|
|
return err
|
|
|
@@ -852,10 +850,6 @@ func runNode(cmd *cobra.Command, args []string) {
|
|
|
ethereum.NewEthWatcher(*acalaRPC, acalaContractAddr, "acala", common.ReadinessAcalaSyncing, vaa.ChainIDAcala, lockC, nil, 1, chainObsvReqC[vaa.ChainIDAcala], *unsafeDevMode).Run); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- if err := supervisor.Run(ctx, "klaytnwatch",
|
|
|
- ethereum.NewEthWatcher(*klaytnRPC, klaytnContractAddr, "klaytn", common.ReadinessKlaytnSyncing, vaa.ChainIDKlaytn, lockC, nil, 1, chainObsvReqC[vaa.ChainIDKlaytn], *unsafeDevMode).Run); err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
if err := supervisor.Run(ctx, "moonbeamwatch",
|
|
|
ethereum.NewEthWatcher(*moonbeamRPC, moonbeamContractAddr, "moonbeam", common.ReadinessMoonbeamSyncing, vaa.ChainIDMoonbeam, lockC, nil, 1, chainObsvReqC[vaa.ChainIDMoonbeam], *unsafeDevMode).Run); err != nil {
|
|
|
return err
|