From 8eb9e78864bd96b082eb222fb1bc3d582b64740d Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Wed, 11 Jan 2023 18:22:54 +0100 Subject: [PATCH 01/15] fix: remove duplicates of ica module --- app/modules.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/modules.go b/app/modules.go index 7cd4f679a08..236ae109d92 100644 --- a/app/modules.go +++ b/app/modules.go @@ -193,7 +193,6 @@ func orderBeginBlockers() []string { feegrant.ModuleName, paramstypes.ModuleName, vestingtypes.ModuleName, - icatypes.ModuleName, globalfee.ModuleName, } } @@ -221,7 +220,6 @@ func orderEndBlockers() []string { paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, - icatypes.ModuleName, globalfee.ModuleName, } } @@ -246,7 +244,6 @@ func orderInitBlockers() []string { authz.ModuleName, feegrant.ModuleName, routertypes.ModuleName, - icatypes.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, From c319f69d73a77d8f56d3998969663627213fbaae Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 11:06:52 +0100 Subject: [PATCH 02/15] Remove ICAController --- app/keepers/keepers.go | 34 ++++++++++------------------------ app/keepers/keys.go | 3 +-- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index fb09617ba2d..0ade11ebb9d 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -40,8 +40,6 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" - icacontrollerkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types" icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host" icahostkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/keeper" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" @@ -85,14 +83,13 @@ type AppKeepers struct { UpgradeKeeper upgradekeeper.Keeper ParamsKeeper paramskeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly - IBCKeeper *ibckeeper.Keeper - ICAControllerKeeper icacontrollerkeeper.Keeper - ICAHostKeeper icahostkeeper.Keeper - EvidenceKeeper evidencekeeper.Keeper - TransferKeeper ibctransferkeeper.Keeper - FeeGrantKeeper feegrantkeeper.Keeper - AuthzKeeper authzkeeper.Keeper - LiquidityKeeper liquiditykeeper.Keeper + IBCKeeper *ibckeeper.Keeper + ICAHostKeeper icahostkeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + TransferKeeper ibctransferkeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + AuthzKeeper authzkeeper.Keeper + LiquidityKeeper liquiditykeeper.Keeper RouterKeeper routerkeeper.Keeper @@ -102,10 +99,9 @@ type AppKeepers struct { RouterModule router.AppModule // make scoped keepers public for test purposes - ScopedIBCKeeper capabilitykeeper.ScopedKeeper - ScopedTransferKeeper capabilitykeeper.ScopedKeeper - ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper - ScopedICAHostKeeper capabilitykeeper.ScopedKeeper + ScopedIBCKeeper capabilitykeeper.ScopedKeeper + ScopedTransferKeeper capabilitykeeper.ScopedKeeper + ScopedICAHostKeeper capabilitykeeper.ScopedKeeper } func NewAppKeeper( @@ -147,7 +143,6 @@ func NewAppKeeper( appKeepers.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, appKeepers.keys[capabilitytypes.StoreKey], appKeepers.memKeys[capabilitytypes.MemStoreKey]) appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) - appKeepers.ScopedICAControllerKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) appKeepers.ScopedICAHostKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) appKeepers.CapabilityKeeper.Seal() @@ -291,13 +286,6 @@ func NewAppKeeper( appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper) transferIBCModule := transfer.NewIBCModule(appKeepers.TransferKeeper) - appKeepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( - appCodec, appKeepers.keys[icacontrollertypes.StoreKey], appKeepers.GetSubspace(icacontrollertypes.SubModuleName), - appKeepers.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 fee - appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, - appKeepers.ScopedICAControllerKeeper, bApp.MsgServiceRouter(), - ) - appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper( appCodec, appKeepers.keys[icahosttypes.StoreKey], appKeepers.GetSubspace(icahosttypes.SubModuleName), @@ -308,7 +296,6 @@ func NewAppKeeper( bApp.MsgServiceRouter(), ) - appKeepers.ICAModule = ica.NewAppModule(&appKeepers.ICAControllerKeeper, &appKeepers.ICAHostKeeper) icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper) appKeepers.RouterKeeper = routerkeeper.NewKeeper( @@ -363,7 +350,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ibchost.ModuleName) paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable()) - paramsKeeper.Subspace(icacontrollertypes.SubModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(globalfee.ModuleName) diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 0b5791db520..7d5e9a214b6 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -16,7 +16,6 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host" @@ -33,7 +32,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, evidencetypes.StoreKey, liquiditytypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey, feegrant.StoreKey, authzkeeper.StoreKey, routertypes.StoreKey, - icacontrollertypes.StoreKey, icahosttypes.StoreKey, + icahosttypes.StoreKey, ) // Define transient store keys From 637b903af4d816e4adae292f95cc67237431da5c Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 18:35:11 +0100 Subject: [PATCH 03/15] Add back ica new module config --- app/keepers/keepers.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 0ade11ebb9d..20520ba8bfa 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -296,6 +296,7 @@ func NewAppKeeper( bApp.MsgServiceRouter(), ) + appKeepers.ICAModule = ica.NewAppModule(nil, &appKeepers.ICAHostKeeper) icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper) appKeepers.RouterKeeper = routerkeeper.NewKeeper( From a5e66d62cfec798cc3884273585495b3e1dc065c Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 18:43:43 +0100 Subject: [PATCH 04/15] Move migration run to end of upgrade --- app/upgrades/v8/upgrades.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 32fc9a1d08a..8f4aeed0ada 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -2,6 +2,7 @@ package v8 import ( "errors" + "fmt" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" @@ -95,18 +96,11 @@ func CreateUpgradeHandler( keepers *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("start to run module migrations...") + ctx.Logger().Info("running upgrade fixes...") - vm, err := mm.RunMigrations(ctx, configurator, vm) + err := FixBankMetadata(ctx, keepers) if err != nil { - return vm, err - } - - ctx.Logger().Info("running the rest of the upgrade handler...") - - err = FixBankMetadata(ctx, keepers) - if err != nil { - return vm, err + ctx.Logger().Info(fmt.Sprintf("Error fixing bank metadata: %s", err.Error())) } err = QuicksilverFix(ctx, keepers) @@ -123,8 +117,14 @@ func CreateUpgradeHandler( // Update params for host & controller keepers keepers.ICAHostKeeper.SetParams(ctx, hostParams) - ctx.Logger().Info("upgrade complete") + ctx.Logger().Info("start to run module migrations...") + vm, err = mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + ctx.Logger().Info("upgrade complete") return vm, err } } From f1bb5e0877cadc75b79a2ccc560e636ee15e622f Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 21:59:03 +0100 Subject: [PATCH 05/15] Update strangelove --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 29c1e4e24a7..8bcdc4d60cf 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 - github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.0 + github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9 github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 3dbf1b276a1..3b1d6d0a076 100644 --- a/go.sum +++ b/go.sum @@ -1094,8 +1094,8 @@ github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRk github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.0 h1:V1RVRa2hga4TV//RQpk2PCt314slS3N12024TsJoJUo= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.0/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9 h1:CjWYNyfTUYBM20GkTjTog+gb8vzNf1VBDuB9GVpFQwU= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= From 92959f476a90c6bca3325b823dd304ea1bc68d9f Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 22:07:30 +0100 Subject: [PATCH 06/15] Fix pfm --- app/keepers/keepers.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 20520ba8bfa..8f336a702f7 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -284,7 +284,6 @@ func NewAppKeeper( appKeepers.ScopedTransferKeeper, ) appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper) - transferIBCModule := transfer.NewIBCModule(appKeepers.TransferKeeper) appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper( appCodec, appKeepers.keys[icahosttypes.StoreKey], @@ -306,15 +305,26 @@ func NewAppKeeper( appKeepers.IBCKeeper.ChannelKeeper, appKeepers.DistrKeeper, appKeepers.BankKeeper, + &appKeepers.IBCKeeper.PortKeeper, + appKeepers.IBCKeeper.ChannelKeeper, ) - appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper, transferIBCModule, 0, - routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp) + appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper) + + var ibcStack porttypes.IBCModule + ibcStack = transfer.NewIBCModule(appKeepers.TransferKeeper) + ibcStack = router.NewIBCMiddleware( + ibcStack, + appKeepers.RouterKeeper, + 0, + routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + ) // create static IBC router, add transfer route, then set and seal it - ibcRouter := porttypes.NewRouter() - ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). - AddRoute(ibctransfertypes.ModuleName, appKeepers.RouterModule) + ibcRouter := porttypes.NewRouter(). + AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). + AddRoute(ibctransfertypes.ModuleName, ibcStack) appKeepers.IBCKeeper.SetRouter(ibcRouter) From a460ad458fdc640b54ba852e3c50183b66988924 Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 22:22:40 +0100 Subject: [PATCH 07/15] Add sdk logging --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8bcdc4d60cf..c33d7912e62 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/cosmos/gaia/v8 go 1.18 require ( - github.com/cosmos/cosmos-sdk v0.45.11 + github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v3 v3.4.0 github.com/gogo/protobuf v1.3.3 @@ -286,7 +286,7 @@ replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 // enforce same SDK, Tendermint and IBC on all dependencies - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.11 + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 github.com/cosmos/ibc-go/v3 => github.com/cosmos/ibc-go/v3 v3.4.0 // use cosmos style protobufs diff --git a/go.sum b/go.sum index 3b1d6d0a076..95a864e8cd4 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.45.11 h1:Pc44fFEkai0KXFND5Ys/2ZJkfVdstMIBzKBN8MY7Ll0= -github.com/cosmos/cosmos-sdk v0.45.11/go.mod h1:45z8Q1Ah4iypFycu2Kl4kBPIsQKUiND8G2CUX+HTtPM= +github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 h1:7/+gN5a7qOcRhG9bKq4J9Ec45xuYIBf/IYdVI8dFWXQ= +github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572/go.mod h1:45z8Q1Ah4iypFycu2Kl4kBPIsQKUiND8G2CUX+HTtPM= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From d9de8ca30f511d6acda079da5b2782994814d08f Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 12 Jan 2023 23:37:15 +0100 Subject: [PATCH 08/15] Add fix for pfm spelling mistake --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c33d7912e62..6950328eb68 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 - github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9 + github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 95a864e8cd4..4a654b5ec32 100644 --- a/go.sum +++ b/go.sum @@ -1094,8 +1094,8 @@ github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRk github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9 h1:CjWYNyfTUYBM20GkTjTog+gb8vzNf1VBDuB9GVpFQwU= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112194700-a2292dc067c9/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f h1:KPvPxRdC7JsonEQAhTN3ArIQQ3fYcBEjdB9cDH57OxA= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= From 57bf0a5997e204c6a3d168b3716a679a4e5a7d9c Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 15:03:23 +0100 Subject: [PATCH 09/15] Update ugrade handler logging, update pfm config --- app/keepers/keepers.go | 3 ++- app/upgrades/v8/upgrades.go | 24 ++++++++++++++++-------- go.mod | 5 +++-- go.sum | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 8f336a702f7..122936d7cf5 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -272,11 +272,12 @@ func NewAppKeeper( govRouter, ) + // TODO: Confirm TransferKeeper wiring correct after strangelove backports https://github.com/strangelove-ventures/packet-forward-middleware/blob/6867bcaac00fef1267c4ea99c3cbb6ee8bc6a025/router/keeper/keeper.go#L49 appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], appKeepers.GetSubspace(ibctransfertypes.ModuleName), - appKeepers.IBCKeeper.ChannelKeeper, + appKeepers.RouterKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 8f4aeed0ada..d9205be1f82 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -17,6 +17,8 @@ import ( ) func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error { + ctx.Logger().Info("Starting fix bank metadata...") + malformedDenom := "uatomu" correctDenom := "uatom" @@ -34,32 +36,36 @@ func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error { // confirm whether the old key is still accessible _, foundMalformed = keepers.BankKeeper.GetDenomMetaData(ctx, malformedDenom) if foundMalformed { - return errors.New("malformed 'uatomu' denom not fixed") + return errors.New("Malformed 'uatomu' denom not fixed") } } // proceed with the original intention of populating the missing Name and Symbol fields atomMetaData, foundCorrect := keepers.BankKeeper.GetDenomMetaData(ctx, correctDenom) if !foundCorrect { - return errors.New("atom denom not found") + return errors.New("Atom denom not found") } atomMetaData.Name = "Cosmos Hub Atom" atomMetaData.Symbol = "ATOM" keepers.BankKeeper.SetDenomMetaData(ctx, atomMetaData) + ctx.Logger().Info("Fix bank metadata complete") + return nil } func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error { + ctx.Logger().Info("Starting fix quicksilver...") + // Refund stuck coins from ica address sourceAddress, err := sdk.AccAddressFromBech32("cosmos13dqvh4qtg4gzczuktgnw8gc2ewnwmhdwnctekxctyr4azz4dcyysecgq7e") if err != nil { - return errors.New("invalid source address") + return errors.New("Invalid source address") } destinationAddress, err := sdk.AccAddressFromBech32("cosmos1jc24kwznud9m3mwqmcz3xw33ndjuufnghstaag") if err != nil { - return errors.New("invalid destination address") + return errors.New("Invalid destination address") } // Get balance from stuck address and subtract 1 uatom sent by bad actor @@ -68,7 +74,7 @@ func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error { refundBalance := sourceBalance.SubAmount(sdk.NewInt(1)) err = keepers.BankKeeper.SendCoins(ctx, sourceAddress, destinationAddress, sdk.NewCoins(refundBalance)) if err != nil { - return errors.New("unable to refund coins") + return errors.New("Unable to refund coins") } } @@ -79,6 +85,8 @@ func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error { closeChannel(keepers, ctx, "channel-465") closeChannel(keepers, ctx, "channel-466") + ctx.Logger().Info("Fix quicksilver complete") + return nil } @@ -96,7 +104,7 @@ func CreateUpgradeHandler( keepers *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("running upgrade fixes...") + ctx.Logger().Info("Running upgrade fixes...") err := FixBankMetadata(ctx, keepers) if err != nil { @@ -117,14 +125,14 @@ func CreateUpgradeHandler( // Update params for host & controller keepers keepers.ICAHostKeeper.SetParams(ctx, hostParams) - ctx.Logger().Info("start to run module migrations...") + ctx.Logger().Info("Starting module migrations...") vm, err = mm.RunMigrations(ctx, configurator, vm) if err != nil { return vm, err } - ctx.Logger().Info("upgrade complete") + ctx.Logger().Info("Upgrade complete") return vm, err } } diff --git a/go.mod b/go.mod index 6950328eb68..4f32610e8e5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/cosmos/gaia/v8 go 1.18 require ( - github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 + github.com/cosmos/cosmos-sdk v0.45.11 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v3 v3.4.0 github.com/gogo/protobuf v1.3.3 @@ -18,6 +18,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 + // TODO: Revert to v3.0.0 once strangelove upgrade fix is merged github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 @@ -286,7 +287,7 @@ replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 // enforce same SDK, Tendermint and IBC on all dependencies - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.11 github.com/cosmos/ibc-go/v3 => github.com/cosmos/ibc-go/v3 v3.4.0 // use cosmos style protobufs diff --git a/go.sum b/go.sum index 4a654b5ec32..2c27ab34301 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572 h1:7/+gN5a7qOcRhG9bKq4J9Ec45xuYIBf/IYdVI8dFWXQ= -github.com/cosmos/cosmos-sdk v0.45.12-0.20230111125903-4163a1a01572/go.mod h1:45z8Q1Ah4iypFycu2Kl4kBPIsQKUiND8G2CUX+HTtPM= +github.com/cosmos/cosmos-sdk v0.45.11 h1:Pc44fFEkai0KXFND5Ys/2ZJkfVdstMIBzKBN8MY7Ll0= +github.com/cosmos/cosmos-sdk v0.45.11/go.mod h1:45z8Q1Ah4iypFycu2Kl4kBPIsQKUiND8G2CUX+HTtPM= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From cb13d1d05632c875288808580d4ef47292d7f7eb Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 15:45:52 +0100 Subject: [PATCH 10/15] Fix linter --- app/upgrades/v8/upgrades.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index d9205be1f82..d9762bb72f1 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -36,14 +36,14 @@ func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error { // confirm whether the old key is still accessible _, foundMalformed = keepers.BankKeeper.GetDenomMetaData(ctx, malformedDenom) if foundMalformed { - return errors.New("Malformed 'uatomu' denom not fixed") + return errors.New("malformed 'uatomu' denom not fixed") } } // proceed with the original intention of populating the missing Name and Symbol fields atomMetaData, foundCorrect := keepers.BankKeeper.GetDenomMetaData(ctx, correctDenom) if !foundCorrect { - return errors.New("Atom denom not found") + return errors.New("atom denom not found") } atomMetaData.Name = "Cosmos Hub Atom" @@ -61,11 +61,11 @@ func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error { // Refund stuck coins from ica address sourceAddress, err := sdk.AccAddressFromBech32("cosmos13dqvh4qtg4gzczuktgnw8gc2ewnwmhdwnctekxctyr4azz4dcyysecgq7e") if err != nil { - return errors.New("Invalid source address") + return errors.New("invalid source address") } destinationAddress, err := sdk.AccAddressFromBech32("cosmos1jc24kwznud9m3mwqmcz3xw33ndjuufnghstaag") if err != nil { - return errors.New("Invalid destination address") + return errors.New("invalid destination address") } // Get balance from stuck address and subtract 1 uatom sent by bad actor @@ -74,7 +74,7 @@ func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error { refundBalance := sourceBalance.SubAmount(sdk.NewInt(1)) err = keepers.BankKeeper.SendCoins(ctx, sourceAddress, destinationAddress, sdk.NewCoins(refundBalance)) if err != nil { - return errors.New("Unable to refund coins") + return errors.New("unable to refund coins") } } @@ -108,7 +108,7 @@ func CreateUpgradeHandler( err := FixBankMetadata(ctx, keepers) if err != nil { - ctx.Logger().Info(fmt.Sprintf("Error fixing bank metadata: %s", err.Error())) + ctx.Logger().Info(fmt.Sprintf("error fixing bank metadata: %s", err.Error())) } err = QuicksilverFix(ctx, keepers) From 69656482fd1a47e6ca3c26fe6eb72243ad8b36f3 Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 18:27:37 +0100 Subject: [PATCH 11/15] Update pfm --- go.mod | 3 +-- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 4f32610e8e5..14a3a660a02 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 - // TODO: Revert to v3.0.0 once strangelove upgrade fix is merged - github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f + github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0 github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 2c27ab34301..e1f5d7091ae 100644 --- a/go.sum +++ b/go.sum @@ -1094,8 +1094,8 @@ github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRk github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f h1:KPvPxRdC7JsonEQAhTN3ArIQQ3fYcBEjdB9cDH57OxA= -github.com/strangelove-ventures/packet-forward-middleware/v3 v3.0.1-0.20230112214109-6867bcaac00f/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0 h1:EeEeCAXbNhJtO8Q++C9ZSxLs+MjygsKRK7FiScNHe1E= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= From cbccfa170811a4d4854ac881a645a0667fb69da4 Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 18:41:00 +0100 Subject: [PATCH 12/15] Update TransferKeeper to pass ChannelKeeper instead of RouterKeeper --- app/keepers/keepers.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 122936d7cf5..8f336a702f7 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -272,12 +272,11 @@ func NewAppKeeper( govRouter, ) - // TODO: Confirm TransferKeeper wiring correct after strangelove backports https://github.com/strangelove-ventures/packet-forward-middleware/blob/6867bcaac00fef1267c4ea99c3cbb6ee8bc6a025/router/keeper/keeper.go#L49 appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], appKeepers.GetSubspace(ibctransfertypes.ModuleName), - appKeepers.RouterKeeper, + appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, From c0e494ac77166fd8a61852ab83390ba79acd479f Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 18:50:37 +0100 Subject: [PATCH 13/15] Update pfm config --- app/keepers/keepers.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 8f336a702f7..3739b029fd0 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -91,7 +91,7 @@ type AppKeepers struct { AuthzKeeper authzkeeper.Keeper LiquidityKeeper liquiditykeeper.Keeper - RouterKeeper routerkeeper.Keeper + RouterKeeper *routerkeeper.Keeper // Modules ICAModule ica.AppModule @@ -276,7 +276,7 @@ func NewAppKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], appKeepers.GetSubspace(ibctransfertypes.ModuleName), - appKeepers.IBCKeeper.ChannelKeeper, + *appKeepers.RouterKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, @@ -298,7 +298,7 @@ func NewAppKeeper( appKeepers.ICAModule = ica.NewAppModule(nil, &appKeepers.ICAHostKeeper) icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper) - appKeepers.RouterKeeper = routerkeeper.NewKeeper( + *appKeepers.RouterKeeper = routerkeeper.NewKeeper( appCodec, appKeepers.keys[routertypes.StoreKey], appKeepers.GetSubspace(routertypes.ModuleName), appKeepers.TransferKeeper, @@ -309,13 +309,13 @@ func NewAppKeeper( appKeepers.IBCKeeper.ChannelKeeper, ) - appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper) + appKeepers.RouterModule = router.NewAppModule(*appKeepers.RouterKeeper) var ibcStack porttypes.IBCModule ibcStack = transfer.NewIBCModule(appKeepers.TransferKeeper) ibcStack = router.NewIBCMiddleware( ibcStack, - appKeepers.RouterKeeper, + *appKeepers.RouterKeeper, 0, routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, From c36d045464f1eae3879b165c9c2dfeb8c510dc45 Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 19:05:04 +0100 Subject: [PATCH 14/15] Update --- app/keepers/keepers.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 3739b029fd0..79a23c53969 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -91,7 +91,7 @@ type AppKeepers struct { AuthzKeeper authzkeeper.Keeper LiquidityKeeper liquiditykeeper.Keeper - RouterKeeper *routerkeeper.Keeper + RouterKeeper routerkeeper.Keeper // Modules ICAModule ica.AppModule @@ -272,11 +272,12 @@ func NewAppKeeper( govRouter, ) + // TODO: Confirm TransferKeeper wiring correct after strangelove backports https://github.com/strangelove-ventures/packet-forward-middleware/blob/6867bcaac00fef1267c4ea99c3cbb6ee8bc6a025/router/keeper/keeper.go#L49 appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], appKeepers.GetSubspace(ibctransfertypes.ModuleName), - *appKeepers.RouterKeeper, + appKeepers.RouterKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, @@ -298,7 +299,7 @@ func NewAppKeeper( appKeepers.ICAModule = ica.NewAppModule(nil, &appKeepers.ICAHostKeeper) icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper) - *appKeepers.RouterKeeper = routerkeeper.NewKeeper( + appKeepers.RouterKeeper = routerkeeper.NewKeeper( appCodec, appKeepers.keys[routertypes.StoreKey], appKeepers.GetSubspace(routertypes.ModuleName), appKeepers.TransferKeeper, @@ -309,13 +310,13 @@ func NewAppKeeper( appKeepers.IBCKeeper.ChannelKeeper, ) - appKeepers.RouterModule = router.NewAppModule(*appKeepers.RouterKeeper) + appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper) var ibcStack porttypes.IBCModule ibcStack = transfer.NewIBCModule(appKeepers.TransferKeeper) ibcStack = router.NewIBCMiddleware( ibcStack, - *appKeepers.RouterKeeper, + appKeepers.RouterKeeper, 0, routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, @@ -367,12 +368,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino return paramsKeeper } -// TODO: find out why GetStakingKeeper was being written here, -// // GetStakingKeeper implements the TestingApp interface. -// func (appKeepers *AppKeepers) GetStakingKeeper() ibctestingtypes.StakingKeeper { -// return appKeepers.StakingKeeper -// } - // GetIBCKeeper implements the TestingApp interface. func (appKeepers *AppKeepers) GetIBCKeeper() *ibckeeper.Keeper { return appKeepers.IBCKeeper From 3fb8b0f6c19439a1892a523ed048584233d065de Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 13 Jan 2023 19:46:04 +0100 Subject: [PATCH 15/15] Fix pfm again --- app/keepers/keepers.go | 31 +++++++++++++++++-------------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 79a23c53969..1578a466972 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -272,18 +272,32 @@ func NewAppKeeper( govRouter, ) - // TODO: Confirm TransferKeeper wiring correct after strangelove backports https://github.com/strangelove-ventures/packet-forward-middleware/blob/6867bcaac00fef1267c4ea99c3cbb6ee8bc6a025/router/keeper/keeper.go#L49 + // RouterKeeper must be created before TransferKeeper + appKeepers.RouterKeeper = *routerkeeper.NewKeeper( + appCodec, appKeepers.keys[routertypes.StoreKey], + appKeepers.GetSubspace(routertypes.ModuleName), + appKeepers.TransferKeeper, + appKeepers.IBCKeeper.ChannelKeeper, + appKeepers.DistrKeeper, + appKeepers.BankKeeper, + &appKeepers.IBCKeeper.PortKeeper, + appKeepers.IBCKeeper.ChannelKeeper, + ) + appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], appKeepers.GetSubspace(ibctransfertypes.ModuleName), - appKeepers.RouterKeeper, + &appKeepers.RouterKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.ScopedTransferKeeper, ) + + appKeepers.RouterKeeper.SetTransferKeeper(appKeepers.TransferKeeper) + appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper) appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper( @@ -299,24 +313,13 @@ func NewAppKeeper( appKeepers.ICAModule = ica.NewAppModule(nil, &appKeepers.ICAHostKeeper) icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper) - appKeepers.RouterKeeper = routerkeeper.NewKeeper( - appCodec, appKeepers.keys[routertypes.StoreKey], - appKeepers.GetSubspace(routertypes.ModuleName), - appKeepers.TransferKeeper, - appKeepers.IBCKeeper.ChannelKeeper, - appKeepers.DistrKeeper, - appKeepers.BankKeeper, - &appKeepers.IBCKeeper.PortKeeper, - appKeepers.IBCKeeper.ChannelKeeper, - ) - appKeepers.RouterModule = router.NewAppModule(appKeepers.RouterKeeper) var ibcStack porttypes.IBCModule ibcStack = transfer.NewIBCModule(appKeepers.TransferKeeper) ibcStack = router.NewIBCMiddleware( ibcStack, - appKeepers.RouterKeeper, + &appKeepers.RouterKeeper, 0, routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp, diff --git a/go.mod b/go.mod index 14a3a660a02..150c3f95174 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 - github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0 + github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.1-0.20230113180046-4fb516ae522e github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index e1f5d7091ae..f2d6c355dc1 100644 --- a/go.sum +++ b/go.sum @@ -1096,6 +1096,8 @@ github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0 h1:EeEeCAXbNhJtO8Q++C9ZSxLs+MjygsKRK7FiScNHe1E= github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.0/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.1-0.20230113180046-4fb516ae522e h1:qdK0r0xRSZjWTn5g6ORLKBZcQ/vyQxJC1vZTW9ogVl4= +github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.1-0.20230113180046-4fb516ae522e/go.mod h1:sRBHb6KwuHQVc07vy8Ice9wUKVdvzn7eEms9scr2Zco= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=