@@ -10,35 +10,37 @@ import (
1010 "path/filepath"
1111 "time"
1212
13- v700 "github.com/neutron-org/neutron/v8/app/upgrades/v7.0.0"
14- v800 "github.com/neutron-org/neutron/v8/app/upgrades/v8.0.0"
15- v800_rc0 "github.com/neutron-org/neutron/v8/app/upgrades/v8.0.0-rc0"
16- v810 "github.com/neutron-org/neutron/v8/app/upgrades/v8.1.0"
17- v820 "github.com/neutron-org/neutron/v8/app/upgrades/v8.2.0"
18- dynamicfeestypes "github.com/neutron-org/neutron/v8/x/dynamicfees/types"
19- stateverifier "github.com/neutron-org/neutron/v8/x/state-verifier"
20- svkeeper "github.com/neutron-org/neutron/v8/x/state-verifier/keeper"
21- stateverifiertypes "github.com/neutron-org/neutron/v8/x/state-verifier/types"
22-
23- "github.com/neutron-org/neutron/v8/x/harpoon"
13+ v700 "github.com/neutron-org/neutron/v9/app/upgrades/v7.0.0"
14+ v800 "github.com/neutron-org/neutron/v9/app/upgrades/v8.0.0"
15+ v800_rc0 "github.com/neutron-org/neutron/v9/app/upgrades/v8.0.0-rc0"
16+ v810 "github.com/neutron-org/neutron/v9/app/upgrades/v8.1.0"
17+ v820 "github.com/neutron-org/neutron/v9/app/upgrades/v8.2.0"
18+ v900 "github.com/neutron-org/neutron/v9/app/upgrades/v9.0.0"
19+ "github.com/neutron-org/neutron/v9/x/coinfactory"
20+ dynamicfeestypes "github.com/neutron-org/neutron/v9/x/dynamicfees/types"
21+ stateverifier "github.com/neutron-org/neutron/v9/x/state-verifier"
22+ svkeeper "github.com/neutron-org/neutron/v9/x/state-verifier/keeper"
23+ stateverifiertypes "github.com/neutron-org/neutron/v9/x/state-verifier/types"
24+
25+ "github.com/neutron-org/neutron/v9/x/harpoon"
2426
2527 "github.com/cosmos/cosmos-sdk/x/staking"
2628 stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2729
28- v601 "github.com/neutron-org/neutron/v8 /app/upgrades/v6.0.1"
30+ v601 "github.com/neutron-org/neutron/v9 /app/upgrades/v6.0.1"
2931
3032 "github.com/skip-mev/feemarket/x/feemarket"
3133 feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
3234 feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
3335
34- "github.com/neutron-org/neutron/v8 /x/dynamicfees"
35- ibcratelimit "github.com/neutron-org/neutron/v8 /x/ibc-rate-limit"
36+ "github.com/neutron-org/neutron/v9 /x/dynamicfees"
37+ ibcratelimit "github.com/neutron-org/neutron/v9 /x/ibc-rate-limit"
3638
3739 "cosmossdk.io/client/v2/autocli"
3840 "cosmossdk.io/core/appmodule"
3941 authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
4042
41- appconfig "github.com/neutron-org/neutron/v8 /app/config"
43+ appconfig "github.com/neutron-org/neutron/v9 /app/config"
4244
4345 "github.com/skip-mev/slinky/abci/strategies/aggregator"
4446 "github.com/skip-mev/slinky/x/oracle"
@@ -53,8 +55,8 @@ import (
5355 oracleclient "github.com/skip-mev/slinky/service/clients/oracle"
5456 servicemetrics "github.com/skip-mev/slinky/service/metrics"
5557
56- "github.com/neutron-org/neutron/v8 /x/globalfee"
57- globalfeetypes "github.com/neutron-org/neutron/v8 /x/globalfee/types"
58+ "github.com/neutron-org/neutron/v9 /x/globalfee"
59+ globalfeetypes "github.com/neutron-org/neutron/v9 /x/globalfee/types"
5860
5961 "cosmossdk.io/log"
6062 db "github.com/cosmos/cosmos-db"
@@ -69,11 +71,11 @@ import (
6971 tendermint "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
7072 ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types"
7173
72- "github.com/neutron-org/neutron/v8 /docs"
74+ "github.com/neutron-org/neutron/v9 /docs"
7375
74- "github.com/neutron-org/neutron/v8 /app/upgrades"
76+ "github.com/neutron-org/neutron/v9 /app/upgrades"
7577
76- "github.com/neutron-org/neutron/v8 /x/cron"
78+ "github.com/neutron-org/neutron/v9 /x/cron"
7779
7880 "cosmossdk.io/x/evidence"
7981 evidencekeeper "cosmossdk.io/x/evidence/keeper"
@@ -129,9 +131,9 @@ import (
129131 slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
130132 slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
131133
132- "github.com/neutron-org/neutron/v8 /x/revenue"
133- revenuekeeper "github.com/neutron-org/neutron/v8 /x/revenue/keeper"
134- revenuetypes "github.com/neutron-org/neutron/v8 /x/revenue/types"
134+ "github.com/neutron-org/neutron/v9 /x/revenue"
135+ revenuekeeper "github.com/neutron-org/neutron/v9 /x/revenue/keeper"
136+ revenuetypes "github.com/neutron-org/neutron/v9 /x/revenue/types"
135137
136138 // "github.com/cosmos/gaia/v11/x/globalfee"
137139 "github.com/cosmos/ibc-go/modules/capability"
@@ -150,8 +152,8 @@ import (
150152 ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
151153 ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
152154
153- ibcratelimitkeeper "github.com/neutron-org/neutron/v8 /x/ibc-rate-limit/keeper"
154- ibcratelimittypes "github.com/neutron-org/neutron/v8 /x/ibc-rate-limit/types"
155+ ibcratelimitkeeper "github.com/neutron-org/neutron/v9 /x/ibc-rate-limit/keeper"
156+ ibcratelimittypes "github.com/neutron-org/neutron/v9 /x/ibc-rate-limit/types"
155157
156158 //nolint:staticcheck
157159 ibcporttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
@@ -162,12 +164,15 @@ import (
162164
163165 govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
164166
165- cronkeeper "github.com/neutron-org/neutron/v8 /x/cron/keeper"
166- crontypes "github.com/neutron-org/neutron/v8 /x/cron/types"
167+ cronkeeper "github.com/neutron-org/neutron/v9 /x/cron/keeper"
168+ crontypes "github.com/neutron-org/neutron/v9 /x/cron/types"
167169
168- "github.com/neutron-org/neutron/v8/x/tokenfactory"
169- tokenfactorykeeper "github.com/neutron-org/neutron/v8/x/tokenfactory/keeper"
170- tokenfactorytypes "github.com/neutron-org/neutron/v8/x/tokenfactory/types"
170+ coinfactorykeeper "github.com/neutron-org/neutron/v9/x/coinfactory/keeper"
171+ "github.com/neutron-org/neutron/v9/x/tokenfactory"
172+ tokenfactorykeeper "github.com/neutron-org/neutron/v9/x/tokenfactory/keeper"
173+ tokenfactorytypes "github.com/neutron-org/neutron/v9/x/tokenfactory/types"
174+
175+ coinfactorytypes "github.com/neutron-org/neutron/v9/x/coinfactory/types"
171176
172177 "github.com/cosmos/admin-module/v2/x/adminmodule"
173178 adminmodulecli "github.com/cosmos/admin-module/v2/x/adminmodule/client/cli"
@@ -176,29 +181,29 @@ import (
176181 govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
177182 govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
178183
179- appparams "github.com/neutron-org/neutron/v8 /app/params"
180- "github.com/neutron-org/neutron/v8 /wasmbinding"
181- "github.com/neutron-org/neutron/v8 /x/contractmanager"
182- contractmanagermodulekeeper "github.com/neutron-org/neutron/v8 /x/contractmanager/keeper"
183- contractmanagermoduletypes "github.com/neutron-org/neutron/v8 /x/contractmanager/types"
184- dynamicfeeskeeper "github.com/neutron-org/neutron/v8 /x/dynamicfees/keeper"
185- "github.com/neutron-org/neutron/v8 /x/feeburner"
186- feeburnerkeeper "github.com/neutron-org/neutron/v8 /x/feeburner/keeper"
187- feeburnertypes "github.com/neutron-org/neutron/v8 /x/feeburner/types"
188- "github.com/neutron-org/neutron/v8 /x/feerefunder"
189- feekeeper "github.com/neutron-org/neutron/v8 /x/feerefunder/keeper"
190- ibchooks "github.com/neutron-org/neutron/v8 /x/ibc-hooks"
191- ibchookstypes "github.com/neutron-org/neutron/v8 /x/ibc-hooks/types"
192- "github.com/neutron-org/neutron/v8 /x/interchainqueries"
193- interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v8 /x/interchainqueries/keeper"
194- interchainqueriesmoduletypes "github.com/neutron-org/neutron/v8 /x/interchainqueries/types"
195- "github.com/neutron-org/neutron/v8 /x/interchaintxs"
196- interchaintxskeeper "github.com/neutron-org/neutron/v8 /x/interchaintxs/keeper"
197- interchaintxstypes "github.com/neutron-org/neutron/v8 /x/interchaintxs/types"
198- transferSudo "github.com/neutron-org/neutron/v8 /x/transfer"
199- wrapkeeper "github.com/neutron-org/neutron/v8 /x/transfer/keeper"
200-
201- feetypes "github.com/neutron-org/neutron/v8 /x/feerefunder/types"
184+ appparams "github.com/neutron-org/neutron/v9 /app/params"
185+ "github.com/neutron-org/neutron/v9 /wasmbinding"
186+ "github.com/neutron-org/neutron/v9 /x/contractmanager"
187+ contractmanagermodulekeeper "github.com/neutron-org/neutron/v9 /x/contractmanager/keeper"
188+ contractmanagermoduletypes "github.com/neutron-org/neutron/v9 /x/contractmanager/types"
189+ dynamicfeeskeeper "github.com/neutron-org/neutron/v9 /x/dynamicfees/keeper"
190+ "github.com/neutron-org/neutron/v9 /x/feeburner"
191+ feeburnerkeeper "github.com/neutron-org/neutron/v9 /x/feeburner/keeper"
192+ feeburnertypes "github.com/neutron-org/neutron/v9 /x/feeburner/types"
193+ "github.com/neutron-org/neutron/v9 /x/feerefunder"
194+ feekeeper "github.com/neutron-org/neutron/v9 /x/feerefunder/keeper"
195+ ibchooks "github.com/neutron-org/neutron/v9 /x/ibc-hooks"
196+ ibchookstypes "github.com/neutron-org/neutron/v9 /x/ibc-hooks/types"
197+ "github.com/neutron-org/neutron/v9 /x/interchainqueries"
198+ interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v9 /x/interchainqueries/keeper"
199+ interchainqueriesmoduletypes "github.com/neutron-org/neutron/v9 /x/interchainqueries/types"
200+ "github.com/neutron-org/neutron/v9 /x/interchaintxs"
201+ interchaintxskeeper "github.com/neutron-org/neutron/v9 /x/interchaintxs/keeper"
202+ interchaintxstypes "github.com/neutron-org/neutron/v9 /x/interchaintxs/types"
203+ transferSudo "github.com/neutron-org/neutron/v9 /x/transfer"
204+ wrapkeeper "github.com/neutron-org/neutron/v9 /x/transfer/keeper"
205+
206+ feetypes "github.com/neutron-org/neutron/v9 /x/feerefunder/types"
202207
203208 storetypes "cosmossdk.io/store/types"
204209 "github.com/cosmos/cosmos-sdk/x/consensus"
@@ -207,12 +212,12 @@ import (
207212 pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
208213 pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
209214
210- "github.com/neutron-org/neutron/v8 /x/dex"
211- dexkeeper "github.com/neutron-org/neutron/v8 /x/dex/keeper"
212- dextypes "github.com/neutron-org/neutron/v8 /x/dex/types"
215+ "github.com/neutron-org/neutron/v9 /x/dex"
216+ dexkeeper "github.com/neutron-org/neutron/v9 /x/dex/keeper"
217+ dextypes "github.com/neutron-org/neutron/v9 /x/dex/types"
213218
214- globalfeekeeper "github.com/neutron-org/neutron/v8 /x/globalfee/keeper"
215- gmpmiddleware "github.com/neutron-org/neutron/v8 /x/gmp"
219+ globalfeekeeper "github.com/neutron-org/neutron/v9 /x/globalfee/keeper"
220+ gmpmiddleware "github.com/neutron-org/neutron/v9 /x/gmp"
216221
217222 // Block-sdk imports
218223 blocksdkabci "github.com/skip-mev/block-sdk/v2/abci"
@@ -225,8 +230,8 @@ import (
225230 oraclekeeper "github.com/skip-mev/slinky/x/oracle/keeper"
226231 oracletypes "github.com/skip-mev/slinky/x/oracle/types"
227232
228- harpoonkeeper "github.com/neutron-org/neutron/v8 /x/harpoon/keeper"
229- harpoontypes "github.com/neutron-org/neutron/v8 /x/harpoon/types"
233+ harpoonkeeper "github.com/neutron-org/neutron/v9 /x/harpoon/keeper"
234+ harpoontypes "github.com/neutron-org/neutron/v9 /x/harpoon/types"
230235
231236 runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
232237)
@@ -243,6 +248,7 @@ var (
243248 v800 .Upgrade ,
244249 v810 .Upgrade ,
245250 v820 .Upgrade ,
251+ v900 .Upgrade ,
246252 }
247253
248254 // DefaultNodeHome default home directories for the application daemon
@@ -271,6 +277,7 @@ var (
271277 staking.AppModuleBasic {},
272278 wasm.AppModuleBasic {},
273279 tokenfactory.AppModuleBasic {},
280+ coinfactory.AppModuleBasic {},
274281 interchainqueries.AppModuleBasic {},
275282 interchaintxs.AppModuleBasic {},
276283 feerefunder.AppModuleBasic {},
@@ -314,6 +321,7 @@ var (
314321 stakingtypes .BondedPoolName : {authtypes .Burner , authtypes .Staking },
315322 stakingtypes .NotBondedPoolName : {authtypes .Burner , authtypes .Staking },
316323 tokenfactorytypes .ModuleName : {authtypes .Minter , authtypes .Burner },
324+ coinfactorytypes .ModuleName : {authtypes .Minter , authtypes .Burner },
317325 crontypes .ModuleName : nil ,
318326 dextypes .ModuleName : {authtypes .Minter , authtypes .Burner },
319327 oracletypes .ModuleName : nil ,
@@ -386,6 +394,7 @@ type App struct {
386394 FeeBurnerKeeper * feeburnerkeeper.Keeper
387395 StakingKeeper * stakingkeeper.Keeper
388396 TokenFactoryKeeper * tokenfactorykeeper.Keeper
397+ CoinfactoryKeeper * coinfactorykeeper.Keeper
389398 CronKeeper cronkeeper.Keeper
390399 PFMKeeper * pfmkeeper.Keeper
391400 DexKeeper dexkeeper.Keeper
@@ -493,7 +502,7 @@ func New(
493502 evidencetypes .StoreKey , ibctransfertypes .StoreKey , icacontrollertypes .StoreKey ,
494503 icahosttypes .StoreKey , capabilitytypes .StoreKey ,
495504 interchainqueriesmoduletypes .StoreKey , contractmanagermoduletypes .StoreKey , interchaintxstypes .StoreKey , wasmtypes .StoreKey , feetypes .StoreKey ,
496- feeburnertypes .StoreKey , adminmoduletypes .StoreKey , tokenfactorytypes .StoreKey , pfmtypes .StoreKey ,
505+ feeburnertypes .StoreKey , adminmoduletypes .StoreKey , tokenfactorytypes .StoreKey , coinfactorytypes . StoreKey , pfmtypes .StoreKey ,
497506 crontypes .StoreKey , ibchookstypes .StoreKey , consensusparamtypes .StoreKey , crisistypes .StoreKey , dextypes .StoreKey ,
498507 oracletypes .StoreKey , marketmaptypes .StoreKey , feemarkettypes .StoreKey , dynamicfeestypes .StoreKey , globalfeetypes .StoreKey , stakingtypes .StoreKey ,
499508 ibcratelimittypes .ModuleName , harpoontypes .StoreKey , revenuetypes .StoreKey , stateverifiertypes .StoreKey ,
@@ -630,6 +639,17 @@ func New(
630639 )
631640 app .TokenFactoryKeeper = & tokenFactoryKeeper
632641
642+ coinfactoryKeeper := coinfactorykeeper .NewKeeper (
643+ appCodec ,
644+ app .keys [coinfactorytypes .StoreKey ],
645+ maccPerms ,
646+ app .AccountKeeper ,
647+ & app .BankKeeper ,
648+ & app .WasmKeeper ,
649+ authtypes .NewModuleAddress (adminmoduletypes .ModuleName ).String (),
650+ )
651+ app .CoinfactoryKeeper = & coinfactoryKeeper
652+
633653 app .WireICS20PreWasmKeeper (appCodec )
634654 app .PFMModule = packetforward .NewAppModule (app .PFMKeeper , app .GetSubspace (pfmtypes .ModuleName ))
635655
@@ -678,6 +698,7 @@ func New(
678698 app .BankKeeper .BaseSendKeeper = app .BankKeeper .BaseSendKeeper .SetHooks (
679699 banktypes .NewMultiBankHooks (
680700 app .TokenFactoryKeeper .Hooks (),
701+ app .CoinfactoryKeeper .Hooks (),
681702 ))
682703
683704 app .DexKeeper = * dexkeeper .NewKeeper (
@@ -907,6 +928,7 @@ func New(
907928 ibcHooksModule ,
908929 revenue .NewAppModule (appCodec , app .RevenueKeeper ),
909930 tokenfactory .NewAppModule (appCodec , * app .TokenFactoryKeeper , app .AccountKeeper , app .BankKeeper ),
931+ coinfactory .NewAppModule (appCodec , * app .CoinfactoryKeeper , app .AccountKeeper , app .BankKeeper ),
910932 cronModule ,
911933 globalfee .NewAppModule (app .GlobalFeeKeeper , app .GetSubspace (globalfee .ModuleName ), app .AppCodec (), app .keys [globalfee .ModuleName ]),
912934 feemarket .NewAppModule (appCodec , * app .FeeMarkerKeeper ),
@@ -945,6 +967,7 @@ func New(
945967 paramstypes .ModuleName ,
946968 stakingtypes .ModuleName ,
947969 tokenfactorytypes .ModuleName ,
970+ coinfactorytypes .ModuleName ,
948971 icatypes .ModuleName ,
949972 interchainqueriesmoduletypes .ModuleName ,
950973 interchaintxstypes .ModuleName ,
@@ -983,6 +1006,7 @@ func New(
9831006 ibctransfertypes .ModuleName ,
9841007 stakingtypes .ModuleName ,
9851008 tokenfactorytypes .ModuleName ,
1009+ coinfactorytypes .ModuleName ,
9861010 icatypes .ModuleName ,
9871011 interchainqueriesmoduletypes .ModuleName ,
9881012 interchaintxstypes .ModuleName ,
@@ -1029,6 +1053,7 @@ func New(
10291053 slashingtypes .ModuleName ,
10301054 genutiltypes .ModuleName ,
10311055 tokenfactorytypes .ModuleName ,
1056+ coinfactorytypes .ModuleName ,
10321057 icatypes .ModuleName ,
10331058 interchainqueriesmoduletypes .ModuleName ,
10341059 interchaintxstypes .ModuleName ,
@@ -1588,6 +1613,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
15881613 paramsKeeper .Subspace (feeburnertypes .StoreKey ).WithKeyTable (feeburnertypes .ParamKeyTable ())
15891614 paramsKeeper .Subspace (feetypes .StoreKey ).WithKeyTable (feetypes .ParamKeyTable ())
15901615 paramsKeeper .Subspace (tokenfactorytypes .StoreKey ).WithKeyTable (tokenfactorytypes .ParamKeyTable ())
1616+ paramsKeeper .Subspace (coinfactorytypes .StoreKey ).WithKeyTable (coinfactorytypes .ParamKeyTable ())
15911617 paramsKeeper .Subspace (interchainqueriesmoduletypes .StoreKey ).WithKeyTable (interchainqueriesmoduletypes .ParamKeyTable ())
15921618 paramsKeeper .Subspace (interchaintxstypes .StoreKey ).WithKeyTable (interchaintxstypes .ParamKeyTable ())
15931619
@@ -1715,6 +1741,7 @@ func (app *App) WireICS20PreWasmKeeper(
17151741 app .TransferKeeper ,
17161742 contractmanager .NewSudoLimitWrapper (app .ContractManagerKeeper , & app .WasmKeeper ),
17171743 app .TokenFactoryKeeper ,
1744+ app .CoinfactoryKeeper ,
17181745 ),
17191746 app .PFMKeeper ,
17201747 0 ,
0 commit comments