Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed map nondeterminism #1281

Merged
merged 1 commit into from
Aug 30, 2024
Merged

fixed map nondeterminism #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/strided/config_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down Expand Up @@ -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 {
Expand Down
9 changes: 9 additions & 0 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions x/stakeibc/keeper/unbonding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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)
Expand Down
Loading