Skip to content

Commit 1022a13

Browse files
hoank101hoank101
committed
fix: miss subspace key table
1 parent 7de03e4 commit 1022a13

File tree

4 files changed

+23
-26
lines changed

4 files changed

+23
-26
lines changed

‎app/app.go

+20-18
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
3939
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
4040
distr "github.com/cosmos/cosmos-sdk/x/distribution"
41+
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
4142
solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
4243
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
4344
icq "github.com/strangelove-ventures/async-icq/v7"
@@ -112,7 +113,7 @@ import (
112113
routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper"
113114
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types"
114115

115-
bank "github.com/terra-money/core/v2/custom/bank"
116+
terracustombank "github.com/terra-money/core/v2/custom/bank"
116117
custombankkeeper "github.com/terra-money/core/v2/custom/bank/keeper"
117118

118119
ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
@@ -181,7 +182,7 @@ var (
181182
auth.AppModuleBasic{},
182183
alliancemodule.AppModuleBasic{},
183184
genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator),
184-
bank.AppModule{},
185+
terracustombank.AppModule{},
185186
capability.AppModuleBasic{},
186187
consensus.AppModuleBasic{},
187188
staking.AppModuleBasic{},
@@ -736,7 +737,7 @@ func NewMigalooApp(
736737
),
737738
auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),
738739
vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
739-
bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)),
740+
terracustombank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)),
740741
capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
741742
gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
742743
mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)),
@@ -786,15 +787,15 @@ func NewMigalooApp(
786787
vestingtypes.ModuleName,
787788
icqtypes.ModuleName,
788789
// additional non simd modules
789-
routertypes.ModuleName,
790790
ibctransfertypes.ModuleName,
791791
ibcexported.ModuleName,
792792
icatypes.ModuleName,
793793
ibcfeetypes.ModuleName,
794+
routertypes.ModuleName,
795+
ibchookstypes.ModuleName,
794796
wasmtypes.ModuleName,
795797
tokenfactorytypes.ModuleName,
796798
alliancemoduletypes.ModuleName,
797-
ibchookstypes.ModuleName,
798799
consensusparamtypes.ModuleName,
799800
)
800801

@@ -822,10 +823,10 @@ func NewMigalooApp(
822823
ibcexported.ModuleName,
823824
icatypes.ModuleName,
824825
ibcfeetypes.ModuleName,
826+
ibchookstypes.ModuleName,
825827
wasmtypes.ModuleName,
826828
tokenfactorytypes.ModuleName,
827829
alliancemoduletypes.ModuleName,
828-
ibchookstypes.ModuleName,
829830
consensusparamtypes.ModuleName,
830831
)
831832

@@ -862,9 +863,9 @@ func NewMigalooApp(
862863
ibcfeetypes.ModuleName,
863864
tokenfactorytypes.ModuleName,
864865
// wasm after ibc transfer
866+
ibchookstypes.ModuleName,
865867
wasmtypes.ModuleName,
866868
alliancemoduletypes.ModuleName,
867-
ibchookstypes.ModuleName,
868869
consensusparamtypes.ModuleName,
869870
)
870871

