@@ -78,40 +78,37 @@ import (
78
78
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
79
79
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
80
80
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
81
- ica "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts"
82
- icacontroller "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/controller"
83
- icacontrollerkeeper "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/controller/keeper"
84
- icacontrollertypes "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/controller/types"
85
- icahost "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/host"
86
- icahostkeeper "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/host/keeper"
87
- icahosttypes "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/host/types"
88
- icatypes "github.com/cosmos/ibc-go/v3 /modules/apps/27-interchain-accounts/types"
89
- "github.com/cosmos/ibc-go/v3 /modules/apps/transfer"
90
- ibctransferkeeper "github.com/cosmos/ibc-go/v3 /modules/apps/transfer/keeper"
91
- ibctransfertypes "github.com/cosmos/ibc-go/v3 /modules/apps/transfer/types"
92
- ibc "github.com/cosmos/ibc-go/v3 /modules/core"
93
- ibcclient "github.com/cosmos/ibc-go/v3 /modules/core/02-client"
94
- ibcclientclient "github.com/cosmos/ibc-go/v3 /modules/core/02-client/client"
95
- ibcclienttypes "github.com/cosmos/ibc-go/v3 /modules/core/02-client/types"
96
- porttypes "github.com/cosmos/ibc-go/v3 /modules/core/05-port/types"
97
- ibchost "github.com/cosmos/ibc-go/v3 /modules/core/24-host"
98
- ibckeeper "github.com/cosmos/ibc-go/v3 /modules/core/keeper"
99
- ibctesting "github.com/cosmos/ibc-go/v3 /testing"
81
+ ica "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts"
82
+ icacontroller "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/controller"
83
+ icacontrollerkeeper "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/controller/keeper"
84
+ icacontrollertypes "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/controller/types"
85
+ icahost "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/host"
86
+ icahostkeeper "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/host/keeper"
87
+ icahosttypes "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/host/types"
88
+ icatypes "github.com/cosmos/ibc-go/v4 /modules/apps/27-interchain-accounts/types"
89
+ "github.com/cosmos/ibc-go/v4 /modules/apps/transfer"
90
+ ibctransferkeeper "github.com/cosmos/ibc-go/v4 /modules/apps/transfer/keeper"
91
+ ibctransfertypes "github.com/cosmos/ibc-go/v4 /modules/apps/transfer/types"
92
+ ibc "github.com/cosmos/ibc-go/v4 /modules/core"
93
+ ibcclient "github.com/cosmos/ibc-go/v4 /modules/core/02-client"
94
+ ibcclientclient "github.com/cosmos/ibc-go/v4 /modules/core/02-client/client"
95
+ ibcclienttypes "github.com/cosmos/ibc-go/v4 /modules/core/02-client/types"
96
+ porttypes "github.com/cosmos/ibc-go/v4 /modules/core/05-port/types"
97
+ ibchost "github.com/cosmos/ibc-go/v4 /modules/core/24-host"
98
+ ibckeeper "github.com/cosmos/ibc-go/v4 /modules/core/keeper"
99
+ ibctesting "github.com/cosmos/ibc-go/v4 /testing"
100
100
"github.com/gorilla/mux"
101
- "github.com/persistenceOne/persistence-sdk/x/epochs"
102
- epochskeeper "github.com/persistenceOne/persistence-sdk/x/epochs/keeper"
103
- epochstypes "github.com/persistenceOne/persistence-sdk/x/epochs/types"
104
- "github.com/persistenceOne/persistence-sdk/x/ibchooker"
105
- ibchookerkeeper "github.com/persistenceOne/persistence-sdk/x/ibchooker/keeper"
106
- ibchookertypes "github.com/persistenceOne/persistence-sdk/x/ibchooker/types"
107
- "github.com/persistenceOne/persistence-sdk/x/interchainquery"
108
- interchainquerykeeper "github.com/persistenceOne/persistence-sdk/x/interchainquery/keeper"
109
- interchainquerytypes "github.com/persistenceOne/persistence-sdk/x/interchainquery/types"
101
+ "github.com/persistenceOne/persistence-sdk/v2/ x/epochs"
102
+ epochskeeper "github.com/persistenceOne/persistence-sdk/v2/ x/epochs/keeper"
103
+ epochstypes "github.com/persistenceOne/persistence-sdk/v2/ x/epochs/types"
104
+ "github.com/persistenceOne/persistence-sdk/v2/ x/ibchooker"
105
+ ibchookerkeeper "github.com/persistenceOne/persistence-sdk/v2/ x/ibchooker/keeper"
106
+ ibchookertypes "github.com/persistenceOne/persistence-sdk/v2/ x/ibchooker/types"
107
+ "github.com/persistenceOne/persistence-sdk/v2/ x/interchainquery"
108
+ interchainquerykeeper "github.com/persistenceOne/persistence-sdk/v2/ x/interchainquery/keeper"
109
+ interchainquerytypes "github.com/persistenceOne/persistence-sdk/v2/ x/interchainquery/types"
110
110
"github.com/rakyll/statik/fs"
111
111
"github.com/spf13/cast"
112
- "github.com/strangelove-ventures/packet-forward-middleware/v2/router"
113
- routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v2/router/keeper"
114
- routertypes "github.com/strangelove-ventures/packet-forward-middleware/v2/router/types"
115
112
abci "github.com/tendermint/tendermint/abci/types"
116
113
tmjson "github.com/tendermint/tendermint/libs/json"
117
114
"github.com/tendermint/tendermint/libs/log"
@@ -164,7 +161,6 @@ var (
164
161
transfer.AppModuleBasic {},
165
162
ibchooker.AppModuleBasic {},
166
163
vesting.AppModuleBasic {},
167
- router.AppModuleBasic {},
168
164
ica.AppModuleBasic {},
169
165
epochs.AppModuleBasic {},
170
166
lscosmos.AppModuleBasic {},
@@ -239,7 +235,6 @@ type PstakeApp struct {
239
235
TransferHooksKeeper ibchookerkeeper.Keeper
240
236
FeeGrantKeeper feegrantkeeper.Keeper
241
237
AuthzKeeper authzkeeper.Keeper
242
- RouterKeeper routerkeeper.Keeper
243
238
EpochsKeeper epochskeeper.Keeper
244
239
LSCosmosKeeper lscosmoskeeper.Keeper
245
240
InterchainQueryKeeper interchainquerykeeper.Keeper
@@ -294,7 +289,7 @@ func NewpStakeApp(
294
289
minttypes .StoreKey , distrtypes .StoreKey , slashingtypes .StoreKey ,
295
290
govtypes .StoreKey , paramstypes .StoreKey , ibchost .StoreKey , upgradetypes .StoreKey ,
296
291
evidencetypes .StoreKey , ibctransfertypes .StoreKey ,
297
- capabilitytypes .StoreKey , feegrant .StoreKey , authzkeeper .StoreKey , routertypes . StoreKey , icahosttypes .StoreKey ,
292
+ capabilitytypes .StoreKey , feegrant .StoreKey , authzkeeper .StoreKey , icahosttypes .StoreKey ,
298
293
icacontrollertypes .StoreKey , epochstypes .StoreKey , lscosmostypes .StoreKey , interchainquerytypes .StoreKey ,
299
294
)
300
295
tkeys := sdk .NewTransientStoreKeys (paramstypes .TStoreKey )
@@ -396,7 +391,6 @@ func NewpStakeApp(
396
391
authtypes .FeeCollectorName ,
397
392
)
398
393
epochsKeeper := * epochskeeper .NewKeeper (
399
- appCodec ,
400
394
keys [epochstypes .StoreKey ],
401
395
)
402
396
@@ -484,15 +478,13 @@ func NewpStakeApp(
484
478
app .TransferHooksKeeper = * ibcTransferHooksKeeper .SetHooks (ibchookertypes .NewMultiStakingHooks (app .LSCosmosKeeper .NewIBCTransferHooks ()))
485
479
ibcTransferHooksMiddleware := ibchooker .NewAppModule (app .TransferHooksKeeper , transferIBCModule )
486
480
487
- app .RouterKeeper = routerkeeper .NewKeeper (appCodec , keys [routertypes .StoreKey ], app .GetSubspace (routertypes .ModuleName ), app .TransferKeeper , app .DistrKeeper )
488
-
489
481
// Information will flow: ibc-port -> icaController -> lscosmos.
490
482
lscosmosModule := lscosmos .NewAppModule (appCodec , app .LSCosmosKeeper , app .AccountKeeper , app .BankKeeper )
491
- icaControllerIBCModule := icacontroller .NewIBCModule ( app .ICAControllerKeeper , lscosmosModule )
483
+ icaControllerIBCModule := icacontroller .NewIBCMiddleware ( lscosmosModule , app .ICAControllerKeeper )
492
484
493
485
// This module is not being used for any routing, can be removed, only part of ModuleManager.
494
486
// using ibcTransferHooksMiddleware instead.
495
- routerModule := router .NewAppModule (app .RouterKeeper , transferIBCModule )
487
+ // routerModule := router.NewAppModule(app.RouterKeeper, transferIBCModule)
496
488
// create static IBC router, add transfer route, then set and seal it
497
489
ibcRouter := porttypes .NewRouter ()
498
490
ibcRouter .AddRoute (icahosttypes .SubModuleName , icaHostIBCModule ).
@@ -567,7 +559,6 @@ func NewpStakeApp(
567
559
transferModule ,
568
560
ibcTransferHooksMiddleware ,
569
561
icaModule ,
570
- routerModule ,
571
562
lscosmosModule ,
572
563
interchainQueryModule ,
573
564
)
@@ -587,7 +578,6 @@ func NewpStakeApp(
587
578
ibctransfertypes .ModuleName ,
588
579
ibchost .ModuleName ,
589
580
icatypes .ModuleName ,
590
- routertypes .ModuleName ,
591
581
lscosmostypes .ModuleName ,
592
582
epochstypes .ModuleName ,
593
583
authtypes .ModuleName ,
@@ -611,7 +601,6 @@ func NewpStakeApp(
611
601
ibctransfertypes .ModuleName ,
612
602
ibchost .ModuleName ,
613
603
icatypes .ModuleName ,
614
- routertypes .ModuleName ,
615
604
feegrant .ModuleName ,
616
605
authz .ModuleName ,
617
606
lscosmostypes .ModuleName ,
@@ -654,7 +643,6 @@ func NewpStakeApp(
654
643
feegrant .ModuleName ,
655
644
authz .ModuleName ,
656
645
genutiltypes .ModuleName ,
657
- routertypes .ModuleName ,
658
646
lscosmostypes .ModuleName ,
659
647
epochstypes .ModuleName ,
660
648
paramstypes .ModuleName ,
@@ -919,7 +907,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
919
907
paramsKeeper .Subspace (ibchost .ModuleName )
920
908
paramsKeeper .Subspace (icacontrollertypes .SubModuleName )
921
909
paramsKeeper .Subspace (icahosttypes .SubModuleName )
922
- paramsKeeper .Subspace (routertypes .ModuleName ).WithKeyTable (routertypes .ParamKeyTable ())
923
910
paramsKeeper .Subspace (lscosmostypes .ModuleName )
924
911
paramsKeeper .Subspace (interchainquerytypes .ModuleName )
925
912
0 commit comments