From d7d5df404551ab767771d428a3bbf0b2ae7756c7 Mon Sep 17 00:00:00 2001 From: mpoke Date: Fri, 28 Jul 2023 09:54:06 +0200 Subject: [PATCH 1/6] bump PFM to 4.0.6 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c9008e64a9..13db57e1b01 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 - github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 + github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 github.com/stretchr/testify v1.8.4 github.com/tendermint/tendermint v0.34.27 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 4ca1a512c03..7499bd02d6b 100644 --- a/go.sum +++ b/go.sum @@ -1001,8 +1001,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 h1:KKUqeGhVBK38+1LwThC8IeIcsJZ6COX5kvhiJroFqCM= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= +github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 h1:aY64yjKZyDyzlIbDOkGBPvVpR0ArzIjunpCRKqoIm7o= +github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= 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 0ba15c950be559156149c49f66937a3c2f38d817 Mon Sep 17 00:00:00 2001 From: mpoke Date: Fri, 28 Jul 2023 10:02:10 +0200 Subject: [PATCH 2/6] add entries to .changelog --- .changelog/unreleased/bug-fixes/2677-bump-pfm.md | 3 +++ .changelog/unreleased/dependencies/2677-bump-pfm.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/2677-bump-pfm.md create mode 100644 .changelog/unreleased/dependencies/2677-bump-pfm.md diff --git a/.changelog/unreleased/bug-fixes/2677-bump-pfm.md b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md new file mode 100644 index 00000000000..f46af260f59 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md @@ -0,0 +1,3 @@ +- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) + to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) + ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2677-bump-pfm.md b/.changelog/unreleased/dependencies/2677-bump-pfm.md new file mode 100644 index 00000000000..f46af260f59 --- /dev/null +++ b/.changelog/unreleased/dependencies/2677-bump-pfm.md @@ -0,0 +1,3 @@ +- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) + to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) + ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file From d520c0f62507643eca8fb0d18f35893c5a7ff5da Mon Sep 17 00:00:00 2001 From: mpoke Date: Fri, 28 Jul 2023 09:54:06 +0200 Subject: [PATCH 3/6] bump PFM to 4.0.6 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c9008e64a9..13db57e1b01 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 - github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 + github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 github.com/stretchr/testify v1.8.4 github.com/tendermint/tendermint v0.34.27 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 4ca1a512c03..7499bd02d6b 100644 --- a/go.sum +++ b/go.sum @@ -1001,8 +1001,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 h1:KKUqeGhVBK38+1LwThC8IeIcsJZ6COX5kvhiJroFqCM= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= +github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 h1:aY64yjKZyDyzlIbDOkGBPvVpR0ArzIjunpCRKqoIm7o= +github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= 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 7909b96f71f64c51baec4ceab2fae0f14d0f8da0 Mon Sep 17 00:00:00 2001 From: mpoke Date: Fri, 28 Jul 2023 10:02:10 +0200 Subject: [PATCH 4/6] add entries to .changelog --- .changelog/unreleased/bug-fixes/2677-bump-pfm.md | 3 +++ .changelog/unreleased/dependencies/2677-bump-pfm.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/2677-bump-pfm.md create mode 100644 .changelog/unreleased/dependencies/2677-bump-pfm.md diff --git a/.changelog/unreleased/bug-fixes/2677-bump-pfm.md b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md new file mode 100644 index 00000000000..f46af260f59 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md @@ -0,0 +1,3 @@ +- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) + to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) + ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2677-bump-pfm.md b/.changelog/unreleased/dependencies/2677-bump-pfm.md new file mode 100644 index 00000000000..f46af260f59 --- /dev/null +++ b/.changelog/unreleased/dependencies/2677-bump-pfm.md @@ -0,0 +1,3 @@ +- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) + to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) + ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file From 5f6f0733b6db3a04dd8c636c1a1eb388a668e8c5 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 8 Aug 2023 18:47:42 +0200 Subject: [PATCH 5/6] bump PFM to 4.1.0 --- .changelog/unreleased/bug-fixes/2677-bump-pfm.md | 4 ++-- .changelog/unreleased/dependencies/2677-bump-pfm.md | 4 ++-- .changelog/unreleased/state-breaking/2677-bump-pfm.md | 3 +++ app/keepers/keepers.go | 6 +++--- app/keepers/keys.go | 2 +- app/modules.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 8 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 .changelog/unreleased/state-breaking/2677-bump-pfm.md diff --git a/.changelog/unreleased/bug-fixes/2677-bump-pfm.md b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md index f46af260f59..803634e7447 100644 --- a/.changelog/unreleased/bug-fixes/2677-bump-pfm.md +++ b/.changelog/unreleased/bug-fixes/2677-bump-pfm.md @@ -1,3 +1,3 @@ -- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) - to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) +- Bump [PFM](https://github.com/cosmos/ibc-apps/tree/main/middleware) + to [v4.1.0](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.0) ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2677-bump-pfm.md b/.changelog/unreleased/dependencies/2677-bump-pfm.md index f46af260f59..803634e7447 100644 --- a/.changelog/unreleased/dependencies/2677-bump-pfm.md +++ b/.changelog/unreleased/dependencies/2677-bump-pfm.md @@ -1,3 +1,3 @@ -- Bump [PFM](https://github.com/strangelove-ventures/packet-forward-middleware) - to [v4.0.6](https://github.com/strangelove-ventures/packet-forward-middleware/releases/tag/v4.0.6) +- Bump [PFM](https://github.com/cosmos/ibc-apps/tree/main/middleware) + to [v4.1.0](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.0) ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2677-bump-pfm.md b/.changelog/unreleased/state-breaking/2677-bump-pfm.md new file mode 100644 index 00000000000..803634e7447 --- /dev/null +++ b/.changelog/unreleased/state-breaking/2677-bump-pfm.md @@ -0,0 +1,3 @@ +- Bump [PFM](https://github.com/cosmos/ibc-apps/tree/main/middleware) + to [v4.1.0](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.0) + ([\#2677](https://github.com/cosmos/gaia/pull/2677)) \ No newline at end of file diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 2c3c67a1402..ca03b908b59 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -1,11 +1,11 @@ package keepers import ( + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" liquiditykeeper "github.com/gravity-devs/liquidity/x/liquidity/keeper" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" - "github.com/strangelove-ventures/packet-forward-middleware/v4/router" - routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v4/router/keeper" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" tmos "github.com/tendermint/tendermint/libs/os" // unnamed import of statik for swagger UI support diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 815892aa62e..a5fe55f8bf7 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -1,8 +1,8 @@ package keepers import ( + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" diff --git a/app/modules.go b/app/modules.go index d941b239ffc..b4c37cf433b 100644 --- a/app/modules.go +++ b/app/modules.go @@ -1,10 +1,10 @@ package gaia import ( + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" "github.com/gravity-devs/liquidity/x/liquidity" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" - "github.com/strangelove-ventures/packet-forward-middleware/v4/router" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" diff --git a/go.mod b/go.mod index 13db57e1b01..81840f9ff4c 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( cosmossdk.io/math v1.0.1 github.com/cosmos/cosmos-sdk v0.45.16-ics github.com/cosmos/go-bip39 v1.0.0 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.0 github.com/cosmos/ibc-go/v4 v4.4.2 github.com/cosmos/interchain-security/v2 v2.0.0 github.com/gogo/protobuf v1.3.3 @@ -19,7 +20,6 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 - github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 github.com/stretchr/testify v1.8.4 github.com/tendermint/tendermint v0.34.27 github.com/tendermint/tm-db v0.6.7 diff --git a/go.sum b/go.sum index 7499bd02d6b..7585c3080cc 100644 --- a/go.sum +++ b/go.sum @@ -248,6 +248,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.0 h1:96fDMIUSlSQ6dBcwhdYwTT+uTwFP+EWbSyLORcKSJZ8= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.0/go.mod h1:Mn/jr9pIYr1ofFuptLEi9N6MjcshTT0cpoOY4ln1DeA= github.com/cosmos/ibc-go/v4 v4.4.2 h1:PG4Yy0/bw6Hvmha3RZbc53KYzaCwuB07Ot4GLyzcBvo= github.com/cosmos/ibc-go/v4 v4.4.2/go.mod h1:j/kD2JCIaV5ozvJvaEkWhLxM2zva7/KTM++EtKFYcB8= github.com/cosmos/interchain-security/v2 v2.0.0 h1:FQeU+9hYrK+XF4bRfiFgn+h7JJoM71KQKpeKYNxpjA4= @@ -1001,8 +1003,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6 h1:aY64yjKZyDyzlIbDOkGBPvVpR0ArzIjunpCRKqoIm7o= -github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.6/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE= 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 7b7d3cfa90a7e721a8e7cb07a1b77526687344d3 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 8 Aug 2023 19:11:46 +0200 Subject: [PATCH 6/6] make lint-fix --- app/keepers/keepers.go | 6 +++--- app/keepers/keys.go | 2 +- app/modules.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index ca03b908b59..911a80415f9 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -1,9 +1,6 @@ package keepers import ( - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" - routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" liquiditykeeper "github.com/gravity-devs/liquidity/x/liquidity/keeper" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" tmos "github.com/tendermint/tendermint/libs/os" @@ -11,6 +8,9 @@ import ( // unnamed import of statik for swagger UI support _ "github.com/cosmos/cosmos-sdk/client/docs/statik" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host" icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper" diff --git a/app/keepers/keys.go b/app/keepers/keys.go index a5fe55f8bf7..28b48428547 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -1,9 +1,9 @@ package keepers import ( - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host" diff --git a/app/modules.go b/app/modules.go index b4c37cf433b..3be9a0f471c 100644 --- a/app/modules.go +++ b/app/modules.go @@ -1,11 +1,11 @@ package gaia import ( - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" - routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" "github.com/gravity-devs/liquidity/x/liquidity" liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types" "github.com/cosmos/ibc-go/v4/modules/apps/transfer"