From 2e44c421ad4a330263c58a29009b19e87562e720 Mon Sep 17 00:00:00 2001 From: Reece Williams <31943163+Reecepbcups@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:29:02 -0600 Subject: [PATCH] fix: retract v7.1.0s and fix async icq param migration (#142) * retract PFM v7.1.0 * async-icq: consensusVer from 1 to 2 * retract async-icq with PR link --- middleware/packet-forward-middleware/go.mod | 3 +++ modules/async-icq/go.mod | 3 +++ modules/async-icq/module.go | 2 +- modules/async-icq/types/params_legacy.go | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/middleware/packet-forward-middleware/go.mod b/middleware/packet-forward-middleware/go.mod index 035b7bb7..2f83563e 100644 --- a/middleware/packet-forward-middleware/go.mod +++ b/middleware/packet-forward-middleware/go.mod @@ -194,3 +194,6 @@ replace ( // pin the version of goleveldb to v1.0.1-0.20210819022825-2ae1ddf74ef7 required by SDK v47 upgrade guide. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) + +// see https://github.com/cosmos/ibc-apps/pull/141 +retract v7.1.0 diff --git a/modules/async-icq/go.mod b/modules/async-icq/go.mod index 0056a4d4..0e9e4f10 100644 --- a/modules/async-icq/go.mod +++ b/modules/async-icq/go.mod @@ -192,3 +192,6 @@ require ( pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +// see https://github.com/cosmos/ibc-apps/pull/142 +retract v7.1.0 diff --git a/modules/async-icq/module.go b/modules/async-icq/module.go index 96ee4831..c6790196 100644 --- a/modules/async-icq/module.go +++ b/modules/async-icq/module.go @@ -138,7 +138,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) m := keeper.NewMigrator(&am.keeper, am.legacySubspace) - if err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate1to2); err != nil { + if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { panic(fmt.Sprintf("failed to migrate x/%s from version 1 to 2: %v", types.ModuleName, err)) } } diff --git a/modules/async-icq/types/params_legacy.go b/modules/async-icq/types/params_legacy.go index 1bb31da3..a6c4e796 100644 --- a/modules/async-icq/types/params_legacy.go +++ b/modules/async-icq/types/params_legacy.go @@ -24,7 +24,7 @@ func ParamKeyTable() paramtypes.KeyTable { // ParamSetPairs implements params.ParamSet func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ - paramtypes.NewParamSetPair(KeyHostEnabled, p.HostEnabled, validateEnabled), - paramtypes.NewParamSetPair(KeyAllowQueries, p.AllowQueries, validateAllowlist), + paramtypes.NewParamSetPair(KeyHostEnabled, &p.HostEnabled, validateEnabled), + paramtypes.NewParamSetPair(KeyAllowQueries, &p.AllowQueries, validateAllowlist), } }