From 2c7e66830582af27244852092e6b22fc0c278ec4 Mon Sep 17 00:00:00 2001 From: Chandragupta Singh Date: Wed, 13 Dec 2023 04:24:24 +0530 Subject: [PATCH] pfm security patch --- app/app.go | 6 +++--- app/upgrades/mainnet/v13/constants.go | 2 +- app/upgrades/mainnet/v13/upgrades.go | 2 +- cmd/comdex/migrate.go | 2 +- go.mod | 4 ++-- go.sum | 9 +++++---- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/app.go b/app/app.go index 9d5223c92..3b7eae529 100644 --- a/app/app.go +++ b/app/app.go @@ -24,9 +24,9 @@ import ( consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" - packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" - packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" + packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" + packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" "github.com/rakyll/statik/fs" diff --git a/app/upgrades/mainnet/v13/constants.go b/app/upgrades/mainnet/v13/constants.go index 26bd30d5c..e7356b4fa 100644 --- a/app/upgrades/mainnet/v13/constants.go +++ b/app/upgrades/mainnet/v13/constants.go @@ -1,7 +1,7 @@ package v13 const ( - UpgradeName = "v13.2.0" + UpgradeName = "v13.3.0" UpgradeHeight = "" UpgradeInfo = `'{ "binaries": { diff --git a/app/upgrades/mainnet/v13/upgrades.go b/app/upgrades/mainnet/v13/upgrades.go index 02d1350e0..f21738eed 100644 --- a/app/upgrades/mainnet/v13/upgrades.go +++ b/app/upgrades/mainnet/v13/upgrades.go @@ -41,7 +41,7 @@ func CreateUpgradeHandlerV13( auctionV2Keeper auctionV2keeper.Keeper, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - ctx.Logger().Info("Applying main net upgrade - v.13.2.0") + ctx.Logger().Info("Applying main net upgrade - v.13.3.0") logger := ctx.Logger().With("upgrade", UpgradeName) // Migrate Tendermint consensus parameters from x/params module to a deprecated x/consensus module. diff --git a/cmd/comdex/migrate.go b/cmd/comdex/migrate.go index 540a58460..358851928 100644 --- a/cmd/comdex/migrate.go +++ b/cmd/comdex/migrate.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/x/genutil/types" // bump47: uncomment below 1 - packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" + packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ) func Migrate(appState types.AppMap, clientCtx client.Context) types.AppMap { diff --git a/go.mod b/go.mod index cf8b0c370..8cac8fadb 100644 --- a/go.mod +++ b/go.mod @@ -28,8 +28,8 @@ require ( ) require ( - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0 - github.com/cosmos/ibc-go/v7 v7.2.0 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 + github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/ics23/go v0.10.0 // indirect github.com/golangci/golangci-lint v1.51.2 github.com/rakyll/statik v0.1.7 diff --git a/go.sum b/go.sum index 663be8fee..937ee83e0 100644 --- a/go.sum +++ b/go.sum @@ -1097,14 +1097,14 @@ github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONAp github.com/cosmos/iavl v0.20.0-alpha4/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0 h1:i9esYyZ5ExpZOgxrLMQhY2jDTVYiaD8yUeqXN9QBgbk= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0/go.mod h1:fctjEnz9xaBFOlmYYPdKL8Hs1Y3GUKilSwsJdqBb5QU= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1 h1:8mK4Ha/56P6jkRcLhIYhg/ipWhEuXBtj5O4I6fAi6vg= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s= github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0 h1:mMHedP3Q+mz5gpOWNz0P+X8hxPdamylrBKc/P2cFakA= github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0/go.mod h1:/P6l2bWo2AR3rrsfs0DHuFZO3Imzb93sxFD3ihrIgw4= github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230803181732-7c8f814d3b79 h1:pCxyhIxgWTabAQC5UerkITraHG3SwajdLKKMCFDWCv4= github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230803181732-7c8f814d3b79/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4= -github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= +github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= @@ -3139,6 +3139,7 @@ go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpK go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=