From 7ee48b50812cd0f2c95d638443723931ad7b38fa Mon Sep 17 00:00:00 2001 From: John Letey Date: Fri, 15 Sep 2023 18:25:18 -0600 Subject: [PATCH] chore: cleanup post `v3.1.0` release --- .changelog/config.toml | 1 + .changelog/epilogue.md | 5 ++++ .changelog/unreleased/.gitkeep | 0 .../features/215-rosetta-support.md | 1 + .../v3.1.0/features/235-ibc-authority.md | 1 + .../v3.1.0/improvements/234-module-path.md | 1 + .changelog/v3.1.0/summary.md | 5 ++++ .github/mergify.yml | 8 +++++++ CHANGELOG.md | 24 +++++++++++++++++++ app/app.go | 11 +++++++++ app/upgrades/v3.1.0/constants.go | 6 +++++ app/upgrades/v3.1.0/store.go | 15 ++++++++++++ app/upgrades/v3.1.0/upgrade.go | 16 +++++++++++++ interchaintest/upgrade_noble-1_test.go | 8 +++++++ 14 files changed, 102 insertions(+) create mode 100644 .changelog/config.toml create mode 100644 .changelog/epilogue.md create mode 100644 .changelog/unreleased/.gitkeep create mode 100644 .changelog/unreleased/features/215-rosetta-support.md create mode 100644 .changelog/v3.1.0/features/235-ibc-authority.md create mode 100644 .changelog/v3.1.0/improvements/234-module-path.md create mode 100644 .changelog/v3.1.0/summary.md create mode 100644 CHANGELOG.md create mode 100644 app/upgrades/v3.1.0/constants.go create mode 100644 app/upgrades/v3.1.0/store.go create mode 100644 app/upgrades/v3.1.0/upgrade.go diff --git a/.changelog/config.toml b/.changelog/config.toml new file mode 100644 index 00000000..7f00fc0c --- /dev/null +++ b/.changelog/config.toml @@ -0,0 +1 @@ +project_url = "https://github.com/strangelove-ventures/noble" diff --git a/.changelog/epilogue.md b/.changelog/epilogue.md new file mode 100644 index 00000000..b9b22a21 --- /dev/null +++ b/.changelog/epilogue.md @@ -0,0 +1,5 @@ +--- + +## Previous Changes + +This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes. diff --git a/.changelog/unreleased/.gitkeep b/.changelog/unreleased/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/.changelog/unreleased/features/215-rosetta-support.md b/.changelog/unreleased/features/215-rosetta-support.md new file mode 100644 index 00000000..6439d94b --- /dev/null +++ b/.changelog/unreleased/features/215-rosetta-support.md @@ -0,0 +1 @@ +- Support for Coinbase's [Rosetta API](https://docs.cloud.coinbase.com/rosetta/docs/welcome). ([#215](https://github.com/strangelove-ventures/noble/pull/215)) diff --git a/.changelog/v3.1.0/features/235-ibc-authority.md b/.changelog/v3.1.0/features/235-ibc-authority.md new file mode 100644 index 00000000..b561ae7f --- /dev/null +++ b/.changelog/v3.1.0/features/235-ibc-authority.md @@ -0,0 +1 @@ +- Include support for IBC inside the ParamAuthority. ([#235](https://github.com/strangelove-ventures/noble/pull/235)) diff --git a/.changelog/v3.1.0/improvements/234-module-path.md b/.changelog/v3.1.0/improvements/234-module-path.md new file mode 100644 index 00000000..2fc1299d --- /dev/null +++ b/.changelog/v3.1.0/improvements/234-module-path.md @@ -0,0 +1 @@ +- Align module path with Go's [naming convention](https://go.dev/doc/modules/version-numbers#major-version). ([#234](https://github.com/strangelove-ventures/noble/pull/234)) diff --git a/.changelog/v3.1.0/summary.md b/.changelog/v3.1.0/summary.md new file mode 100644 index 00000000..0a6d248f --- /dev/null +++ b/.changelog/v3.1.0/summary.md @@ -0,0 +1,5 @@ +*Sep 15, 2023* + +This is a minor release to the v3 Radon line. + +In response to multiple IBC channels expiring on Noble's mainnet network, it was decided to expand the functionality of Noble's Maintenance Multisig to include IBC upgrade functionality (allowing expired clients to be changed). diff --git a/.github/mergify.yml b/.github/mergify.yml index d513b0f3..4657933d 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -14,6 +14,14 @@ pull_request_rules: backport: branches: - release/v3.0.x + - name: backport patches to v3.1.x branch + conditions: + - base=main + - label=backport/v3.1.x + actions: + backport: + branches: + - release/v3.1.x - name: backport patches to v4.0.x branch conditions: - base=main diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..72c80abc --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,24 @@ +# CHANGELOG + +## v3.1.0 + +*Sep 15, 2023* + +This is a minor release to the v3 Radon line. + +In response to multiple IBC channels expiring on Noble's mainnet network, it was decided to expand the functionality of Noble's Maintenance Multisig to include IBC upgrade functionality (allowing expired clients to be changed). + +### FEATURES + +- Include support for IBC inside the ParamAuthority. ([#235](https://github.com/strangelove-ventures/noble/pull/235)) + +### IMPROVEMENTS + +- Align module path with Go's [naming convention](https://go.dev/doc/modules/version-numbers#major-version). ([#234](https://github.com/strangelove-ventures/noble/pull/234)) + +--- + +## Previous Changes + +This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes. + diff --git a/app/app.go b/app/app.go index 8d065d76..3b889f21 100644 --- a/app/app.go +++ b/app/app.go @@ -94,6 +94,7 @@ import ( "github.com/strangelove-ventures/noble/app/upgrades/argon4" "github.com/strangelove-ventures/noble/app/upgrades/neon" "github.com/strangelove-ventures/noble/app/upgrades/radon" + v3m1p0 "github.com/strangelove-ventures/noble/app/upgrades/v3.1.0" "github.com/strangelove-ventures/noble/cmd" "github.com/strangelove-ventures/noble/docs" "github.com/strangelove-ventures/noble/x/blockibc" @@ -907,6 +908,14 @@ func (app *App) setupUpgradeHandlers() { app.FiatTokenFactoryKeeper, )) + // v3.1.0 upgrade + app.UpgradeKeeper.SetUpgradeHandler( + v3m1p0.UpgradeName, + v3m1p0.CreateUpgradeHandler( + app.mm, + app.configurator, + )) + // argon upgrade app.UpgradeKeeper.SetUpgradeHandler( argon.UpgradeName, @@ -944,6 +953,8 @@ func (app *App) setupUpgradeHandlers() { storeLoader = neon.CreateStoreLoader(upgradeInfo.Height) case radon.UpgradeName: storeLoader = radon.CreateStoreLoader(upgradeInfo.Height) + case v3m1p0.UpgradeName: + storeLoader = v3m1p0.CreateStoreLoader(upgradeInfo.Height) case argon.UpgradeName: storeLoader = argon.CreateStoreLoader(upgradeInfo.Height) case argon4.UpgradeName: diff --git a/app/upgrades/v3.1.0/constants.go b/app/upgrades/v3.1.0/constants.go new file mode 100644 index 00000000..d35b0c21 --- /dev/null +++ b/app/upgrades/v3.1.0/constants.go @@ -0,0 +1,6 @@ +package v3m1p0 + +const ( + // UpgradeName is the name of this specific software upgrade used on-chain. + UpgradeName = "v3.1.0" +) diff --git a/app/upgrades/v3.1.0/store.go b/app/upgrades/v3.1.0/store.go new file mode 100644 index 00000000..f9b2627b --- /dev/null +++ b/app/upgrades/v3.1.0/store.go @@ -0,0 +1,15 @@ +package v3m1p0 + +import ( + "github.com/cosmos/cosmos-sdk/baseapp" + storeTypes "github.com/cosmos/cosmos-sdk/store/types" + + // Upgrade + upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader { + storeUpgrades := storeTypes.StoreUpgrades{} + + return upgradeTypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades) +} diff --git a/app/upgrades/v3.1.0/upgrade.go b/app/upgrades/v3.1.0/upgrade.go new file mode 100644 index 00000000..281bfb81 --- /dev/null +++ b/app/upgrades/v3.1.0/upgrade.go @@ -0,0 +1,16 @@ +package v3m1p0 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + cfg module.Configurator, +) upgradeTypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + return mm.RunMigrations(ctx, cfg, vm) + } +} diff --git a/interchaintest/upgrade_noble-1_test.go b/interchaintest/upgrade_noble-1_test.go index 8376b88c..bc3c86a8 100644 --- a/interchaintest/upgrade_noble-1_test.go +++ b/interchaintest/upgrade_noble-1_test.go @@ -33,6 +33,14 @@ func TestNoble1ChainUpgrade(t *testing.T) { image: ghcrImage("v3.1.0"), postUpgrade: testPostRadonUpgrade, }, + { + upgradeName: "v3.1.0", + image: ibc.DockerImage{ + Repository: "ghcr.io/strangelove-ventures/noble", + Version: "v3.1.0", + UidGid: containerUidGid, + }, + }, { upgradeName: "argon", image: nobleImageInfo[0],