Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: revert SDK to 0.50 #7932

Merged
merged 25 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2163800
Revert "chore: bump to sdk v0.52-rc.2 (#7882)"
gjermundgaraba Feb 7, 2025
ebfa5a9
Revert "chore: clean up module impls (#7865)"
gjermundgaraba Feb 7, 2025
afaa0c9
Revert "fix: sanitize gov v1 proposal in e2e tests for compatibility …
gjermundgaraba Feb 7, 2025
81f71dd
Revert "chore: bump sdk versions (#7843)"
gjermundgaraba Feb 7, 2025
dbd8800
Revert "fix: wasm docker file + wasm simapp gas limit (#7830)"
gjermundgaraba Feb 7, 2025
0759f3b
Revert "chore: use header service in localhost client (#7757)"
gjermundgaraba Feb 7, 2025
4f90e92
Revert "refactor: ibc core runtime env (#7601)"
gjermundgaraba Feb 7, 2025
3b6a0a6
Revert "refactor: use branch service in 29-fee (#7732)"
gjermundgaraba Feb 7, 2025
e5b624a
Revert "chore: address some linter complaints (#7734)"
gjermundgaraba Feb 7, 2025
25e7bdc
Revert "chore: refactor event service to 29-fee (#7728)"
gjermundgaraba Feb 7, 2025
be3ca2b
Revert "refactor: update 29-fee to use runtime.Environment (#7617)"
gjermundgaraba Feb 7, 2025
ef1b52f
Revert "refactor: use event service in transfer mod (#7725)"
gjermundgaraba Feb 7, 2025
c76d8d5
Revert "refactor: update transfer to use runtime.Environment (#7615)"
gjermundgaraba Feb 7, 2025
5733d0a
Revert "Remove circuit module (#7715)"
gjermundgaraba Feb 7, 2025
acbffe9
Revert "refactor: use header info for interchain accounts address gen…
gjermundgaraba Feb 7, 2025
98fb555
Revert "refactor: update icahost to use runtime.Environment (#7600)"
gjermundgaraba Feb 7, 2025
4224121
Revert "chore: update import alias to align (#7710)"
gjermundgaraba Feb 7, 2025
38eb116
Revert "deps: update to cosmos-sdk v0.52 (Olympus) (#7261)"
gjermundgaraba Feb 7, 2025
9e4924b
fix unwanted reverts
gjermundgaraba Feb 7, 2025
6dba859
remove invariant
gjermundgaraba Feb 7, 2025
b2c83b9
lint
gjermundgaraba Feb 7, 2025
e63a4d1
last go1.23 change
gjermundgaraba Feb 7, 2025
12854e0
remove unecessary testing keeper
gjermundgaraba Feb 7, 2025
8af9fe3
update go version in dockerfile
gjermundgaraba Feb 7, 2025
445de39
fix docker image
gjermundgaraba Feb 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Dependencies

* [\#7261](https://github.com/cosmos/ibc-go/pull/7261) Bump CometBFT to v1.0.0.
* [\#7261](https://github.com/cosmos/ibc-go/pull/7261) Bump Cosmos SDK to v0.52.0.
* [\#7540](https://github.com/cosmos/ibc-go/pull/7540) Bump CometBFT to v0.38.15.

### API Breaking

* (apps/27-interchain-accounts) [\#7713](https://github.com/cosmos/ibc-go/pull/7713) Update interchain accounts `GenerateAddress` func to now accept `header.Info` in favour of `sdk.Context`. This function now uses `AppHash` and `Hash` (merkle root of block) instead of `AppHash` and `DataHash` as pre-image data for address generation.
* (core, apps) [\#7213](https://github.com/cosmos/ibc-go/pull/7213) Remove capabilities from `SendPacket`.
* (core, apps) [\#7213](https://github.com/cosmos/ibc-go/pull/7225) Remove capabilities from `WriteAcknowledgement`.
* (core, apps) [\#7232](https://github.com/cosmos/ibc-go/pull/7232) Remove capabilities from channel handshake methods. TODO list all changes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.4-alpine as builder
FROM golang:1.23.6-alpine as builder
ARG IBC_GO_VERSION

RUN set -eux; apk add --no-cache gcc git libusb-dev linux-headers make musl-dev;
Expand Down Expand Up @@ -26,7 +26,7 @@ RUN go mod download

RUN make build

FROM alpine:3.18
FROM alpine:3.21
ARG IBC_GO_VERSION

LABEL "org.cosmos.ibc-go" "${IBC_GO_VERSION}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal tendermint light client types.
func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
RegisterInterfaces(registry)
}

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/03-light-clients/04-wasm/05-governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
...
"github.com/cosmos/cosmos-sdk/runtime"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "cosmossdk.io/x/gov/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/05-migrations/06-v4-to-v5.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (

The `TestingApp` interface in `testing` has gone through some modifications:

- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:

```go
type StakingKeeper interface {
Expand Down
1 change: 0 additions & 1 deletion docs/tutorials/01-fee/04-wire-feeibc-mod.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ Next, we need to add `fee` module to the module basic manager and define its acc
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
govtypes.ModuleName: {authtypes.Burner},
pooltypes.ModuleName: nil,
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
// plus-diff-line
+ ibcfeetypes.ModuleName: nil,
Expand Down
5 changes: 2 additions & 3 deletions e2e/dockerutil/dockerutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"path"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
dockerclient "github.com/docker/docker/client"
)
Expand All @@ -19,7 +18,7 @@ const testLabel = "ibc-test"
// note: the test suite name must be passed as the chains are created in SetupSuite which will label
// them with the name of the test suite rather than the test.
func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.Client) ([]dockertypes.Container, error) {
testContainers, err := dc.ContainerList(ctx, container.ListOptions{
testContainers, err := dc.ContainerList(ctx, dockertypes.ContainerListOptions{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this need to be reverted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now, yes. We need to stay on the same docker go library as interchaintest.
I would want to update interchaintest a bit, so might fix that then.

All: true,
Filters: filters.NewArgs(
// see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
Expand All @@ -36,7 +35,7 @@ func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.C

// GetContainerLogs returns the logs of a container as a byte array.
func GetContainerLogs(ctx context.Context, dc *dockerclient.Client, containerName string) ([]byte, error) {
readCloser, err := dc.ContainerLogs(ctx, containerName, container.LogsOptions{
readCloser, err := dc.ContainerLogs(ctx, containerName, dockertypes.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
})
Expand Down
Loading
Loading