From c64237b69d57f88f2d2431db564aebf8ff74f719 Mon Sep 17 00:00:00 2001
From: Jiri <jiri.vestfal@fetch.ai>
Date: Mon, 7 Oct 2024 18:02:55 +0200
Subject: [PATCH] Refactor

---
 app/upgrade_cudos.go                 | 8 +++-----
 app/upgrade_v_11_4_network_config.go | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/upgrade_cudos.go b/app/upgrade_cudos.go
index d974ecc0..9846afe3 100644
--- a/app/upgrade_cudos.go
+++ b/app/upgrade_cudos.go
@@ -891,11 +891,9 @@ func handleCommunityPoolBalance(ctx sdk.Context, app *App, genesisData *GenesisD
 
 	} else {
 		// If community pool destination balance is set we move community pool tokens there.
-		if cudosCfg.config.CommunityPoolBalanceDestAddr != "" {
-			err = moveGenesisBalance(genesisData, RemainingDistributionBalanceAccount.address, cudosCfg.config.CommunityPoolBalanceDestAddr, communityPoolBalance, "community_pool_balance", manifest, cudosCfg)
-			if err != nil {
-				return fmt.Errorf("failed to move community pool balance %w", err)
-			}
+		err = moveGenesisBalance(genesisData, RemainingDistributionBalanceAccount.address, cudosCfg.config.CommunityPoolBalanceDestAddr, communityPoolBalance, "community_pool_balance", manifest, cudosCfg)
+		if err != nil {
+			return fmt.Errorf("failed to move community pool balance %w", err)
 		}
 
 	}
diff --git a/app/upgrade_v_11_4_network_config.go b/app/upgrade_v_11_4_network_config.go
index 5e5dff81..af1c1b19 100644
--- a/app/upgrade_v_11_4_network_config.go
+++ b/app/upgrade_v_11_4_network_config.go
@@ -139,10 +139,10 @@ var NetworkInfos = map[string]NetworkConfig{
 			RemainingDistributionBalanceAddr: "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",
 			ContractDestinationFallbackAddr:  "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",
 
-			CommissionFetchAddr:      "fetch15p3rl5aavw9rtu86tna5lgxfkz67zzr6ed4yhw", // Fetch ecosystem wallet
-			ExtraSupplyFetchAddr:     "fetch1wp8fl6fl4je40cfh2reeyj6cvucve9s6antdav",
-			VestingCollisionDestAddr: "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",
-			//CommunityPoolBalanceDestAddr: "cudos1dslwarknhfsw3pfjzxxf5mn28q3ewfectw0gta",
+			CommissionFetchAddr:          "fetch15p3rl5aavw9rtu86tna5lgxfkz67zzr6ed4yhw", // Fetch ecosystem wallet
+			ExtraSupplyFetchAddr:         "fetch1wp8fl6fl4je40cfh2reeyj6cvucve9s6antdav",
+			VestingCollisionDestAddr:     "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",
+			CommunityPoolBalanceDestAddr: "cudos1dslwarknhfsw3pfjzxxf5mn28q3ewfectw0gta",
 
 			SourceChainAddressPrefix: "cudos",