diff --git a/app/app.go b/app/app.go index 17735a958..9a562b661 100644 --- a/app/app.go +++ b/app/app.go @@ -85,9 +85,9 @@ import ( icq "github.com/strangelove-ventures/async-icq/v7" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" custombankmodule "github.com/notional-labs/centauri/v4/custom/bank" - "github.com/strangelove-ventures/packet-forward-middleware/v7/router" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" alliancemodule "github.com/terra-money/alliance/x/alliance" alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 1cd6ba5fb..38101ee9b 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -68,9 +68,9 @@ import ( custombankkeeper "github.com/notional-labs/centauri/v4/custom/bank/keeper" - "github.com/strangelove-ventures/packet-forward-middleware/v7/router" - routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router" + routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" alliancemodule "github.com/terra-money/alliance/x/alliance" alliancemodulekeeper "github.com/terra-money/alliance/x/alliance/keeper" diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 6126eb791..06b57de1f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -24,7 +24,7 @@ import ( ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" - routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" + routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" ibchookstypes "github.com/notional-labs/centauri/v4/x/ibc-hooks/types" diff --git a/go.mod b/go.mod index ab2c20a59..0514aa525 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0 github.com/cosmos/ibc-go/v7 v7.0.1 github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 @@ -19,7 +20,6 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/strangelove-ventures/async-icq/v7 v7.0.0-20230413165143-a3b65ccdc897 - github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230412224111-136e94e98861 github.com/stretchr/testify v1.8.3 github.com/terra-money/alliance v0.1.1-0.20230419080242-b29b0ec11186 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 @@ -185,11 +185,11 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 // lock wasmvm so we do not break the grandpa contract github.com/CosmWasm/wasmvm => github.com/CosmWasm/wasmvm v1.2.1 + + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 => github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230809131924-ea880d737dd6 // ibc-go with wasm client github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 - github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230719072346-7acf9377aac3 - github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/terra-money/alliance => github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 ) diff --git a/go.sum b/go.sum index 1274f364b..b32bd19d3 100644 --- a/go.sum +++ b/go.sum @@ -770,10 +770,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 h1:koCsoc1NGpU8TntXwM/s7Z/whsKNDVPiLim35HLBAzA= github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01/go.mod h1:GFQ8TsXDMTpu7kif0Dwddz6rxazy0ZJQHfN38ZmAodI= +github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230809131924-ea880d737dd6 h1:/YN1Cii081rd0njFZMFfwFRyL8G4N2g/7S9h+vAmAZo= +github.com/notional-labs/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230809131924-ea880d737dd6/go.mod h1:M4wXmuGMEFX665yUsYgR35aXln+e+YpxuYbYpdUl3Zk= github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 h1:oZTUDZzUBp8D2h3uZfPQmZGVksrROqubHDASvFB/+u0= github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70/go.mod h1:ISHo/Qitjtvj2svGmttaZv03zVXmS+uqvUyF9kFqlI0= -github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230719072346-7acf9377aac3 h1:LBK82QivQaiycoKZPGDV3fJL1KTWy8AAoerEGUno/60= -github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230719072346-7acf9377aac3/go.mod h1:L7nnQ9rEoYLyulE9M/zhcBcHDWqMMSQn8cf4yY5A+T8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=