From 0b1d6483a054b7b3d0474425e2aeffd6e2a6f102 Mon Sep 17 00:00:00 2001
From: sampocs <sam.pochyly@gmail.com>
Date: Thu, 29 Aug 2024 21:35:47 -0500
Subject: [PATCH] fixed map nondeterminism

---
 cmd/strided/config_defaults.go | 5 ++++-
 utils/utils.go                 | 9 +++++++++
 x/stakeibc/keeper/unbonding.go | 6 ++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cmd/strided/config_defaults.go b/cmd/strided/config_defaults.go
index aa28eb745..aa0f468f3 100644
--- a/cmd/strided/config_defaults.go
+++ b/cmd/strided/config_defaults.go
@@ -9,6 +9,8 @@ import (
 
 	tmcli "github.com/cometbft/cometbft/libs/cli"
 	"github.com/cosmos/cosmos-sdk/server"
+
+	"github.com/Stride-Labs/stride/v24/utils"
 )
 
 /*
@@ -216,7 +218,8 @@ func OverwriteWithCustomConfig(configFilePath string, sectionKeyValues []Section
 			currentSection = line[1 : len(line)-1]
 		} else if configMap[currentSection] != nil {
 			// If the line is in a section that needs to be overwritten, check each key
-			for key, value := range configMap[currentSection] {
+			for _, key := range utils.StringMapKeys(configMap[currentSection]) {
+				value := configMap[currentSection][key]
 				// Split the line into key and value parts
 				parts := strings.SplitN(line, "=", 2)
 				if len(parts) != 2 {
diff --git a/utils/utils.go b/utils/utils.go
index 79bc9837b..0a3995160 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -68,6 +68,15 @@ func Int32MapKeys[V any](m map[int32]V) []int32 {
 	return keys
 }
 
+func Uint64MapKeys[V any](m map[uint64]V) []uint64 {
+	keys := make([]uint64, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Slice(keys, func(i, j int) bool { return keys[i] < keys[j] })
+	return keys
+}
+
 //==============================  ADDRESS VERIFICATION UTILS  ================================
 // ref: https://github.com/cosmos/cosmos-sdk/blob/b75c2ebcfab1a6b535723f1ac2889a2fc2509520/types/address.go#L177
 
diff --git a/x/stakeibc/keeper/unbonding.go b/x/stakeibc/keeper/unbonding.go
index 01a49a25d..3d05ddb34 100644
--- a/x/stakeibc/keeper/unbonding.go
+++ b/x/stakeibc/keeper/unbonding.go
@@ -140,7 +140,8 @@ func (k Keeper) RefreshUnbondingNativeTokenAmounts(
 ) (refreshedHostZoneUnbondings map[uint64]recordstypes.HostZoneUnbonding, err error) {
 	// Refresh the amount for all records in status UNBONDING_QUEUE
 	// We don't want to refresh the failed unbonding records
-	for epochNumber, hostZoneUnbondingRecord := range hostZoneUnbondings {
+	for _, epochNumber := range utils.Uint64MapKeys(hostZoneUnbondings) {
+		hostZoneUnbondingRecord := hostZoneUnbondings[epochNumber]
 		if hostZoneUnbondingRecord.Status != recordstypes.HostZoneUnbonding_UNBONDING_QUEUE {
 			continue
 		}
@@ -451,7 +452,8 @@ func (k Keeper) UnbondFromHostZone(ctx sdk.Context, hostZone types.HostZone) (er
 	}
 
 	// Update the epoch unbonding record status and number of undelegation ICAs
-	for epochNumber, hostZoneUnbonding := range epochNumbersToHostZoneUnbondings {
+	for _, epochNumber := range utils.Uint64MapKeys(epochNumbersToHostZoneUnbondings) {
+		hostZoneUnbonding := epochNumbersToHostZoneUnbondings[epochNumber]
 		hostZoneUnbonding.Status = recordstypes.HostZoneUnbonding_UNBONDING_IN_PROGRESS
 		hostZoneUnbonding.UndelegationTxsInProgress += numTxsSubmitted
 		err := k.RecordsKeeper.SetHostZoneUnbondingRecord(ctx, epochNumber, hostZone.ChainId, hostZoneUnbonding)