From 106fecca0049bcf8b9f0e368cad4be380d2364d5 Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Mon, 30 Nov 2020 17:13:48 +0100
Subject: [PATCH] bridge: always gate Terra features on the main feature flag

---
 bridge/cmd/guardiand/bridge.go      | 19 ++++++++++++++++++-
 bridge/pkg/processor/observation.go |  2 +-
 bridge/pkg/processor/processor.go   |  5 ++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/bridge/cmd/guardiand/bridge.go b/bridge/cmd/guardiand/bridge.go
index c499e29e4..3a11ef10d 100644
--- a/bridge/cmd/guardiand/bridge.go
+++ b/bridge/cmd/guardiand/bridge.go
@@ -347,7 +347,24 @@ func runBridge(cmd *cobra.Command, args []string) {
 			return err
 		}
 
-		p := processor.NewProcessor(ctx, lockC, setC, sendC, obsvC, solanaVaaC, injectC, gk, *unsafeDevMode, *devNumGuardians, *ethRPC, *terraLCD, *terraChaidID, *terraContract, *terraFeePayer)
+		// TODO: this thing has way too many arguments at this point - make it an options struct
+		p := processor.NewProcessor(ctx,
+			lockC,
+			setC,
+			sendC,
+			obsvC,
+			solanaVaaC,
+			injectC,
+			gk,
+			*unsafeDevMode,
+			*devNumGuardians,
+			*ethRPC,
+			*terraSupport,
+			*terraLCD,
+			*terraChaidID,
+			*terraContract,
+			*terraFeePayer,
+		)
 		if err := supervisor.Run(ctx, "processor", p.Run); err != nil {
 			return err
 		}
diff --git a/bridge/pkg/processor/observation.go b/bridge/pkg/processor/observation.go
index 437c82bbd..07e2c730f 100644
--- a/bridge/pkg/processor/observation.go
+++ b/bridge/pkg/processor/observation.go
@@ -217,7 +217,7 @@ func (p *Processor) terraVAASubmission(ctx context.Context, signed *vaa.VAA, has
 	//  - https://github.com/certusone/wormhole/issues/97
 	//
 	// Roadmap: https://github.com/certusone/wormhole/milestone/4
-	if !p.devnetMode || p.terraChaidID == "" {
+	if !p.devnetMode || !p.terraEnabled {
 		p.logger.Warn("ignoring terra VAA submission",
 			zap.String("digest", hash))
 		return
diff --git a/bridge/pkg/processor/processor.go b/bridge/pkg/processor/processor.go
index b16b0bff5..7ae6813cd 100644
--- a/bridge/pkg/processor/processor.go
+++ b/bridge/pkg/processor/processor.go
@@ -62,6 +62,7 @@ type Processor struct {
 	devnetNumGuardians uint
 	devnetEthRPC       string
 
+	terraEnabled  bool
 	terraLCD      string
 	terraChaidID  string
 	terraContract string
@@ -93,6 +94,7 @@ func NewProcessor(
 	devnetMode bool,
 	devnetNumGuardians uint,
 	devnetEthRPC string,
+	terraEnabled bool,
 	terraLCD string,
 	terraChaidID string,
 	terraContract string,
@@ -110,6 +112,7 @@ func NewProcessor(
 		devnetNumGuardians: devnetNumGuardians,
 		devnetEthRPC:       devnetEthRPC,
 
+		terraEnabled:  terraEnabled,
 		terraLCD:      terraLCD,
 		terraChaidID:  terraChaidID,
 		terraContract: terraContract,
@@ -168,7 +171,7 @@ func (p *Processor) checkDevModeGuardianSetUpdate(ctx context.Context) error {
 
 			p.logger.Info("devnet guardian set change submitted to Ethereum", zap.Any("trx", trx), zap.Any("vaa", v))
 
-			if p.terraChaidID != "" {
+			if p.terraEnabled {
 				// Submit to Terra
 				trxResponse, err := terra.SubmitVAA(timeout, p.terraLCD, p.terraChaidID, p.terraContract, p.terraFeePayer, v)
 				if err != nil {