From 8c7cf1d64f7dd41f57b9bcf72be1b863d62679a6 Mon Sep 17 00:00:00 2001
From: Jaynti Kanani <jdkanani@gmail.com>
Date: Wed, 18 Nov 2020 17:05:20 +0530
Subject: [PATCH] chg: use new bor flags

---
 cmd/geth/config.go     | 3 +++
 cmd/utils/bor_flags.go | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 2e2c189fd..25a042542 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -146,6 +146,9 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 	}
 	utils.SetShhConfig(ctx, stack)
 
+	// Set Bor config flags
+	utils.SetBorConfig(ctx, &cfg.Eth)
+
 	return stack, cfg
 }
 
diff --git a/cmd/utils/bor_flags.go b/cmd/utils/bor_flags.go
index 53e2969ee..22e1b33d3 100644
--- a/cmd/utils/bor_flags.go
+++ b/cmd/utils/bor_flags.go
@@ -52,6 +52,12 @@ func getGenesis(genesisPath string) (*core.Genesis, error) {
 	return genesis, nil
 }
 
+// SetBorConfig sets bor config
+func SetBorConfig(ctx *cli.Context, cfg *eth.Config) {
+	cfg.HeimdallURL = ctx.GlobalString(HeimdallURLFlag.Name)
+	cfg.WithoutHeimdall = ctx.GlobalBool(WithoutHeimdallFlag.Name)
+}
+
 // CreateBorEthereum Creates bor ethereum object from eth.Config
 func CreateBorEthereum(cfg *eth.Config) *eth.Ethereum {
 	workspace, err := ioutil.TempDir("", "bor-command-node-")
-- 
GitLab