diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83d02e08424..76430a3bce4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -149,7 +149,7 @@ jobs: # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - git checkout v12.0.0 + git checkout v13.0.0 make build cp ./build/gaiad ./build/gaiadold go clean -modcache diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index c9317343d6a..ceb1794cf4a 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -3,6 +3,8 @@ - [Release Process](#release-process) - [Major Release Procedure](#major-release-procedure) - [Changelog](#changelog) + - [Creating a new release branch](#creating-a-new-release-branch) + - [Cutting a new release](#cutting-a-new-release) - [Release Notes](#release-notes) - [Tagging Procedure](#tagging-procedure) - [Test building artifacts](#test-building-artifacts) @@ -44,14 +46,10 @@ An exception are PRs open via the Github mergify integration (i.e., backported P * Update the [GitHub mergify integration](./.mergify.yml) by adding instructions for automatically backporting commits from `main` to the `release/vY` using the `A:backport/vY` label. * **PRs targeting directly a release branch can be merged _only_ when exceptional circumstances arise**. * In the release branch - * Create a new version section in the `CHANGELOG.md` - * All links must point to their respective pull request. - * The `CHANGELOG.md` must contain only the changes of that specific released version. - All other changelog entries must be deleted and linked to the `main` branch changelog ([example]([TBA](https://github.com/cosmos/gaia/blob/release/v9.0.x/CHANGELOG.md))). - * Note: `CHANGELOG.md` should not contain release candidate entries. + * Create a new version section in the `CHANGELOG.md` (follow the procedure described [below](#changelog)) * Create release notes, in `RELEASE_NOTES.md`, highlighting the new features and changes in the version. This is needed so the bot knows which entries to add to the release page on GitHub. - * Additionally verify that the `UPGRADING.md` file is up to date and contains all the necessary information for upgrading to the new version. + * (To be added in the future) ~~Additionally verify that the `UPGRADING.md` file is up to date and contains all the necessary information for upgrading to the new version.~~ * We freeze the release branch from receiving any new features and focus on releasing a release candidate. * Finish audits and reviews. * Add more tests. @@ -62,20 +60,58 @@ An exception are PRs open via the Github mergify integration (i.e., backported P * When bugs are found, create a PR for `main`, and backport fixes to the release branch. * Create new release candidate tags after bugs are fixed. * After the team feels the release candidate is mainnet ready, create a full release: - * Update `CHANGELOG.md`. - * Run `make format` to format the code. + * **Note:** The final release MUST have the same commit hash as the latest corresponding release candidate. * Create a new annotated git tag in the release branch (follow the [Tagging Procedure](#tagging-procedure)). This will trigger the automated release process (which will also create the release artifacts). * Once the release process completes, modify release notes if needed. ### Changelog -You can obtain the changelog by running: +For PRs that are changing production code, please add a changelog entry in `.changelog` (for details, see [contributing guidelines](./CONTRIBUTING.md#changelog)). + +To manage and generate the changelog on Gaia, we currently use [unclog](https://github.com/informalsystems/unclog). + +#### Creating a new release branch + +Unreleased changes are collected on `main` in `.changelog/unreleased/`. +However, `.changelog/` on `main` contains also existing releases (e.g., `v10.0.0`). +Thus, when creating a new release branch (e.g., `release/v11.x`), the following steps are necessary: + +- move to the release branch, e.g., `release/v11.x` +- delete all the sub-folders in `.changelog/` except `unreleased/` +- replace the content of `.changelog/epilogue.md` with the following text +```md +## Previous Versions + +[CHANGELOG of previous versions](https://github.com/cosmos/gaia/blob/main/CHANGELOG.md) +``` + +#### Cutting a new release + +Before cutting a _**release candidate**_ (e.g., `v11.0.0-rc0`), the following steps are necessary: + +- move to the release branch, e.g., `release/v11.x` +- move all entries in ".changelog/unreleased" to the release version, e.g., `v11.0.0`, i.e., +```bash +unclog release v11.0.0 +``` +- update the CHANGELOG.md, i.e., ```bash -git log --oneline --decorate .. +unclog build > CHANGELOG.md +``` -# example -git log --oneline --decorate v9.0.0..v9.1.0 +❗Once the **final release** is cut, the new changelog section must be added to main: + +- checkout a new branch from the `main` branch, i.e., +- bring the new changelog section from the release branch into this branch, e.g., +```bash +git checkout release/v11.x .changelog/v11.0.0 +``` +- remove duplicate entries that are both in `.changelog/unreleased/` and the new changelog section, e.g., `.changelog/v11.0.0` +- update the CHANGELOG.md +```bash +unclog build > CHANGELOG.md ``` +- open a PR (from this new created branch) against `main` ### Release Notes diff --git a/RELEASING.md b/RELEASING.md deleted file mode 100644 index 091c31504f2..00000000000 --- a/RELEASING.md +++ /dev/null @@ -1,182 +0,0 @@ -# Releasing - -This document outlines the release process for . We use [Long-Lived Version Branch Approach](x) on a `main` branch and a `release` branch. - -We follow [Semver](https://semver.org/) in that any patch releases are non-breaking changes. It's important to note, that breaking changes in a Blockchain context include non-determinism. So if a code change is backwards compatible, it may still impact the amount of gas needed to execute an action, which means the change is in fact breaking as it results in a different apphash after the code is executed. It's important for non-breaking changes to be possible to be used on the live network prior to the release. - -Each major release will have a release branch and patch releases will be tagged on this branch. No patched release has its own branch. (This branch strategy only applies to `v7` and later releases.) - -## Long-Lived Version Branch Approach - -In the Gaia repo, there are two categories of long-lived branches: - -### Branch: `main` - -The `main` branch should be targeted for PRs that contain a bug-fix/feature/improvement that will be included for the next release. - -### Branch: `release` - -There are multiple long-lived branches with the `release/` prefix. Each release series follows the format `release/vn.0.x`, e.g. `release/v7.0.x`. The branch `release/vn.0.x` should point to the most updated `vn` release, e.g. `release/v5.0.x` should be the same as `release/v5.0.8` if that's the latest `v5.0` release. - -## Other Branches - -### branches for the next release - -Other feature/fix branches targeting at `main` contain commits preparing for the next release. When the `release-prepare-branch` is ready for next release, add label `A:backport/vn.0.x` to the PR of `release-prepare-branch` against `main`, then the mergifybot will create a new PR of `mergify/bp/release/vn.0.x` against `Release/vn.0.x`. - -### branches for the backport release - -If the feature/fix branches are for a backport release, `main` branch already contains the commits for the next major release `vn`, the feature/fix branch's PR should target at `Release/vn-1` rather than `main`. - -## Release Procedure - -### Checks and tests - -Before merge and release, the following tests checks need to be conducted: - -- check the `replace` line in `go.mod`, check all the versions in `go.mod` are correct. -- run tests and simulations by `make run-tests`. -- test version compatibilities for minor releases. - -### Major and minor Release - -For a new major release `n`, checkout `release/vn.0.x` from `main`. Merge or use mergify to merge the commits to `release/vn.0.x`, and tag the version. -For minor release. Merge or use mergify to merge the commits to `release/vn.0.x`, and tag the version. - -Usually the first release on the `release/vn.0.x` is a release candidate. - -#### example of releasing `v8.0.0-rc0` - -1. checkout `release/v8.0.x` off `main` -1. get the `v8-prepare-branch` ready including CHANGELOG.md, create a PR to merge `v8-prepare-branch` to `main`, label this PR `A:backport/v8.0.x`. -1. after merge `v8-prepare-branch` to `main`, mergifybot will create a new PR of `mergify/bp/release/v8.0.x` to `release/v8.0.x`. Check the PR, and merge this PR. -1. checkout `release/v8.0.x` and tag `v8.0.0-rc0`. - -#### example of releasing `v8.0.0` - -1. get the `v800-prepare-branch` ready including CHANGELOG.md, create a PR to merge `v800-prepare-branch` to `main`, label this PR `A:backport/v8.0.x`. -1. after merge `v800-prepare-branch` to `main`, mergifybot will create a new PR of `mergify/bp/release/v8.0.x` to `release/v8.0.x`. Check the PR, and merge this PR. -1. checkout `release/v8.0.x` and tag `v8.0.0`. - -#### example of releasing `v8.0.1` - -1. get the `v801-prepare-branch`(off `main`) ready including CHANGELOG.md, create a PR to merge `v801-prepare-branch` to `main`, label this PR `A:backport/v8.0.x`. -1. after merge `v801-prepare-branch` to `main`, mergifybot will create a new PR of `mergify/bp/release/v8.0.x` to `release/v8.0.x`. Check the PR, and merge this PR. -1. checkout `release/v8.0.x` and tag `v8.0.1`. - -### backport release - -For a backport release, checkout a new branch from the right release branch, for example, `release/vn-1.0.x`. Commits to this new branch and merge into `release/vn-1.0.x`, tag the backport version from `release/vn-1.0.x`. - -#### example of backport release `v7.0.5` - -assume main branch is at `v8`. - -1. checkout `v705-prepare-branch` off `release/v7.0.x`, get the backport changes ready including CHANGELOG.md on `v705-prepare-branch`. -1. create a PR to merge `v705-prepare-branch` to `release/v7.0.x`, and merge. -1. checkout `release/v7.0.x` tag `v7.0.5`. - -### Test building artifacts - -Before tagging the version, please test the building releasing artifacts by - -```bash -make distclean build-reproducible -``` - -The above command will generate a directory -`gaia/artifacts` with different os and architecture binaries. If the above command runs sucessfully, delete the directory `rm -r gaia/artifacts`. - -### Tagging - -The following steps are the default for tagging a specific branch commit (usually on a branch labeled `release/vX.X.X`): - -1. Ensure you have checked out the commit you wish to tag -1. `git pull --tags --dry-run` -1. `git pull --tags` -1. `git tag -s v3.0.1 -m 'Release v3.0.1'` - 1. optional, add the `-s` tag to create a signed commit using your PGP key (which should be added to github beforehand) -1. `git push --tags --dry-run` -1. `git push --tags` - -To re-create a tag: - -1. `git tag -d v4.0.0` to delete a tag locally -1. `git push --delete origin v4.0.0`, to push the deletion to the remote -1. Proceed with the above steps to create a tag - -To tag and build without a public release (e.g., as part of a timed security release): - -1. Follow the steps above for tagging locally, but do not push the tags to the repository. -1. After adding the tag locally, you can build the binary, e.g., `make build-reproducible`. -1. To finalize the release, push the local tags, create a release based off the newly pushed tag, and attach the binaries. - -### Release notes - -Ensure you run the reproducible build in order to generate sha256 hashes and platform binaries; -these artifacts should be included in the release. - -```bash -make distclean build-reproducible -``` - -This runs the docker image [tendermintdev/rbuilder](https://hub.docker.com/r/tendermintdev/rbuilder) with a copy of the [rbuilder](https://github.com/tendermint/images/tree/master/rbuilder) docker file. - -Then use the following release text template: - -```markdown -# Gaia v4.0.0 Release Notes - -Note, that this specific release will be updated with a newer changelog, and the below hashes and binaries will also be updated. - -This release includes bug fixes for prop29, as well as additional support for IBC and Ledger signing. - -As there is a breaking change from Gaia v3, the Gaia module has been incremented to v4. - -See the [Cosmos SDK v0.41.0 Release](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.0) for details. - -```bash -$ make distclean build-reproducible -App: gaiad -Version: 4.0.0 -Commit: 2bb04266266586468271c4ab322367acbf41188f -Files: - 2e801c7424ef67e6d9fc092c2b75c2d3 gaiad-4.0.0-darwin-amd64 - dc21eb861480e0f55af876f271b512fe gaiad-4.0.0-linux-amd64 - bda165f91bc065afb8a445e72be9a868 gaiad-4.0.0-linux-arm64 - c7203d53bd596679b39b6a94d1dbe0dc gaiad-4.0.0-windows-amd64.exe - 81299b602e1760078e03c97813edda60 gaiad-4.0.0.tar.gz -Checksums-Sha256: - de764e52acc31dd98fa49d8d0eef851f3b7b53e4f1d4fbfda2c07b1a8b115b91 gaiad-4.0.0-darwin-amd64 - e5244ccd98a05479cc35753da1bb5b6bd873f6d8ebe6f8c5d112cf4d9e2761b4 gaiad-4.0.0-linux-amd64 - 7b7c4ea3e2de5f228436dcbb177455906239603b11eca1fb1015f33973d7b567 gaiad-4.0.0-linux-arm64 - b418c5f296ee6f946f44da8497af594c6ad0ece2b1da09a93a45d7d1b1457f27 gaiad-4.0.0-windows-amd64.exe - 3895518436b74be8b042d7d0b868a60d03e1656e2556b12132be0f25bcb061ef gaiad-4.0.0.tar.gz -``` - -# Major Release Maintenance - -Major Release series continue to receive bug fixes (released as a Patch Release) until they reach End Of Life. Major Release series are maintained in compliance with the Stable Release Policy as described in this document. Note: not every Major Release is denoted as a stable release. - -Only the following major release series have a stable release status: - -v7 Theta is supported until v9 Lambda. A fairly strict **bugfix-only** rule applies to pull requests that are requested to be included into a stable point-release. - -v6 Vega is supported until v8 Rho. A fairly strict **bugfix-only** rule applies to pull requests that are requested to be included into a stable point-release. - -v5 Delta is supported until v7 Theta. A fairly strict **bugfix-only** rule applies to pull requests that are requested to be included into a stable point-release. - -After two releases, a supported version will be transitioned to unsupported and will be deemed EOL with no further updates. - -# Stable Release Policy - -The intention of the Stable Release Policy is to ensure that all major release series that are not EOL, are maintained with the following categories of fixes: - -- Tooling improvements (including code formatting, linting, static analysis and updates to testing frameworks) -- Performance enhancements for running archival and synching nodes -- Test and benchmarking suites, ensuring that fixes are sound and there are no performance regressions -- Library updates including point releases for core libraries such as IBC-Go, Cosmos SDK, CometBFT and other dependencies -- General maintenance improvements, that are deemed necessary by the stewarding team, that help align different releases and reduce the workload on the stewarding team -- Security fixes - -Issues that are likely excluded, are any issues that impact operating a block producing network. diff --git a/ante/ante.go b/ante/ante.go index 72f2241e389..4f3215ba2a6 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -12,8 +12,8 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/ante/gov_ante.go b/ante/gov_ante.go index e0abb9fd4b3..7d8b6b3fd1d 100644 --- a/ante/gov_ante.go +++ b/ante/gov_ante.go @@ -9,7 +9,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) // initial deposit must be greater than or equal to 10% of the minimum deposit diff --git a/ante/gov_ante_test.go b/ante/gov_ante_test.go index 9f11c51ae70..d965b2d76eb 100644 --- a/ante/gov_ante_test.go +++ b/ante/gov_ante_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/gaia/v13/ante" - gaiaapp "github.com/cosmos/gaia/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" + "github.com/cosmos/gaia/v14/ante" + gaiaapp "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" ) var ( diff --git a/app/app.go b/app/app.go index 9a6312423c4..382ac83b74c 100644 --- a/app/app.go +++ b/app/app.go @@ -45,19 +45,19 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaante "github.com/cosmos/gaia/v13/ante" - "github.com/cosmos/gaia/v13/app/keepers" - gaiaappparams "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/app/upgrades" - v13 "github.com/cosmos/gaia/v13/app/upgrades/v13" - "github.com/cosmos/gaia/v13/x/globalfee" + gaiaante "github.com/cosmos/gaia/v14/ante" + "github.com/cosmos/gaia/v14/app/keepers" + gaiaappparams "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/app/upgrades" + v14 "github.com/cosmos/gaia/v14/app/upgrades/v14" + "github.com/cosmos/gaia/v14/x/globalfee" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v13.Upgrade} + Upgrades = []upgrades.Upgrade{v14.Upgrade} ) var ( diff --git a/app/app_test.go b/app/app_test.go index 53f77176382..e3dc4521e3e 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -10,8 +10,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gaia "github.com/cosmos/gaia/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" + gaia "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/encoding.go b/app/encoding.go index 55fe401f209..6cec0ad1f56 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package gaia import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/cosmos/gaia/v13/app/params" + "github.com/cosmos/gaia/v14/app/params" ) // MakeTestEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index de96f07630e..2544de72548 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -22,7 +22,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaapp "github.com/cosmos/gaia/v13/app" + gaiaapp "github.com/cosmos/gaia/v14/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 076ef997349..f649833ffcf 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -62,7 +62,7 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/x/globalfee" + "github.com/cosmos/gaia/v14/x/globalfee" ) type AppKeepers struct { diff --git a/app/modules.go b/app/modules.go index f774e104bab..8aaed6a11a5 100644 --- a/app/modules.go +++ b/app/modules.go @@ -52,8 +52,8 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gaiaappparams "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/x/globalfee" + gaiaappparams "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/x/globalfee" ) var maccPerms = map[string][]string{ diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index e1053aec363..57df6151bd2 100644 --- a/app/sim/sim_state.go +++ b/app/sim/sim_state.go @@ -21,7 +21,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/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) // AppStateFn returns the initial application state using a genesis or the simulation parameters. diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index 2e4e39d7a1c..9d061980fcf 100644 --- a/app/sim/sim_utils.go +++ b/app/sim/sim_utils.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - gaia "github.com/cosmos/gaia/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) // SetupSimulation creates the config, db (levelDB), temporary directory and logger for diff --git a/app/sim_test.go b/app/sim_test.go index c48b68b4b5a..c2ddc173377 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -17,10 +17,10 @@ import ( simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/helpers" - "github.com/cosmos/gaia/v13/app/params" - "github.com/cosmos/gaia/v13/app/sim" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/helpers" + "github.com/cosmos/gaia/v14/app/params" + "github.com/cosmos/gaia/v14/app/sim" ) func init() { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 74bbbe1cb6b..21c6d3e7964 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 54d90d226d4..f7ef82b2df3 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 9eb9b4fca07..a9e5f23b86f 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index 55b9e7670d8..a6fb322fa23 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index 3d6db458748..094bec209ac 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index a32b0f09f4f..edd47608af1 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -3,7 +3,7 @@ package v12 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 33c4393b262..d2e27316f2d 100644 --- a/app/upgrades/v12/upgrades.go +++ b/app/upgrades/v12/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index dcdd00a1420..9517bd26971 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -1,7 +1,7 @@ package v13 import ( - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 9ee328d928d..06cb10f3dde 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go new file mode 100644 index 00000000000..7172d6a04fa --- /dev/null +++ b/app/upgrades/v14/constants.go @@ -0,0 +1,15 @@ +package v14 + +import ( + "github.com/cosmos/gaia/v14/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v14" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go new file mode 100644 index 00000000000..c3d81130440 --- /dev/null +++ b/app/upgrades/v14/upgrades.go @@ -0,0 +1,27 @@ +package v14 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + "github.com/cosmos/gaia/v14/app/keepers" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("Starting module migrations...") + + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + ctx.Logger().Info("Upgrade complete") + return vm, err + } +} diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index d2e142a83b7..3d965a0f0c0 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 3d3d2766034..470511c8f97 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index ce5e94ba666..12de1908a86 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -3,8 +3,8 @@ package v8 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" - "github.com/cosmos/gaia/v13/x/globalfee" + "github.com/cosmos/gaia/v14/app/upgrades" + "github.com/cosmos/gaia/v14/x/globalfee" ) const ( diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 6ee76679ce1..190d354e122 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -14,7 +14,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func FixBankMetadata(ctx sdk.Context, keepers *keepers.AppKeepers) error { diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go index aac62691873..99abaa30fb5 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/gaia/v13/app/upgrades" + "github.com/cosmos/gaia/v14/app/upgrades" ) const ( diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index d90b3ead3a3..0c49d0bc3fa 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cosmos/gaia/v13/app/keepers" + "github.com/cosmos/gaia/v14/app/keepers" ) func CreateUpgradeHandler( diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index d1af78ec170..1dfcac71e03 100644 --- a/cmd/gaiad/cmd/bech32_convert.go +++ b/cmd/gaiad/cmd/bech32_convert.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - addressutil "github.com/cosmos/gaia/v13/pkg/address" + addressutil "github.com/cosmos/gaia/v14/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index 6a8cddb9f3b..3e85d35d7d2 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -31,8 +31,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/params" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/params" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/gaiad/cmd/root_test.go b/cmd/gaiad/cmd/root_test.go index bc8a6cadbad..206ef93e7a8 100644 --- a/cmd/gaiad/cmd/root_test.go +++ b/cmd/gaiad/cmd/root_test.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/cmd/gaiad/cmd" ) func TestRootCmdConfig(t *testing.T) { diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index f1dcc176b15..897dce4444a 100644 --- a/cmd/gaiad/main.go +++ b/cmd/gaiad/main.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/cmd/gaiad/cmd" ) func main() { diff --git a/go.mod b/go.mod index 2d6cebf00a0..dfd12779087 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v13 +module github.com/cosmos/gaia/v14 go 1.20 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 64452b573af..b345ed6f68e 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -13,8 +13,8 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v13/app" - "github.com/cosmos/gaia/v13/app/params" + gaia "github.com/cosmos/gaia/v14/app" + "github.com/cosmos/gaia/v14/app/params" ) const ( diff --git a/tests/e2e/e2e_vesting_test.go b/tests/e2e/e2e_vesting_test.go index 3cd70ad6d28..43838037fd9 100644 --- a/tests/e2e/e2e_vesting_test.go +++ b/tests/e2e/e2e_vesting_test.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/x/globalfee/ante" + "github.com/cosmos/gaia/v14/x/globalfee/ante" ) const ( diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go index d89fe4ae9ec..6f7059f965f 100644 --- a/tests/e2e/genesis.go +++ b/tests/e2e/genesis.go @@ -19,7 +19,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { diff --git a/tests/e2e/query.go b/tests/e2e/query.go index 6ba1ba81a5a..b93ed9a0312 100644 --- a/tests/e2e/query.go +++ b/tests/e2e/query.go @@ -16,7 +16,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func queryGaiaTx(endpoint, txHash string) error { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index d50bdc92bb0..48e0b39cc46 100644 --- a/tests/e2e/validator.go +++ b/tests/e2e/validator.go @@ -25,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v13/app" + gaia "github.com/cosmos/gaia/v14/app" ) //nolint:unused diff --git a/tests/ics/interchain_security_test.go b/tests/ics/interchain_security_test.go index 141ee73a6ae..3b1e844ad27 100644 --- a/tests/ics/interchain_security_test.go +++ b/tests/ics/interchain_security_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/interchain-security/v2/tests/integration" icstestingutils "github.com/cosmos/interchain-security/v2/testutil/ibc_testing" - gaiaApp "github.com/cosmos/gaia/v13/app" + gaiaApp "github.com/cosmos/gaia/v14/app" ) func TestCCVTestSuite(t *testing.T) { diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index a7e7337cd59..8de706b955b 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index 66646cf2a39..603ab27f587 100644 --- a/x/globalfee/ante/antetest/fee_test.go +++ b/x/globalfee/ante/antetest/fee_test.go @@ -13,8 +13,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) var testGasLimit uint64 = 200_000 diff --git a/x/globalfee/ante/antetest/fee_test_setup.go b/x/globalfee/ante/antetest/fee_test_setup.go index 28fbad3f3ab..f3a1ff5a450 100644 --- a/x/globalfee/ante/antetest/fee_test_setup.go +++ b/x/globalfee/ante/antetest/fee_test_setup.go @@ -17,11 +17,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaapp "github.com/cosmos/gaia/v13/app" - gaiahelpers "github.com/cosmos/gaia/v13/app/helpers" - "github.com/cosmos/gaia/v13/x/globalfee" - gaiafeeante "github.com/cosmos/gaia/v13/x/globalfee/ante" - globfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiaapp "github.com/cosmos/gaia/v14/app" + gaiahelpers "github.com/cosmos/gaia/v14/app/helpers" + "github.com/cosmos/gaia/v14/x/globalfee" + gaiafeeante "github.com/cosmos/gaia/v14/x/globalfee/ante" + globfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index 913db72112a..92cfb6718e1 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -12,9 +12,9 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" - "github.com/cosmos/gaia/v13/x/globalfee" - "github.com/cosmos/gaia/v13/x/globalfee/types" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" + "github.com/cosmos/gaia/v14/x/globalfee" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) // FeeWithBypassDecorator checks if the transaction's fee is at least as large diff --git a/x/globalfee/ante/fee_utils.go b/x/globalfee/ante/fee_utils.go index d66929b0000..94eac3b5582 100644 --- a/x/globalfee/ante/fee_utils.go +++ b/x/globalfee/ante/fee_utils.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) // ContainZeroCoins returns true if the given coins are empty or contain zero coins, diff --git a/x/globalfee/client/cli/query.go b/x/globalfee/client/cli/query.go index 08751f58f4e..ed48a97a38c 100644 --- a/x/globalfee/client/cli/query.go +++ b/x/globalfee/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 04c13b00187..7fe2739c4e5 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -18,7 +18,7 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index 5036f70f731..6c6ffa878eb 100644 --- a/x/globalfee/keeper/migrations.go +++ b/x/globalfee/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v13/x/globalfee/migrations/v2" + v2 "github.com/cosmos/gaia/v14/x/globalfee/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/globalfee/migrations/v2/migration.go b/x/globalfee/migrations/v2/migration.go index 065337ae92d..b07624273f1 100644 --- a/x/globalfee/migrations/v2/migration.go +++ b/x/globalfee/migrations/v2/migration.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) // MigrateStore performs in-place params migrations of diff --git a/x/globalfee/migrations/v2/v2_test/migration_test.go b/x/globalfee/migrations/v2/v2_test/migration_test.go index b7d36d20785..ba513628f1d 100644 --- a/x/globalfee/migrations/v2/v2_test/migration_test.go +++ b/x/globalfee/migrations/v2/v2_test/migration_test.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/cosmos/gaia/v13/x/globalfee/migrations/v2" - globalfeetypes "github.com/cosmos/gaia/v13/x/globalfee/types" + v2 "github.com/cosmos/gaia/v14/x/globalfee/migrations/v2" + globalfeetypes "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index 0fb07acedfb..238df44a1b5 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/client/cli" - "github.com/cosmos/gaia/v13/x/globalfee/keeper" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/client/cli" + "github.com/cosmos/gaia/v14/x/globalfee/keeper" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index 4f4c7e250dd..4d2d15b90ac 100644 --- a/x/globalfee/querier.go +++ b/x/globalfee/querier.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/querier_test.go b/x/globalfee/querier_test.go index 966bcd55571..1a29bd627ab 100644 --- a/x/globalfee/querier_test.go +++ b/x/globalfee/querier_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cosmos/gaia/v13/x/globalfee/types" + "github.com/cosmos/gaia/v14/x/globalfee/types" ) func TestQueryMinimumGasPrices(t *testing.T) { diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go index 7f0d522d303..b83a693100b 100644 --- a/x/globalfee/types/params.go +++ b/x/globalfee/types/params.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaerrors "github.com/cosmos/gaia/v13/types/errors" + gaiaerrors "github.com/cosmos/gaia/v14/types/errors" ) var (