Skip to content

Commit 84c849b

Browse files
committed
Merge main into spike/gaia-v50-upgrade
2 parents c0d8602 + 8a9bbf7 commit 84c849b

File tree

90 files changed

+341
-189
lines changed

Some content is hidden

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

90 files changed

+341
-189
lines changed

.changelog/unreleased/api-breaking/3028-deprecate-globalfee.md

-5
This file was deleted.

.changelog/unreleased/dependencies/3028-bump-go.md

-2
This file was deleted.

.changelog/unreleased/dependencies/3051-add-cosmwasm.md

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Bump [ICS](https://github.com/cosmos/interchain-security) to
2+
[v4.3.1-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.3.1-
3+
lsm) ([\#3193](https://github.com/cosmos/gaia/pull/3193))

.changelog/unreleased/features/3028-add-feemarket.md

-2
This file was deleted.

.changelog/unreleased/features/3051-add-cosmwasm.md

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Reintroduce docker builds for gaia and make them compatible with
2+
interchaintest ([\#3199](https://github.com/cosmos/gaia/pull/3199))

.changelog/unreleased/state-breaking/3028-add-feemarket.md

-2
This file was deleted.

.changelog/unreleased/state-breaking/3028-deprecate-globalfee.md

-5
This file was deleted.

.changelog/unreleased/state-breaking/3051-add-cosmwasm.md

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Bump [ICS](https://github.com/cosmos/interchain-security) to
2+
[v4.3.1-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.3.1-
3+
lsm) ([\#3193](https://github.com/cosmos/gaia/pull/3193))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Remove both the globalfee module and the auth module 'DeductFeeDecorator'.
2+
([\#3028](https://github.com/cosmos/gaia/pull/3028))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Bump go version to 1.22
2+
([\#3028](https://github.com/cosmos/gaia/pull/3028))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add the wasmd module.
2+
([\#3051](https://github.com/cosmos/gaia/pull/3051))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
- Add the [feemarket module](https://github.com/skip-mev/feemarket) and set the initial params to the following values. ([\#3028](https://github.com/cosmos/gaia/pull/3028) and [\#3164](https://github.com/cosmos/gaia/pull/3164))
2+
```
3+
FeeDenom = "uatom"
4+
DistributeFees = false // burn base fees
5+
MinBaseGasPrice = 0.005 // same as previously enforced by `x/globalfee`
6+
MaxBlockUtilization = 30_000_000 // the default value
7+
```
8+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add the wasmd module.
2+
([\#3051](https://github.com/cosmos/gaia/pull/3051))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Enable both `MsgSoftwareUpgrade` and `MsgCancelUpgrade` to be expedited.
2+
([\#3149](https://github.com/cosmos/gaia/pull/3149))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add the [feemarket module](https://github.com/skip-mev/feemarket).
2+
([\#3028](https://github.com/cosmos/gaia/pull/3028))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Remove both the globalfee module and the auth module 'DeductFeeDecorator'.
2+
([\#3028](https://github.com/cosmos/gaia/pull/3028))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add the wasmd module.
2+
([\#3051](https://github.com/cosmos/gaia/pull/3051))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Bump [interchain-security](https://github.com/cosmos/interchain-security) to
2+
[v4.3.0-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.3.0-lsm).
3+
([\#3149](https://github.com/cosmos/gaia/pull/3149))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Enable both `MsgSoftwareUpgrade` and `MsgCancelUpgrade` to be expedited.
2+
([\#3149](https://github.com/cosmos/gaia/pull/3149))

.changelog/v18.0.0/summary.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*June 25, 2024*

.github/CODEOWNERS

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# CODEOWNERS: https://help.github.com/articles/about-codeowners/
22

33
# Primary repo maintainers
4-
* @alexanderbez @zmanian @crodriguezvega @jackzampolin @cosmos/informal_gaia_maintain
4+
* @zmanian @crodriguezvega @jackzampolin @cosmos/informal_gaia_maintain
55

6+
# CODEOWNERS for the CODEOWNER file
7+
8+
/.github/CODEOWNERS @cosmos/informal_gaia_maintain
9+
10+
# CODEOWNERS for interchain tests
11+
12+
/tests/interchain @dasanchez @LexaMichaelides @fastfadingviolets

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v4
2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: "1.21"
29+
go-version: "1.22"
3030
check-latest: true
3131

3232
# Initializes the CodeQL tools for scanning.

.github/workflows/deploy-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
make build-docs
4141
4242
- name: Deploy 🚀
43-
uses: JamesIves/[email protected].1
43+
uses: JamesIves/[email protected].3
4444
with:
4545
branch: gh-pages
4646
folder: ~/output

.github/workflows/docker-push.yml

+18-13
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
name: Create and publish a Docker image
33

44
on:
5-
push:
6-
branches: ['release']
5+
schedule:
6+
- cron: "0 0 * * *"
7+
release:
8+
types: [published]
9+
workflow_dispatch:
710

811
env:
912
REGISTRY: ghcr.io
@@ -20,6 +23,14 @@ jobs:
2023
- name: Checkout repository
2124
uses: actions/checkout@v4
2225

26+
- name: Get new commits for nightly build
27+
run: echo "NEW_COMMIT_COUNT=$(git log --oneline --since '24 hours ago' | wc -l)" >> $GITHUB_ENV
28+
if: "${{ env.GITHUB_EVENT_NAME == 'schedule' }}"
29+
30+
- name: Set new commits for other builds
31+
run: echo "NEW_COMMIT_COUNT=1" >> $GITHUB_ENV
32+
if: "${{ env.GITHUB_EVENT_NAME != 'schedule' }}"
33+
2334
- name: Log in to the Container registry
2435
uses: docker/[email protected]
2536
with:
@@ -32,20 +43,14 @@ jobs:
3243
uses: docker/[email protected]
3344
with:
3445
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
46+
flavor: "latest=false"
3547

36-
- name: Build and push Docker image
37-
uses: docker/build-push-action@v5.4.0
48+
- name: Build and push docker image
49+
uses: docker/build-push-action@v6.3.0
3850
with:
3951
context: .
52+
file: Dockerfile
4053
push: true
4154
tags: ${{ steps.meta.outputs.tags }}
4255
labels: ${{ steps.meta.outputs.labels }}
43-
44-
- name: Build and push e2e docker image
45-
uses: docker/[email protected]
46-
with:
47-
context: .
48-
file: Dockerfile.e2e
49-
push: true
50-
tags: ${{ steps.meta.outputs.tags }}-e2e
51-
labels: ${{ steps.meta.outputs.labels }}
56+
if: ${{ env.NEW_COMMIT_COUNT > 0 }}

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: actions/setup-go@v5
1818
with:
19-
go-version: "1.21"
19+
go-version: "1.22"
2020
check-latest: true
2121
- uses: technote-space/[email protected]
2222
id: git_diff

.github/workflows/nightly-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: "1.21"
24+
go-version: "1.22"
2525
check-latest: true
2626
- name: run-vulncheck
2727
id: vulncheck

.github/workflows/release-sims.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: 1.21.x
29+
go-version: 1.22.x
3030
- name: Install runsim
3131
run: go install github.com/cosmos/tools/cmd/[email protected]
3232
- uses: actions/[email protected]
@@ -65,7 +65,7 @@ jobs:
6565
- uses: actions/checkout@v4
6666
- uses: actions/setup-go@v5
6767
with:
68-
go-version: 1.21.x
68+
go-version: 1.22.x
6969
- uses: technote-space/[email protected]
7070
with:
7171
PATTERNS: |

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
release:
14-
runs-on: ubuntu-latest
14+
runs-on: Gaia-Runner-medium
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v4

.github/workflows/sim-label.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.21.x
20+
go-version: 1.22.x
2121
- name: Install runsim
2222
run: go install github.com/cosmos/tools/cmd/[email protected]
2323
- uses: actions/[email protected]
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: actions/setup-go@v5
3535
with:
36-
go-version: 1.21.x
36+
go-version: 1.22.x
3737
- uses: actions/[email protected]
3838
with:
3939
path: ~/go/bin

.github/workflows/sims.yml

+14-12
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ on:
99

1010
jobs:
1111
cleanup-runs:
12-
runs-on: ubuntu-latest
12+
runs-on: Gaia-Runner-medium
1313
steps:
1414
- uses: rokroskar/workflow-run-cleanup-action@master
1515
env:
1616
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1717
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
1818

1919
build:
20-
runs-on: ubuntu-latest
20+
runs-on: Gaia-Runner-medium
2121
steps:
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.21.x
24+
go-version: 1.22.x
2525
- name: Install runsim
2626
run: go install github.com/cosmos/tools/cmd/[email protected]
2727
- uses: actions/[email protected]
@@ -30,13 +30,13 @@ jobs:
3030
key: ${{ runner.os }}-go-runsim-binary
3131

3232
test-sim-nondeterminism:
33-
runs-on: ubuntu-latest
33+
runs-on: Gaia-Runner-medium
3434
needs: newbuild
3535
steps:
3636
- uses: actions/checkout@v4
3737
- uses: actions/setup-go@v5
3838
with:
39-
go-version: 1.21.x
39+
go-version: 1.22.x
4040
- uses: technote-space/[email protected]
4141
with:
4242
PATTERNS: |
@@ -54,13 +54,13 @@ jobs:
5454
if: "env.GIT_DIFF != ''"
5555

5656
test-sim-multi-seed-short:
57-
runs-on: ubuntu-latest
57+
runs-on: Gaia-Runner-medium
5858
needs: build
5959
steps:
6060
- uses: actions/checkout@v4
6161
- uses: actions/setup-go@v5
6262
with:
63-
go-version: 1.21.x
63+
go-version: 1.22.x
6464
- uses: technote-space/get-diff-action@v6
6565
with:
6666
PATTERNS: |
@@ -78,11 +78,11 @@ jobs:
7878
if: "env.GIT_DIFF != ''"
7979

8080
newbuild:
81-
runs-on: ubuntu-latest
81+
runs-on: Gaia-Runner-medium
8282
steps:
8383
- uses: actions/setup-go@v5
8484
with:
85-
go-version: 1.21.x
85+
go-version: 1.22.x
8686
- name: Install runsim
8787
run: go install github.com/cosmos/tools/cmd/[email protected]
8888
- uses: actions/[email protected]
@@ -91,7 +91,7 @@ jobs:
9191
key: ${{ runner.os }}-go-runsim-binary
9292

9393
install-runsim:
94-
runs-on: ubuntu-latest
94+
runs-on: Gaia-Runner-medium
9595
needs: build
9696
steps:
9797
- name: install runsim
@@ -102,12 +102,12 @@ jobs:
102102
key: ${{ runner.os }}-go-runsim-binary
103103

104104
test-sim-multi-seed-long:
105-
runs-on: ubuntu-latest
105+
runs-on: Gaia-Runner-medium
106106
needs: [build, install-runsim]
107107
steps:
108108
- uses: actions/setup-go@v5
109109
with:
110-
go-version: 1.21.x
110+
go-version: 1.22.x
111111
- uses: actions/checkout@v4
112112
- uses: actions/[email protected]
113113
with:
@@ -116,3 +116,5 @@ jobs:
116116
- name: test-sim-multi-seed-long
117117
run: |
118118
make test-sim-multi-seed-long
119+
if: "env.GIT_DIFF != ''"
120+

0 commit comments

Comments
 (0)