Skip to content

Commit

Permalink
Merge branch 'main' into colin/7231-rm-wasm-callbacks-bin-logic
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitrisJim committed Nov 11, 2024
2 parents 1cd2408 + 86f5e24 commit f866ef1
Show file tree
Hide file tree
Showing 25 changed files with 399 additions and 989 deletions.
32 changes: 16 additions & 16 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# CODEOWNERS: https://help.github.com/articles/about-codeowners/

* @colin-axner @AdityaSripal @damiannolan @chatton @DimitrisJim @gjermundgaraba @bznein
* @AdityaSripal @damiannolan @chatton @DimitrisJim @gjermundgaraba @bznein

# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega
# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner

# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
Expand All @@ -11,42 +11,42 @@

# CODEOWNERS for the CODEOWNER file

/.github/CODEOWNERS @colin-axner @AdityaSripal @damiannolan @chatton
/.github/CODEOWNERS @AdityaSripal @damiannolan @chatton

# CODEOWNERS for the core IBC module

/modules/core/ @colin-axner @AdityaSripal @damiannolan @chatton
/proto/ibc/core/ @colin-axner @AdityaSripal @damiannolan @chatton
/modules/core/ @AdityaSripal @damiannolan @chatton
/proto/ibc/core/ @AdityaSripal @damiannolan @chatton

# CODEOWNERS for the light-clients

/modules/light-clients/ @colin-axner @AdityaSripal @damiannolan @chatton
/proto/ibc/lightclients/ @colin-axner @AdityaSripal @damiannolan @chatton
/modules/light-clients/ @AdityaSripal @damiannolan @chatton
/proto/ibc/lightclients/ @AdityaSripal @damiannolan @chatton

# CODEOWNERS for 08-wasm light client module

/modules/light-clients/08-wasm/ @colin-axner @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk
/modules/light-clients/08-wasm/ @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk

# CODEOWNERS for ICS 20

/modules/apps/transfer/ @colin-axner @AdityaSripal @damiannolan @chatton @DimitrisJim
/proto/ibc/applications/transfer/ @colin-axner @AdityaSripal @damiannolan @chatton @DimitrisJim
/modules/apps/transfer/ @AdityaSripal @damiannolan @chatton @DimitrisJim
/proto/ibc/applications/transfer/ @AdityaSripal @damiannolan @chatton @DimitrisJim

# CODEOWNERS for interchain-accounts module

/modules/apps/27-interchain-accounts/ @colin-axner @AdityaSripal @damiannolan @chatton
/proto/ibc/applications/interchain_accounts/ @colin-axner @AdityaSripal @damiannolan @chatton
/modules/apps/27-interchain-accounts/ @AdityaSripal @damiannolan @chatton
/proto/ibc/applications/interchain_accounts/ @AdityaSripal @damiannolan @chatton

# CODEOWNERS for fee module

/modules/apps/29-fee/ @AdityaSripal @colin-axner @damiannolan @chatton
/proto/ibc/applications/fee/ @AdityaSripal @colin-axner @damiannolan @chatton
/modules/apps/29-fee/ @AdityaSripal @damiannolan @chatton
/proto/ibc/applications/fee/ @AdityaSripal @damiannolan @chatton

# CODEOWNERS for callbacks middleware

/modules/apps/callbacks/ @colin-axner @AdityaSripal @damiannolan @srdtrk @chatton
/modules/apps/callbacks/ @AdityaSripal @damiannolan @srdtrk @chatton

# CODEOWNERS for docs

/docs/ @colin-axner @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk
/docs/ @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk

35 changes: 0 additions & 35 deletions .github/workflows/build-callbacks-simd-image-from-tag.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.45.0
- uses: bufbuild/buf-setup-action@v1.46.0
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Dependencies

