certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

node: remove terraEnabled flag 

Terra is now always enabled

Change-Id: I2a898dd1a5027d1981cc4c65a65d14bd7c0f9fb0
This commit is contained in:
Leo 2021-07-20 22:07:51 +02:00
parent 349bf24937
commit 772922c9a6
2 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bridge/cmd/guardiand/bridge.go
View File

@ -54,7 +54,6 @@ var (
ethRPC *string ethRPC *string
ethContract *string ethContract *string
terraSupport *bool
terraWS *string terraWS *string
terraLCD *string terraLCD *string
terraChainID *string terraChainID *string
@ -92,7 +91,6 @@ func init() {
ethRPC = BridgeCmd.Flags().String("ethRPC", "", "Ethereum RPC URL") ethRPC = BridgeCmd.Flags().String("ethRPC", "", "Ethereum RPC URL")
ethContract = BridgeCmd.Flags().String("ethContract", "", "Ethereum bridge contract address") ethContract = BridgeCmd.Flags().String("ethContract", "", "Ethereum bridge contract address")
terraSupport = BridgeCmd.Flags().Bool("terra", false, "Turn on support for Terra")
terraWS = BridgeCmd.Flags().String("terraWS", "", "Path to terrad root for websocket connection") terraWS = BridgeCmd.Flags().String("terraWS", "", "Path to terrad root for websocket connection")
terraLCD = BridgeCmd.Flags().String("terraLCD", "", "Path to LCD service root for http calls") terraLCD = BridgeCmd.Flags().String("terraLCD", "", "Path to LCD service root for http calls")
terraChainID = BridgeCmd.Flags().String("terraChainID", "", "Terra chain ID, used in LCD client initialization") terraChainID = BridgeCmd.Flags().String("terraChainID", "", "Terra chain ID, used in LCD client initialization")
@ -195,9 +193,7 @@ func runBridge(cmd *cobra.Command, args []string) {
// Register components for readiness checks. // Register components for readiness checks.
readiness.RegisterComponent(common.ReadinessEthSyncing) readiness.RegisterComponent(common.ReadinessEthSyncing)
readiness.RegisterComponent(common.ReadinessSolanaSyncing) readiness.RegisterComponent(common.ReadinessSolanaSyncing)
if *terraSupport { readiness.RegisterComponent(common.ReadinessTerraSyncing)
readiness.RegisterComponent(common.ReadinessTerraSyncing)
}
if *statusAddr != "" { if *statusAddr != "" {
// Use a custom routing instead of using http.DefaultServeMux directly to avoid accidentally exposing packages // Use a custom routing instead of using http.DefaultServeMux directly to avoid accidentally exposing packages
@ -280,22 +276,20 @@ func runBridge(cmd *cobra.Command, args []string) {
logger.Fatal("Please specify --solanaUrl") logger.Fatal("Please specify --solanaUrl")
} }
if *terraSupport { if *terraWS == "" {
if *terraWS == "" { logger.Fatal("Please specify --terraWS")
logger.Fatal("Please specify --terraWS") }
} if *terraLCD == "" {
if *terraLCD == "" { logger.Fatal("Please specify --terraLCD")
logger.Fatal("Please specify --terraLCD") }
} if *terraChainID == "" {
if *terraChainID == "" { logger.Fatal("Please specify --terraChainID")
logger.Fatal("Please specify --terraChainID") }
} if *terraContract == "" {
if *terraContract == "" { logger.Fatal("Please specify --terraContract")
logger.Fatal("Please specify --terraContract") }
} if *terraKeyPath == "" {
if *terraKeyPath == "" { logger.Fatal("Please specify --terraKey")
logger.Fatal("Please specify --terraKey")
}
} }
ethContractAddr := eth_common.HexToAddress(*ethContract) ethContractAddr := eth_common.HexToAddress(*ethContract)
@ -368,14 +362,12 @@ func runBridge(cmd *cobra.Command, args []string) {
// Load Terra fee payer key // Load Terra fee payer key
var terraFeePayer string var terraFeePayer string
if *terraSupport { if *unsafeDevMode {
if *unsafeDevMode { terra.WriteDevnetKey(*terraKeyPath)
terra.WriteDevnetKey(*terraKeyPath) }
} terraFeePayer, err = terra.ReadKey(*terraKeyPath)
terraFeePayer, err = terra.ReadKey(*terraKeyPath) if err != nil {
if err != nil { logger.Fatal("Failed to load Terra fee payer key", zap.Error(err))
logger.Fatal("Failed to load Terra fee payer key", zap.Error(err))
}
} }
adminService, err := adminServiceRunnable(logger, *adminSocketPath, injectC) adminService, err := adminServiceRunnable(logger, *adminSocketPath, injectC)
@ -399,12 +391,10 @@ func runBridge(cmd *cobra.Command, args []string) {
} }
// Start Terra watcher only if configured // Start Terra watcher only if configured
if *terraSupport { logger.Info("Starting Terra watcher")
logger.Info("Starting Terra watcher") if err := supervisor.Run(ctx, "terrawatch",
if err := supervisor.Run(ctx, "terrawatch", terra.NewTerraBridgeWatcher(*terraWS, *terraLCD, *terraContract, lockC, setC).Run); err != nil {
terra.NewTerraBridgeWatcher(*terraWS, *terraLCD, *terraContract, lockC, setC).Run); err != nil { return err
return err
}
} }
if err := supervisor.Run(ctx, "solvaa", if err := supervisor.Run(ctx, "solvaa",
@ -429,7 +419,6 @@ func runBridge(cmd *cobra.Command, args []string) {
*unsafeDevMode, *unsafeDevMode,
*devNumGuardians, *devNumGuardians,
*ethRPC, *ethRPC,
*terraSupport,
*terraLCD, *terraLCD,
*terraChainID, *terraChainID,
*terraContract, *terraContract,

2
bridge/pkg/processor/processor.go
View File

@ -107,7 +107,6 @@ func NewProcessor(
devnetMode bool, devnetMode bool,
devnetNumGuardians uint, devnetNumGuardians uint,
devnetEthRPC string, devnetEthRPC string,
terraEnabled bool,
terraLCD string, terraLCD string,
terraChainID string, terraChainID string,
terraContract string, terraContract string,
@ -125,7 +124,6 @@ func NewProcessor(
devnetNumGuardians: devnetNumGuardians, devnetNumGuardians: devnetNumGuardians,
devnetEthRPC: devnetEthRPC, devnetEthRPC: devnetEthRPC,
terraEnabled: terraEnabled,
terraLCD: terraLCD, terraLCD: terraLCD,
terraChainID: terraChainID, terraChainID: terraChainID,
terraContract: terraContract, terraContract: terraContract,