Merge branch 'master' into release/v1.7.x

app/upgrades/v8/consts.go

@@ -6,8 +6,8 @@ import (
 	"github.com/sge-network/sge/app/upgrades"
 )
 
-// UpgradeName defines the on-chain upgrade name for the v1.6.0 upgrade.
-const UpgradeName = "v1.6.0"
+// UpgradeName defines the on-chain upgrade name for the v1.6.1 upgrade.
+const UpgradeName = "v1.6.1"
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,

app/upgrades/v8/upgrades.go

@@ -1,11 +1,12 @@
 package v8
 
 import (
+	"sort"
+
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	"github.com/google/uuid"
 	"github.com/sge-network/sge/app/keepers"
 	"github.com/sge-network/sge/x/reward/types"
 )
@@ -29,9 +30,10 @@ func CreateUpgradeHandler(
 		for addr := range promoters {
 			promoterAddresses = append(promoterAddresses, addr)
 		}
+		sort.Strings(promoterAddresses)
 
 		if len(promoterAddresses) > 0 {
-			promoterUID := uuid.NewString()
+			promoterUID := "f0630627-9e4e-48f3-8cd5-1422b46d2175"
 			k.RewardKeeper.SetPromoter(ctx, types.Promoter{
 				Creator:   promoterAddresses[0],
 				UID:       promoterUID,