From ea7821a4a6b2cec94cff208246e4946d01d4383a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= <stefan@ethernal.tech>
Date: Tue, 31 Oct 2023 09:14:26 +0100
Subject: [PATCH] Don't validate rewards config if epoch reward is set to 0

---
 command/genesis/params.go              | 6 +++++-
 command/rootchain/supernet/supernet.go | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/genesis/params.go b/command/genesis/params.go
index cce95f3d37..d9b9742bb6 100644
--- a/command/genesis/params.go
+++ b/command/genesis/params.go
@@ -477,6 +477,10 @@ func (p *genesisParams) predeployStakingSC() (*chain.GenesisAccount, error) {
 
 // validateRewardWalletAndToken validates reward wallet flag
 func (p *genesisParams) validateRewardWalletAndToken() error {
+	if p.epochReward == 0 {
+		return nil
+	}
+
 	if p.rewardWallet == "" {
 		return errRewardWalletNotDefined
 	}
@@ -495,7 +499,7 @@ func (p *genesisParams) validateRewardWalletAndToken() error {
 	}
 
 	// If epoch rewards are enabled, reward wallet must have some amount of premine
-	if p.epochReward > 0 && premineInfo.Amount.Cmp(big.NewInt(0)) < 1 {
+	if premineInfo.Amount.Cmp(big.NewInt(0)) < 1 {
 		return errRewardWalletAmountZero
 	}
 
diff --git a/command/rootchain/supernet/supernet.go b/command/rootchain/supernet/supernet.go
index d0558a1c17..57649d0c96 100644
--- a/command/rootchain/supernet/supernet.go
+++ b/command/rootchain/supernet/supernet.go
@@ -171,6 +171,7 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		}
 
 		genesisAccsMap := make(map[types.Address]*validator.GenesisValidator, len(genesisAccounts))
+
 		for _, genesisAcc := range genesisAccounts {
 			genesisBalanceInput, err := genesisBalancesABIFn.Encode(genesisAcc.Address)
 			if err != nil {