Skip to content

Commit

Permalink
Merge branch 'main' into interchaintest/delegator-gov
Browse files Browse the repository at this point in the history
  • Loading branch information
MSalopek authored Dec 9, 2024
2 parents 352f33c + 23f666b commit 95b0d9b
Show file tree
Hide file tree
Showing 82 changed files with 698 additions and 253 deletions.
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/3370-bump-cometbft.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cometbft](https://github.com/cometbft/cometbft) to
[v0.38.15](https://github.com/cometbft/cometbft/releases/tag/v0.38.15)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/3370-bump-cosmos-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.50.10-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.10-lsm)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/3370-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v8.5.2](https://github.com/cosmos/ibc-go/releases/tag/v8.5.2)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/3370-bump-cometbft.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cometbft](https://github.com/cometbft/cometbft) to
[v0.38.15](https://github.com/cometbft/cometbft/releases/tag/v0.38.15)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/3370-bump-cosmos-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.50.10-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.10-lsm)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/3370-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v8.5.2](https://github.com/cosmos/ibc-go/releases/tag/v8.5.2)
([\#3370](https://github.com/cosmos/gaia/pull/3370))
5 changes: 5 additions & 0 deletions .changelog/v21.0.1/bug-fixes/3418-bump-cosmossdk-math.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to
[v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) in order to
address the the [ASA-2024-010](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-7225-m954-23v7)
security advisory.
([\#3418](https://github.com/cosmos/gaia/pull/3418))
3 changes: 3 additions & 0 deletions .changelog/v21.0.1/dependencies/3418-bump-cosmossdk-math.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to
[v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0)
([\#3418](https://github.com/cosmos/gaia/pull/3418))
2 changes: 2 additions & 0 deletions .changelog/v21.0.1/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*November 21, 2024*

2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
make build-docs
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4.6.8
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages
folder: ~/output
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5.5.1
uses: docker/metadata-action@v5.6.1
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
flavor: "latest=false"

- name: Build and push docker image
uses: docker/build-push-action@v6.9.0
uses: docker/build-push-action@v6.10.0
with:
context: .
file: Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -40,7 +40,7 @@ jobs:
steps:
- name: install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -50,7 +50,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -72,7 +72,7 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sim-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -34,7 +34,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -43,7 +43,7 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -67,7 +67,7 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -85,7 +85,7 @@ jobs:
go-version: 1.22.x
- name: Install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -96,7 +96,7 @@ jobs:
steps:
- name: install runsim
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -109,7 +109,7 @@ jobs:
with:
go-version: 1.22.x
- uses: actions/checkout@v4
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
**/go.sum
**/Makefile
Makefile
- uses: actions/cache@v4.1.1
- uses: actions/cache@v4.2.0
with:
path: |
~/.cache/go-build
Expand Down Expand Up @@ -163,10 +163,10 @@ jobs:
# the old gaiad binary version is hardcoded, need to be updated each major release.
- name: Install Old Gaiad
run: |
curl -LO https://github.com/cosmos/gaia/releases/download/v20.0.0/gaiad-v20.0.0-linux-amd64
chmod a+x gaiad-v20.0.0-linux-amd64
curl -LO https://github.com/cosmos/gaia/releases/download/v21.0.0/gaiad-v21.0.0-linux-amd64
chmod a+x gaiad-v21.0.0-linux-amd64
mkdir build
mv ./gaiad-v20.0.0-linux-amd64 ./build/gaiadold
mv ./gaiad-v21.0.0-linux-amd64 ./build/gaiadold
if: env.GIT_DIFF
- name: Install New Gaiad
run: |
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# CHANGELOG

## v21.0.1

*November 21, 2024*

### BUG FIXES

- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to
[v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) in order to
address the the [ASA-2024-010](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-7225-m954-23v7)
security advisory.
([\#3418](https://github.com/cosmos/gaia/pull/3418))

### DEPENDENCIES

- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to
[v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0)
([\#3418](https://github.com/cosmos/gaia/pull/3418))

## v21.0.0

*October 14, 2024*
Expand Down
2 changes: 1 addition & 1 deletion ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
)

// UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag
Expand Down
2 changes: 1 addition & 1 deletion ante/gov_expedited_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"

gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
)

var expeditedPropDecoratorEnabled = true
Expand Down
4 changes: 2 additions & 2 deletions ante/gov_expedited_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"

"github.com/cosmos/gaia/v21/ante"
"github.com/cosmos/gaia/v21/app/helpers"
"github.com/cosmos/gaia/v22/ante"
"github.com/cosmos/gaia/v22/app/helpers"
)

func TestGovExpeditedProposalsDecorator(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ante/gov_vote_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
gaiaerrors "github.com/cosmos/gaia/v22/types/errors"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions ante/gov_vote_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/cosmos/gaia/v21/ante"
"github.com/cosmos/gaia/v21/app/helpers"
"github.com/cosmos/gaia/v22/ante"
"github.com/cosmos/gaia/v22/app/helpers"
)

// Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked
Expand Down
10 changes: 5 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ import (
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

gaiaante "github.com/cosmos/gaia/v21/ante"
"github.com/cosmos/gaia/v21/app/keepers"
"github.com/cosmos/gaia/v21/app/upgrades"
v21 "github.com/cosmos/gaia/v21/app/upgrades/v21"
gaiaante "github.com/cosmos/gaia/v22/ante"
"github.com/cosmos/gaia/v22/app/keepers"
"github.com/cosmos/gaia/v22/app/upgrades"
v22 "github.com/cosmos/gaia/v22/app/upgrades/v22"
)

var (
// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

Upgrades = []upgrades.Upgrade{v21.Upgrade}
Upgrades = []upgrades.Upgrade{v22.Upgrade}
)

var (
Expand Down
4 changes: 2 additions & 2 deletions app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"

gaia "github.com/cosmos/gaia/v21/app"
gaiahelpers "github.com/cosmos/gaia/v21/app/helpers"
gaia "github.com/cosmos/gaia/v22/app"
gaiahelpers "github.com/cosmos/gaia/v22/app/helpers"
)

type EmptyAppOptions struct{}
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"

gaiaapp "github.com/cosmos/gaia/v21/app"
gaiaapp "github.com/cosmos/gaia/v22/app"
)

// SimAppChainID hardcoded chainID for simulation
Expand Down
4 changes: 2 additions & 2 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ import (
wasm "github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

"github.com/cosmos/gaia/v21/x/metaprotocols"
metaprotocolstypes "github.com/cosmos/gaia/v21/x/metaprotocols/types"
"github.com/cosmos/gaia/v22/x/metaprotocols"
metaprotocolstypes "github.com/cosmos/gaia/v22/x/metaprotocols/types"
)

var maccPerms = map[string][]string{
Expand Down
2 changes: 1 addition & 1 deletion app/post.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/cosmos/gaia/v21/ante"
"github.com/cosmos/gaia/v22/ante"
)

// PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.
Expand Down
2 changes: 1 addition & 1 deletion app/sim/sim_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

gaia "github.com/cosmos/gaia/v21/app"
gaia "github.com/cosmos/gaia/v22/app"
)

// Simulation parameter constants
Expand Down
2 changes: 1 addition & 1 deletion app/sim/sim_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"

gaia "github.com/cosmos/gaia/v21/app"
gaia "github.com/cosmos/gaia/v22/app"
)

// SimulationOperations retrieves the simulation params from the provided file path
Expand Down
4 changes: 2 additions & 2 deletions app/sim_bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"

gaia "github.com/cosmos/gaia/v21/app"
"github.com/cosmos/gaia/v21/app/sim"
gaia "github.com/cosmos/gaia/v22/app"
"github.com/cosmos/gaia/v22/app/sim"
)

// Profile with:
Expand Down
6 changes: 3 additions & 3 deletions app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"

"github.com/cosmos/gaia/v21/ante"
gaia "github.com/cosmos/gaia/v21/app"
"github.com/cosmos/gaia/v22/ante"
gaia "github.com/cosmos/gaia/v22/app"
// "github.com/cosmos/gaia/v11/app/helpers"
// "github.com/cosmos/gaia/v11/app/params"
"github.com/cosmos/gaia/v21/app/sim"
"github.com/cosmos/gaia/v22/app/sim"
)

// AppChainID hardcoded chainID for simulation
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"

"github.com/cosmos/gaia/v21/app/keepers"
"github.com/cosmos/gaia/v22/app/keepers"
)

// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v19/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v19

import (
"github.com/cosmos/gaia/v21/app/upgrades"
"github.com/cosmos/gaia/v22/app/upgrades"
)

const (
Expand Down
Loading

0 comments on commit 95b0d9b

Please sign in to comment.