* [\#7247](https://github.com/cosmos/ibc-go/pull/7247) Bump CometBFT to v0.38.12.
* [\#7540](https://github.com/cosmos/ibc-go/pull/7540) Bump CometBFT to v0.38.15.

### API Breaking

Expand All @@ -57,6 +57,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (apps/transfer) [\#7239](https://github.com/cosmos/ibc-go/pull/7239) The following functions have been removed: `BindPort`, `AuthenticateCapability`, `ClaimCapability`
* (capability) [\#7279](https://github.com/cosmos/ibc-go/pull/7279) The module `capability` has been removed.
* (testing) [\#7305](https://github.com/cosmos/ibc-go/pull/7305) Added `TrustedValidators` map to `TestChain`. This removes the dependency on the `x/staking` module for retrieving trusted validator sets at a given height, and removes the `GetTrustedValidators` method from the `TestChain` struct.
* (23-commitment) [\#7486](https://github.com/cosmos/ibc-go/pull/7486) Remove unimplemented `BatchVerifyMembership` and `BatchVerifyNonMembership` functions

### State Machine Breaking

Expand Down
7 changes: 6 additions & 1 deletion cmd/build_test_matrix/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func getGithubActionMatrixForTests(e2eRootDirectory, testName string, suite stri

suiteNameForFile, testCases, err := extractSuiteAndTestNames(f)
if err != nil {
return fmt.Errorf("failed extracting test suite name and test cases: %s", err)
return nil
}

if testName != "" && contains(testName, testCases) {
Expand Down Expand Up @@ -145,6 +145,11 @@ func getGithubActionMatrixForTests(e2eRootDirectory, testName string, suite stri
})
}
}

if len(gh.Include) == 0 {
return GithubActionTestMatrix{}, fmt.Errorf("no test cases found")
}

// Sort the test cases by name so that the order is consistent.
sort.SliceStable(gh.Include, func(i, j int) bool {
return gh.Include[i].Test < gh.Include[j].Test
Expand Down
8 changes: 4 additions & 4 deletions cmd/build_test_matrix/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const (
)

func TestGetGithubActionMatrixForTests(t *testing.T) {
t.Run("empty dir does not fail", func(t *testing.T) {
t.Run("empty dir with no test cases fails", func(t *testing.T) {
testingDir := t.TempDir()
_, err := getGithubActionMatrixForTests(testingDir, "", "", nil)
assert.NoError(t, err)
assert.Error(t, err)
})

t.Run("only test functions are picked up", func(t *testing.T) {
Expand Down Expand Up @@ -105,12 +105,12 @@ func TestGetGithubActionMatrixForTests(t *testing.T) {
assert.Error(t, err)
})

t.Run("non test files are not picked up", func(t *testing.T) {
t.Run("non test files are skipped", func(t *testing.T) {
testingDir := t.TempDir()
createFileWithTestSuiteAndTests(t, "FeeMiddlewareTestSuite", "TestA", "TestB", testingDir, nonTestFile)

gh, err := getGithubActionMatrixForTests(testingDir, "", "", nil)
assert.NoError(t, err)
assert.Error(t, err)
assert.Empty(t, gh.Include)
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ It is possible to disable the localhost client by removing the `09-localhost` en

The latest height is updated periodically through the ABCI [`BeginBlock`](https://docs.cosmos.network/v0.47/building-modules/beginblock-endblock) interface of the 02-client submodule in core IBC.

[See `BeginBlocker` in abci.go.](https://github.com/cosmos/ibc-go/blob/09-localhost/modules/core/02-client/abci.go#L12)
[See `BeginBlocker` in abci.go.](https://github.com/cosmos/ibc-go/blob/v7.8.0/modules/core/02-client/abci.go#L12)

```go
func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
Expand Down
42 changes: 20 additions & 22 deletions e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/cosmos/ibc-go/e2e

go 1.22.2
go 1.22.7

toolchain go1.22.3
toolchain go1.22.8

// needed temporarily for v9.
replace (
Expand All @@ -14,8 +14,8 @@ require (
cosmossdk.io/errors v1.0.1
cosmossdk.io/math v1.3.0
cosmossdk.io/x/upgrade v0.1.4
github.com/cometbft/cometbft v0.38.12
github.com/cosmos/cosmos-sdk v0.50.10-0.20240808075341-156231be8aef
github.com/cometbft/cometbft v0.38.15
github.com/cosmos/cosmos-sdk v0.50.10
github.com/cosmos/gogoproto v1.7.0
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.0.0-00010101000000-000000000000
github.com/cosmos/ibc-go/v9 v9.0.0
Expand All @@ -25,7 +25,7 @@ require (
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
golang.org/x/mod v0.21.0
google.golang.org/grpc v1.67.1
google.golang.org/grpc v1.68.0
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -37,7 +37,6 @@ require (
cloud.google.com/go/iam v1.1.9 // indirect
cloud.google.com/go/storage v1.41.0 // indirect
cosmossdk.io/api v0.7.6 // indirect
cosmossdk.io/client/v2 v2.0.0-beta.5 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core v0.11.1 // indirect
cosmossdk.io/depinject v1.0.0 // indirect
Expand Down Expand Up @@ -65,8 +64,6 @@ require (
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.2.0 // indirect
github.com/bits-and-blooms/bitset v1.12.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
Expand All @@ -77,7 +74,7 @@ require (
github.com/cockroachdb/pebble v1.1.1 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft-db v0.12.0 // indirect
github.com/cometbft/cometbft-db v0.14.1 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-db v1.0.2 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
Expand Down Expand Up @@ -122,7 +119,7 @@ require (
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/flatbuffers v24.3.25+incompatible // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/orderedcode v0.0.1 // indirect
Expand Down Expand Up @@ -175,12 +172,13 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/minio/highwayhash v1.0.3 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/misko9/go-substrate-rpc-client/v4 v4.0.0-20230913220906-b988ea7da0c2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
Expand All @@ -198,13 +196,13 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/petermattis/goid v0.0.0-20240607163614-bb94eb51e7a7 // indirect
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pierrec/xxHash v0.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.1 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
Expand All @@ -213,7 +211,7 @@ require (
github.com/rs/zerolog v1.33.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
Expand All @@ -239,19 +237,19 @@ require (
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/api v0.186.0 // indirect
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit f866ef1

Please sign in to comment.