diff --git a/app/app.go b/app/app.go index 0772f0f59..f3c6b4f7a 100644 --- a/app/app.go +++ b/app/app.go @@ -1583,8 +1583,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable()) paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable()) - paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable()) - paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable()) paramsKeeper.Subspace(ccvconsumertypes.ModuleName).WithKeyTable(ccv.ParamKeyTable()) @@ -1676,7 +1674,6 @@ func (app *App) WireICS20PreWasmKeeper( app.keys[pfmtypes.StoreKey], app.TransferKeeper.Keeper, // set later app.IBCKeeper.ChannelKeeper, - app.FeeBurnerKeeper, &app.BankKeeper, app.IBCKeeper.ChannelKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), @@ -1731,7 +1728,6 @@ func (app *App) WireICS20PreWasmKeeper( app.PFMKeeper, 0, pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, ) ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 646f9d890..860c756a1 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -11,7 +11,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck @@ -84,7 +83,6 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *banktypes.MsgUpdateParams, *crisistypes.MsgUpdateParams, *minttypes.MsgUpdateParams, - *pfmtypes.MsgUpdateParams, *marketmaptypes.MsgCreateMarkets, *marketmaptypes.MsgUpdateMarkets, *marketmaptypes.MsgRemoveMarketAuthorities, diff --git a/go.mod b/go.mod index 9bda83be9..a87e17787 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.50.11 github.com/cosmos/gogoproto v1.7.0 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.0 github.com/cosmos/ibc-go/modules/capability v1.0.1 github.com/cosmos/ibc-go/v8 v8.5.2 github.com/cosmos/ics23/go v0.11.0 diff --git a/go.sum b/go.sum index 88cb3012c..620f6ddb8 100644 --- a/go.sum +++ b/go.sum @@ -367,8 +367,8 @@ github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fr github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= github.com/cosmos/iavl v1.2.0 h1:kVxTmjTh4k0Dh1VNL046v6BXqKziqMDzxo93oh3kOfM= github.com/cosmos/iavl v1.2.0/go.mod h1:HidWWLVAtODJqFD6Hbne2Y0q3SdxByJepHUOeoH4LiI= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 h1:dyLNlDElY6+5zW/BT/dO/3Ad9FpQblfh+9dQpYQodbA= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2/go.mod h1:82hPO/tRawbuFad2gPwChvpZ0JEIoNi91LwVneAYCeM= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.0 h1:EDUzjx04MXaRPsyhrKm3m/mCdtru/JHsTBnMvMG+1aM= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.0/go.mod h1:8sbOclBgOCgBPesufd3ZlLRHvJ3dOeN9+dXhn3KbKOc= github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0f8bd h1:Lx+/5dZ/nN6qPXP2Ofog6u1fmlkCFA1ElcOconnofEM= github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0f8bd/go.mod h1:JWfpWVKJKiKtd53/KbRoKfxWl8FsT2GPcNezTOk0o5Q= github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=