@@ -1037,6 +1038,7 @@ func (app *MigalooApp) LegacyAmino() *codec.LegacyAmino {
10371038
// NOTE: This is solely to be used for testing purposes.
10381039
func (app *MigalooApp) GetSubspace(moduleName string) paramstypes.Subspace {
10391040
subspace, _ := app.ParamsKeeper.GetSubspace(moduleName)
1041+
fmt.Println(moduleName, subspace)
10401042
return subspace
10411043
}
10421044

@@ -1179,22 +1181,22 @@ func stringMapKeys(m map[string][]string) []string {
11791181
func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper {
11801182
paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey)
11811183

1182-
paramsKeeper.Subspace(authtypes.ModuleName)
1183-
paramsKeeper.Subspace(banktypes.ModuleName)
1184-
paramsKeeper.Subspace(stakingtypes.ModuleName)
1185-
paramsKeeper.Subspace(minttypes.ModuleName)
1186-
paramsKeeper.Subspace(distrtypes.ModuleName)
1187-
paramsKeeper.Subspace(slashingtypes.ModuleName)
1188-
paramsKeeper.Subspace(govtypes.ModuleName)
1189-
paramsKeeper.Subspace(crisistypes.ModuleName)
1184+
paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable())
1185+
paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable())
1186+
paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable())
1187+
paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable())
1188+
paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable())
1189+
paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable())
1190+
paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypesv1.ParamKeyTable())
1191+
paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable())
11901192
paramsKeeper.Subspace(ibctransfertypes.ModuleName)
11911193
paramsKeeper.Subspace(ibcexported.ModuleName)
11921194
paramsKeeper.Subspace(icahosttypes.SubModuleName)
1193-
paramsKeeper.Subspace(tokenfactorytypes.ModuleName)
1195+
paramsKeeper.Subspace(tokenfactorytypes.ModuleName).WithKeyTable(tokenfactorytypes.ParamKeyTable())
11941196
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
11951197
paramsKeeper.Subspace(icqtypes.ModuleName)
1196-
paramsKeeper.Subspace(wasmtypes.ModuleName)
1197-
paramsKeeper.Subspace(routertypes.ModuleName)
1198+
paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable())
1199+
paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable())
11981200
paramsKeeper.Subspace(alliancemoduletypes.ModuleName).WithKeyTable(alliancemoduletypes.ParamKeyTable())
11991201

12001202
return paramsKeeper

‎app/upgrades/v4_1_0/upgrades.go

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package v3
22

33
import (
4-
"fmt"
54
"github.com/cosmos/cosmos-sdk/baseapp"
65
sdk "github.com/cosmos/cosmos-sdk/types"
76
"github.com/cosmos/cosmos-sdk/types/module"
@@ -25,11 +24,9 @@ func CreateUpgradeHandler(
2524
icacontrollerKeeper icacontrollerkeeper.Keeper,
2625
) upgradetypes.UpgradeHandler {
2726
return func(ctx sdk.Context, _plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
28-
fmt.Println("zozo")
2927
// READ: https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/UPGRADING.md#xconsensus
3028
baseAppLegacySS := paramsKeeper.Subspace(baseapp.Paramspace).
3129
WithKeyTable(paramstypes.ConsensusParamsKeyTable())
32-
fmt.Println(baseAppLegacySS)
3330
baseapp.MigrateParams(ctx, baseAppLegacySS, &consensusParamsKeeper)
3431

3532
// READ: https://github.com/cosmos/ibc-go/blob/v7.2.0/docs/migrations/v7-to-v7_1.md#chains

‎go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f
2323
github.com/stretchr/testify v1.8.4
2424
github.com/terra-money/alliance v0.3.2
25-
github.com/terra-money/core/v2 v2.0.0-00010101000000-000000000000
25+
github.com/terra-money/core/v2 v2.5.0
2626
)
2727

2828
require (
@@ -192,8 +192,6 @@ require (
192192
replace (
193193
// use cosmos fork of keyring
194194
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
195-
// use notional's wasmd fork with token factory
196-
github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.45.0-tf.rc0
197195
// downgraded to avoid some annoying warning messages
198196
// should be fixed after sdk 0.47.3 and gogoproto 1.4.10
199197
// https://github.com/cosmos/gogoproto/issues/66

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
420420
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
421421
github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=
422422
github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4=
423+
github.com/CosmWasm/wasmd v0.45.0 h1:9zBqrturKJwC2kVsfHvbrA++EN0PS7UTXCffCGbg6JI=
424+
github.com/CosmWasm/wasmd v0.45.0/go.mod h1:RnSAiqbNIZu4QhO+0pd7qGZgnYAMBPGmXpzTADag944=
423425
github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw=
424426
github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc=
425427
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
@@ -1026,8 +1028,6 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
10261028
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
10271029
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
10281030
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
1029-
github.com/notional-labs/wasmd v0.45.0-tf.rc0 h1:JCMD7GY/C2Pk7klQNpjpgU5FW4zn0KL6Du1W5rP2OKM=
1030-
github.com/notional-labs/wasmd v0.45.0-tf.rc0/go.mod h1:nMVHI6PFNpaMqMw4pj6fThldCP3mmf9LcrmYw1nNG5Y=
10311031
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
10321032
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
10331033
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

0 commit comments

Comments
 (0)