From 250b9da44a9a93691994e83d08fd9aae0a53ec63 Mon Sep 17 00:00:00 2001
From: Tian <tian@dydx.exchange>
Date: Mon, 30 Oct 2023 17:00:10 -0400
Subject: [PATCH] bridge daemon does not require eth rpc endpoint flag and
 panics on startup if flag is not set (#725)

(cherry picked from commit 17e3c3708b4571c66385f073b08cc241cc3565ad)
---
 protocol/daemons/bridge/client/client.go | 8 ++++++--
 protocol/daemons/flags/flags.go          | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/protocol/daemons/bridge/client/client.go b/protocol/daemons/bridge/client/client.go
index da16747809..2292b33903 100644
--- a/protocol/daemons/bridge/client/client.go
+++ b/protocol/daemons/bridge/client/client.go
@@ -12,7 +12,7 @@ import (
 	"github.com/dydxprotocol/v4-chain/protocol/daemons/bridge/api"
 	"github.com/dydxprotocol/v4-chain/protocol/daemons/bridge/client/types"
 	"github.com/dydxprotocol/v4-chain/protocol/daemons/constants"
-	"github.com/dydxprotocol/v4-chain/protocol/daemons/flags"
+	daemonflags "github.com/dydxprotocol/v4-chain/protocol/daemons/flags"
 	daemontypes "github.com/dydxprotocol/v4-chain/protocol/daemons/types"
 	libeth "github.com/dydxprotocol/v4-chain/protocol/lib/eth"
 	"github.com/dydxprotocol/v4-chain/protocol/lib/metrics"
@@ -26,7 +26,7 @@ import (
 // Start begins a job that periodically runs the RunBridgeDaemonTaskLoop function.
 func Start(
 	ctx context.Context,
-	flags flags.DaemonFlags,
+	flags daemonflags.DaemonFlags,
 	appFlags appflags.Flags,
 	logger log.Logger,
 	grpcClient daemontypes.GrpcClient,
@@ -36,6 +36,10 @@ func Start(
 		"Starting bridge daemon with flags",
 		"BridgeFlags", flags.Bridge,
 	)
+	// Panic if EthRpcEndpoint is empty.
+	if flags.Bridge.EthRpcEndpoint == "" {
+		return fmt.Errorf("flag %s is not set", daemonflags.FlagBridgeDaemonEthRpcEndpoint)
+	}
 
 	// Make a connection to the Cosmos gRPC query services.
 	queryConn, err := grpcClient.NewTcpConnection(ctx, appFlags.GrpcAddress)
diff --git a/protocol/daemons/flags/flags.go b/protocol/daemons/flags/flags.go
index c49a4a050c..eebdf7e631 100644
--- a/protocol/daemons/flags/flags.go
+++ b/protocol/daemons/flags/flags.go
@@ -129,10 +129,6 @@ func AddDaemonFlagsToCmd(
 		df.Bridge.EthRpcEndpoint,
 		"Ethereum Node Rpc Endpoint",
 	)
-	// Require bridge daemon eth RPC endpoint flag.
-	if err := cmd.MarkFlagRequired(FlagBridgeDaemonEthRpcEndpoint); err != nil {
-		panic(err)
-	}
 
 	// Liquidation Daemon.
 	cmd.Flags().Bool(