Skip to content

Commit 485bb40

Browse files
gjermundgarabamergify[bot]
authored andcommitted
chore: change modules to follow ibc-go version (#8089)
(cherry picked from commit 9cb568d) # Conflicts: # modules/light-clients/08-wasm/go.mod
1 parent 7433012 commit 485bb40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+258
-294
lines changed

docs/docs/03-light-clients/04-wasm/03-integration.md

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@ Learn how to integrate the `08-wasm` module in a chain binary and about the reco
1414
`08-wasm` has no stable releases yet. To use it, you need to import the git commit that contains the module with the compatible versions of `ibc-go` and `wasmvm`. To do so, run the following command with the desired git commit in your project:
1515

1616
```sh
17-
go get github.com/cosmos/ibc-go/modules/light-clients/08-wasm@7ee2a2452b79d0bc8316dc622a1243afa058e8cb
17+
go get github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10
1818
```
1919

20-
The following table shows the compatibility matrix between the `08-wasm` module, `ibc-go`, and `wasmvm`.
21-
22-
| **Version** | **Git commit to import** |
23-
|:--------------------------------:|:----------------------------------------:|
24-
| `v0.4.1+ibc-go-v8.4-wasmvm-v2.0` | ccd4dc278e720be87418028026ebd93a80fa5ac0 |
25-
| `v0.3.1+ibc-go-v7.4-wasmvm-v1.5` | 13c071f0b34d67342f0b7a8874d84d2e68b887e1 |
26-
2720
## `app.go` setup
2821

2922
The sample code below shows the relevant integration points in `app.go` required to set up the `08-wasm` module in a chain binary. Since `08-wasm` is a light client module itself, please check out as well the section [Integrating light clients](../../01-ibc/02-integration.md#integrating-light-clients) for more information:
@@ -36,9 +29,9 @@ import (
3629

3730
cmtos "github.com/cometbft/cometbft/libs/os"
3831

39-
ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
40-
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
41-
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
32+
ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10"
33+
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
34+
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
4235
...
4336
)
4437

@@ -169,8 +162,8 @@ import (
169162
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
170163
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
171164

172-
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
173-
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
165+
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
166+
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
174167
...
175168
)
176169

@@ -248,8 +241,8 @@ import (
248241
...
249242
"github.com/cosmos/cosmos-sdk/runtime"
250243

251-
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
252-
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
244+
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
245+
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
253246
...
254247
)
255248

@@ -349,7 +342,7 @@ If the chain's 02-client submodule parameter `AllowedClients` contains the singl
349342
```go
350343
import (
351344
...
352-
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
345+
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
353346
...
354347
)
355348

docs/docs/03-light-clients/04-wasm/05-governance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
2222
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
2323

24-
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
25-
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
24+
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
25+
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
2626
...
2727
)
2828

docs/docs/04-middleware/01-callbacks/02-integration.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,10 @@ For Cosmos SDK chains this setup is done via the `app/app.go` file, where module
2121

2222
## Importing the callbacks middleware
2323

24-
The callbacks middleware has no stable releases yet. To use it, you need to import the git commit that contains the module with the compatible version of `ibc-go`. To do so, run the following command with the desired git commit in your project:
25-
2624
```sh
27-
go get github.com/cosmos/ibc-go/modules/apps/callbacks@342c00b0f8bd7feeebf0780f208a820b0faf90d1
25+
go get github.com/cosmos/ibc-go/modules/apps/callbacks/v10
2826
```
2927

30-
The following table shows the compatibility matrix between the callbacks middleware, `ibc-go`.
31-
32-
| **Version** | **Git commit to import** |
33-
|:--------------------:|:----------------------------------------:|
34-
| `v0.2.0+ibc-go-v8.0` | 342c00b0f8bd7feeebf0780f208a820b0faf90d1 |
35-
| `v0.1.0+ibc-go-v7.3` | 17cf1260a9cdc5292512acc9bcf6336ef0d917f4 |
36-
3728
## Configuring an application stack with the callbacks middleware
3829

3930
As mentioned in [IBC middleware development](../../01-ibc/04-middleware/02-develop.md) an application stack may be composed of many or no middlewares that nest a base application.

e2e/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/cometbft/cometbft v0.38.15
1313
github.com/cosmos/cosmos-sdk v0.50.11
1414
github.com/cosmos/gogoproto v1.7.0
15-
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.0.0-00010101000000-000000000000
15+
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.0.0
1616
github.com/cosmos/ibc-go/v10 v10.0.0
1717
github.com/docker/docker v27.3.1+incompatible
1818
github.com/pelletier/go-toml v1.9.5
@@ -239,8 +239,8 @@ require (
239239
replace github.com/cosmos/ibc-go/v10 => ../
240240

241241
replace (
242-
github.com/cosmos/ibc-go/modules/light-clients/08-wasm => ../modules/light-clients/08-wasm
243-
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/blsverifier => ../modules/light-clients/08-wasm/blsverifier
242+
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/blsverifier/v10 => ../modules/light-clients/08-wasm/blsverifier
243+
github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 => ../modules/light-clients/08-wasm
244244
)
245245

246246
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

e2e/tests/core/02-client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/cosmos/ibc-go/e2e/testsuite"
3434
"github.com/cosmos/ibc-go/e2e/testsuite/query"
3535
"github.com/cosmos/ibc-go/e2e/testvalues"
36-
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
36+
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
3737
clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
3838
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
3939
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"

e2e/testsuite/codec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
2424
proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
2525

26-
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
26+
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
2727
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
2828
icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
2929
transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"

e2e/testsuite/testconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/cosmos/ibc-go/e2e/relayer"
3030
"github.com/cosmos/ibc-go/e2e/semverutil"
3131
"github.com/cosmos/ibc-go/e2e/testvalues"
32-
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
32+
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
3333
clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
3434
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
3535
ibctypes "github.com/cosmos/ibc-go/v10/modules/core/types"

modules/apps/callbacks/callbacks_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919

2020
abci "github.com/cometbft/cometbft/abci/types"
2121

22-
"github.com/cosmos/ibc-go/modules/apps/callbacks/testing/simapp"
23-
"github.com/cosmos/ibc-go/modules/apps/callbacks/types"
22+
"github.com/cosmos/ibc-go/modules/apps/callbacks/v10/testing/simapp"
23+
"github.com/cosmos/ibc-go/modules/apps/callbacks/v10/types"
2424
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
2525
icatypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/types"
2626
transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"

modules/apps/callbacks/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/cosmos/ibc-go/modules/apps/callbacks
1+
module github.com/cosmos/ibc-go/modules/apps/callbacks/v10
22

33
go 1.23.6
44

modules/apps/callbacks/ibc_middleware.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
sdk "github.com/cosmos/cosmos-sdk/types"
88

9-
"github.com/cosmos/ibc-go/modules/apps/callbacks/internal"
10-
"github.com/cosmos/ibc-go/modules/apps/callbacks/types"
9+
"github.com/cosmos/ibc-go/modules/apps/callbacks/v10/internal"
10+
"github.com/cosmos/ibc-go/modules/apps/callbacks/v10/types"
1111
clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
1212
channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types"
1313
porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types"

0 commit comments

Comments
 (0)