Skip to content

Commit

Permalink
Version 1.1.2
Browse files Browse the repository at this point in the history
Fix that the treasury is actually subtracted from the staking supply
  • Loading branch information
AaronKutch committed Aug 22, 2023
1 parent 25f54f6 commit f0f0079
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 6 deletions.
2 changes: 2 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ import (
v1_0_3_4 "github.com/onomyprotocol/onomy/app/upgrades/v1.0.3.4"
v1_0_3_5 "github.com/onomyprotocol/onomy/app/upgrades/v1.0.3.5"
v1_1_1 "github.com/onomyprotocol/onomy/app/upgrades/v1.1.1"
v1_1_2 "github.com/onomyprotocol/onomy/app/upgrades/v1.1.2"
"github.com/onomyprotocol/onomy/docs"
"github.com/onomyprotocol/onomy/x/dao"
daoclient "github.com/onomyprotocol/onomy/x/dao/client"
Expand Down Expand Up @@ -800,6 +801,7 @@ func (app *OnomyApp) setupUpgradeHandlers() {
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
},
)
app.UpgradeKeeper.SetUpgradeHandler(v1_1_2.Name, v1_1_2.UpgradeHandler)

upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions app/upgrades/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ This folder contains sub-folders for every chain upgrade.

## Version History

- v1.0.1 - IBC integration fix
- v1.0.3 - Hyperinflation fix
- v1.0.3.4 - OIP 6 Undelegate DAO from all validators
- v1.0.3.5 - OIP 6 Patch Subtract DAO Treasury from Staking Supply
- v1.1.2 - Fix that the treasury is actually subtracted from the staking supply
- v1.1.1 - Removal of Gravity module and addition of provider module
- v1.0.3.5 - OIP 6 Patch Subtract DAO Treasury from Staking Supply
- v1.0.3.4 - OIP 6 Undelegate DAO from all validators
- v1.0.3 - Hyperinflation fix
- v1.0.1 - IBC integration fix
16 changes: 16 additions & 0 deletions app/upgrades/v1.1.2/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Package v1_1_2 is contains chain upgrade of the corresponding version.
package v1_1_2 //nolint:revive,stylecheck // app version

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

// Name is migration name.
const Name = "v1.1.2"

// UpgradeHandler is an x/upgrade handler.
func UpgradeHandler(_ sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
return vm, nil
}
3 changes: 1 addition & 2 deletions tests/dockerfiles/chain_upgrade.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ ENV DAEMON_HOME="/root/.onomy"
# the previous version
ENV ONOMY_CURRENT_VERSION=v1.1.1
# the version that currently is implemented by this repository's state
# TODO this is currently the same because we removed support for the gravity module from onomy_tests
ENV ONOMY_UPGRADE_VERSION=v1.1.1
ENV ONOMY_UPGRADE_VERSION=v1.1.2
ENV ONOMY_UPGRADE_DIR_NAME=$ONOMY_UPGRADE_VERSION

# note that one has to go under `genesis/` and the other under `upgrades/`
Expand Down

0 comments on commit f0f0079

Please sign in to comment.