diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aadab8b6813..f7f3404256b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1,8 @@ # CODEOWNERS: https://help.github.com/articles/about-codeowners/ -* @AdityaSripal @damiannolan @DimitrisJim @gjermundgaraba +* @AdityaSripal @damiannolan @gjermundgaraba -# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner @chatton @bznein +# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner @chatton @bznein @DimitrisJim # Order is important; the last matching pattern takes the most # precedence. When someone opens a pull request that only @@ -25,12 +25,12 @@ # CODEOWNERS for 08-wasm light client module -/modules/light-clients/08-wasm/ @AdityaSripal @damiannolan @DimitrisJim @srdtrk +/modules/light-clients/08-wasm/ @AdityaSripal @damiannolan @srdtrk # CODEOWNERS for ICS 20 -/modules/apps/transfer/ @AdityaSripal @damiannolan @DimitrisJim -/proto/ibc/applications/transfer/ @AdityaSripal @damiannolan @DimitrisJim +/modules/apps/transfer/ @AdityaSripal @damiannolan +/proto/ibc/applications/transfer/ @AdityaSripal @damiannolan # CODEOWNERS for interchain-accounts module @@ -48,5 +48,5 @@ # CODEOWNERS for docs -/docs/ @AdityaSripal @damiannolan @DimitrisJim @srdtrk +/docs/ @AdityaSripal @damiannolan @srdtrk diff --git a/.github/mergify.yml b/.github/mergify.yml index 5255132e514..0aa2342f75b 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -69,7 +69,7 @@ pull_request_rules: actions: backport: branches: - - 08-wasm/release/v0.5.x+ibc-go-v8.4.x-wasmvm-v2.0.x + - 08-wasm/release/v0.5.x+ibc-go-v8.4.x-wasmvm-v2.1.x - name: backport patches to v0.5.x wasm ibc-go v9.0.x & wasmvm 2.1.x branch conditions: - base=main diff --git a/modules/apps/27-interchain-accounts/types/account_test.go b/modules/apps/27-interchain-accounts/types/account_test.go index 996d5b85e21..da81f1e1f85 100644 --- a/modules/apps/27-interchain-accounts/types/account_test.go +++ b/modules/apps/27-interchain-accounts/types/account_test.go @@ -120,19 +120,19 @@ func (suite *TypesTestSuite) TestGenesisAccountValidate() { ownerAddr := sdk.AccAddress(pubkey.Address()) testCases := []struct { - name string - acc authtypes.GenesisAccount - expPass bool + name string + acc authtypes.GenesisAccount + expErr error }{ { "success", types.NewInterchainAccount(baseAcc, ownerAddr.String()), - true, + nil, }, { "interchain account with empty AccountOwner field", types.NewInterchainAccount(baseAcc, ""), - false, + types.ErrInvalidAccountAddress, }, } @@ -141,10 +141,11 @@ func (suite *TypesTestSuite) TestGenesisAccountValidate() { err := tc.acc.Validate() - if tc.expPass { + if tc.expErr == nil { suite.Require().NoError(err) } else { suite.Require().Error(err) + suite.Require().ErrorIs(err, tc.expErr) } } } diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index c86523dbcc4..822eef86d1a 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -34,7 +34,7 @@ require ( cosmossdk.io/x/staking v0.0.0-20241218110910-47409028a73d cosmossdk.io/x/tx v1.0.0-alpha.3 cosmossdk.io/x/upgrade v0.1.4 - github.com/CosmWasm/wasmvm/v2 v2.1.2 + github.com/CosmWasm/wasmvm/v2 v2.1.4 github.com/cometbft/cometbft v1.0.0 github.com/cometbft/cometbft/api v1.0.0 github.com/cosmos/cosmos-db v1.1.1 diff --git a/modules/light-clients/08-wasm/go.sum b/modules/light-clients/08-wasm/go.sum index d74a0aba443..09d1033b1dc 100644 --- a/modules/light-clients/08-wasm/go.sum +++ b/modules/light-clients/08-wasm/go.sum @@ -271,8 +271,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.1.2 h1:GkJ5bAsRlLHfIQVg/FY1VHwLyBwlCjAhDea0B8L+e20= -github.com/CosmWasm/wasmvm/v2 v2.1.2/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= +github.com/CosmWasm/wasmvm/v2 v2.1.4 h1:7EUVQjBxXHkVjL2AqqXD7hMEe0dmoNn2li9E4PWRAnA= +github.com/CosmWasm/wasmvm/v2 v2.1.4/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/modules/light-clients/09-localhost/light_client_module.go b/modules/light-clients/09-localhost/light_client_module.go index cadfa805896..d4d941bfcd0 100644 --- a/modules/light-clients/09-localhost/light_client_module.go +++ b/modules/light-clients/09-localhost/light_client_module.go @@ -8,7 +8,6 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types" @@ -167,9 +166,8 @@ func (LightClientModule) LatestHeight(ctx context.Context, _ string) exported.He // TimestampAtHeight returns the current block time retrieved from the application context. The localhost client does not store consensus states and thus // cannot provide a timestamp for the provided height. -func (LightClientModule) TimestampAtHeight(ctx context.Context, _ string, _ exported.Height) (uint64, error) { - sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917 - return uint64(sdkCtx.BlockTime().UnixNano()), nil +func (l LightClientModule) TimestampAtHeight(ctx context.Context, _ string, _ exported.Height) (uint64, error) { + return uint64(l.HeaderService.HeaderInfo(ctx).Time.UnixNano()), nil } // RecoverClient returns an error. The localhost cannot be modified by proposals.