Skip to content

Commit

Permalink
chore: sync main with v11.0.x branch (#1292)
Browse files Browse the repository at this point in the history 
* chore(upgrade): release v11-rc1 (#1247)

* fix(upgrade): add recovery store on store upgrade (backport #1257) (#1261)

* fix(upgrade): add recovery store on store upgrade (#1257)

* fix(upgrade): add recovery store on store upgrade

* fix(upgrade): add changelog entry

(cherry picked from commit 2f9b1da)

# Conflicts:
#	CHANGELOG.md

* conflict

Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* fix(upgrade): add account number and sequence to migrated IBC escrow accounts (backport #1252) (#1263)

fix(upgrade): add account number and sequence to migrated IBC escrow accounts (#1252)

* fix(upgrade): add account number and sequence to migrated escrow accounts

* fix(upgrade): small changes

* fix(upgrade): fix linting issues

* fix(upgrade) add changelog entry

* fix(upgrade) apply review comments

* fix(upgrade): add note on docs about escrow accounts

* fix(upgrade): update open channels to 37

* fix(upgrade): fix md linting issues

(cherry picked from commit 1655308)

Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* imp(inflation): remove dup store calls and improve perf (backport #1258) (#1262)

* imp(inflation): remove dup store calls and improve perf (#1258)

* imp(inflation): remove dup store calls and improve perf

* changelog

* add logger

* tests

(cherry picked from commit 76dcaf8)

# Conflicts:
#	CHANGELOG.md
#	x/inflation/migrations/v3/migrate_test.go

* conflict

* changelog

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* fix(inflation): re-add missing key to avoid keys shift (backport #1259) (#1260)

* fix(inflation): re-add missing key to avoid keys shift (#1259)

* fix: added correct int type for periods in store migration

* fix: added error checking

* fix: removed old param getting

* Update x/inflation/migrations/v3/migrate.go

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* fix: revert removal of missing key

* Changelog entry

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit 127ac76)

# Conflicts:
#	CHANGELOG.md

* conflict

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* chore(upgrade): changelog and const (#1264)

* chore (deps): bump Ethermint to v0.21.0-rc2 (backport #1269) (#1270)

* chore (deps): bump Ethermint to v0.21.0-rc2 (#1269)

* bump Ethermint to v0.21.0-rc2

* update ethermintserver syntax in root.go

* lint

* update based on review comments

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: tom <tomasguerraalda@hotmail.com>

* update changelog entry

* update PR number

* fix md link

Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* chore: v11-rc2 changelog (#1272)

* fix(app): store upgrades for rc3 (#1276)

* fix(app): store upgrades for rc3

* c++

* fix: test changes deleting module and renaming

* fix: recovery added and deleted

* fix: rename module

* update store loader

* fix: finished store_loader

* Update app/app.go

Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>

* fix: app.go customStoreLoader

* fix: execute replaced first

* Update app/store_loader.go

Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>

* fix: original plan of deleting and readding module

* rm loader, update keys

* lint

* c++

* Apply suggestions from code review

Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

* chore(deps): bump SDK to v0.46.8-ledger (backport #1279) (#1280)

* chore(deps): bump SDK to v0.46.8-ledger (#1279)

* chore(deps): bump SDK to v0.46.8-ledger

* c++

(cherry picked from commit ef71537)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum

* Apply suggestions from code review

* conflicts

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* fix(upgrade): remove deletion of recovery module from mainnet upgrade (#1282)

* fix: removed deleted recovery module for mainnet

* run formatting and linting

* upgrade: update olympus-mons distribution (backport #1286) (#1287)

upgrade: update olympus-mons distribution (#1286)

* fix; updated olympus mons distribution

* fix: formatter and linter

(cherry picked from commit ca36b98)

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>

* chore (deps): bump ethermint to v0.21.0 (backport #1288) (#1291)

* chore (deps): bump ethermint to v0.21.0 (#1288)

* bump ethermint to v0.21.0

* add changelog entry

(cherry picked from commit efe9cc7)

# Conflicts:
#	CHANGELOG.md

* fix merge conflicts in changelog

* update release on changelog

Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>

* remove rc3 changes

* run go mod tidy

* remove unnecessary variable declaration for v11 upgrade handler

---------

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
  • Loading branch information
@MalteHerrmann @fedekunze
@mergify @GAtom22 @Vvaradinov
5 people committed Jan 30, 2023
1 parent a76c6a3 commit e96c909
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
38 changes: 21 additions & 17 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,27 @@ Ref: https://keepachangelog.com/en/1.0.0/

## Unreleased

### Improvements
- (deps) [#1248](https://github.com/evmos/evmos/pull/1248) Use the Informal Systems Tendermint Core fork
- (revenue)[#1153](https://github.com/evmos/evmos/pull/1153) Migrate revenue module event emitting to `TypedEvent`
- (erc20) [#1152](https://github.com/evmos/evmos/pull/1152) Migrate event emitting to `TypedEvent`
- (claims) [#1126](https://github.com/evmos/evmos/pull/1126) Remove old x/params migration logic
- (vesting) [#1155](https://github.com/evmos/evmos/pull/1155) Migrate deprecated event emitting to new `TypedEvent`

## [v11.0.0] - 2023-01-27

### State Machine Breaking

- (deps) [#1288](https://github.com/evmos/evmos/pull/1288) Bump Ethermint to [`v0.21.0`](https://github.com/evmos/ethermint/releases/v0.21.0)
- (upgrade) [#1242](https://github.com/evmos/evmos/pull/1242) fix Ethermint params upgrade
- (deps) [#1288](https://github.com/evmos/evmos/pull/1288) Bump `ethermint` to [`v0.21.0`](https://github.com/evmos/ethermint/releases/v0.21.0)
- (ica) [#1101](https://github.com/evmos/evmos/pull/1101) Add ICA host submodule
- (inflation) [#1210](https://github.com/evmos/evmos/pull/1210) Delete `EpochMintProvision` from `KVStore` in a migration
- (deps) [\#1176](https://github.com/evmos/evmos/pull/1176) Bump `ibc-go` to [`v5.2.0`](https://github.com/cosmos/ibc-go/releases/tag/v5.2.0)
- (inflation) [#1193](https://github.com/evmos/evmos/pull/1193) Remove EpochMintProvision setters and getters to calculate on the fly
- (erc20) [#1100](https://github.com/evmos/evmos/pull/1100) Deprecate usage of x/params in x/erc20
- (inflation) [#1107](https://github.com/evmos/evmos/pull/1107) Deprecate usage of x/params in x/inflation
- (incentives) [#1130](https://github.com/evmos/evmos/pull/1130) Deprecate usage of x/params in x/incentives
- (claims) [#1125](https://github.com/evmos/evmos/pull/1125) Deprecate usage of x/params in x/claims
- (revenue) [#1129](https://github.com/evmos/evmos/pull/1129) Deprecate usage of x/params in x/revenue

### API Breaking
- (deps) [\#1196](https://github.com/evmos/evmos/pull/1196) Bump `ibc-go` to [`v6.1.0`](https://github.com/cosmos/ibc-go/releases/tag/v6.1.0)
- (inflation) [#1193](https://github.com/evmos/evmos/pull/1193) Remove `EpochMintProvision` setters and getters to calculate on the fly
- (erc20) [#1100](https://github.com/evmos/evmos/pull/1100) Deprecate usage of `x/params` in `x/erc20`
- (inflation) [#1107](https://github.com/evmos/evmos/pull/1107) Deprecate usage of `x/params` in `x/inflation`
- (incentives) [#1130](https://github.com/evmos/evmos/pull/1130) Deprecate usage of `x/params` in `x/incentives`
- (claims) [#1125](https://github.com/evmos/evmos/pull/1125) Deprecate usage of `x/params` in `x/claims`
- (revenue) [#1129](https://github.com/evmos/evmos/pull/1129) Deprecate usage of `x/params` in `x/revenue`

### Features

Expand All @@ -62,18 +68,16 @@ Ref: https://keepachangelog.com/en/1.0.0/
- (tests) [#1283](https://github.com/evmos/evmos/pull/1283) Enable multiple upgrades for automated upgrade tests
- (deps) [#1279](https://github.com/evmos/evmos/pull/1279) Bump Cosmos SDK version to [`v0.46.8-ledger`](https://github.com/evmos/cosmos-sdk/releases/tag/v0.46.8-ledger)
- (inflation) [#1258](https://github.com/evmos/evmos/pull/1258) Remove unnecessary `Coin` validation and store calls for `Params`
- (deps) [#1248](https://github.com/evmos/evmos/pull/1248) Use the Informal Systems Tendermint Core fork
- (revenue)[#1153](https://github.com/evmos/evmos/pull/1153) Migrate revenue module event emitting to `TypedEvent`
- (erc20) [#1152](https://github.com/evmos/evmos/pull/1152) Migrate event emitting to `TypedEvent`
- (claims) [#1126](https://github.com/evmos/evmos/pull/1126) Remove old x/params migration logic
- (vesting) [#1155](https://github.com/evmos/evmos/pull/1155) Migrate deprecated event emitting to new `TypedEvent`

### Bug Fixes

- (app) [#1276](https://github.com/evmos/evmos/pull/1276) Fix store uploader for `x/recovery` module.
- (inflation) [#1259](https://github.com/evmos/evmos/pull/1259) Re-add missing key to not disrupt order in store
- (upgrade) [#1257](https://github.com/evmos/evmos/pull/1257) Add `recovery` module store to `StoreUpgrades`
- (upgrade) [#1252](https://github.com/evmos/evmos/pull/1252) Add account number and sequence to migrated IBC transfer escrow accounts.
- (upgrade) [#1242](https://github.com/evmos/evmos/pull/1242) Fix Ethermint params upgrade
- (ibc) [#1156](https://github.com/evmos/evmos/pull/1156) Migrate IBC transfer escrow accounts to `ModuleAccount` type.
- (upgrade) [#1252](https://github.com/evmos/evmos/pull/1252) Add account number and sequence to migrated IBC transfer escrow accounts.
- (upgrade) [#1257](https://github.com/evmos/evmos/pull/1257) Add `recovery` module store to `StoreUpgrades`

## [v10.0.1] - 2023-01-03

Expand Down
2 changes: 1 addition & 1 deletion docs/users/governance/process.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The voting period is currently a fixed 5-day period. During the voting period, p

As accepted by the community in [Proposal 6](https://www.mintscan.io/cosmos/proposals/6), voters are expected to vote `NoWithVeto` if a proposal leads to undesirable outcomes for the community. It states “if a proposal seems to be spam or is deemed to have caused a negative externality to Cosmos community, voters should vote `NoWithVeto`.”

Voting `NoWithVeto` provides a mechanism for a minority group representing a *third* of the participating voting power to reject a proposal that would otherwise pass. This makes explicit an aspect of the consensus protocol: it works as long as only up to [a third of nodes fail](https://docs.tendermint.com/v0.35/introduction/what-is-tendermint.html). In other words, greater than a third of validators are always in a position to cause a proposal to fail outside the formalized governance process and the network's norms, such as by censoring transactions. The purpose of internalizing this aspect of the consensus protocol into the governance process is to discourage validators from relying on collusion and censorship tactics to influence voting outcomes.
Voting `NoWithVeto` provides a mechanism for a minority group representing a *third* of the participating voting power to reject a proposal that would otherwise pass. This makes explicit an aspect of the consensus protocol: it works as long as only up to [a third of nodes fail](https://docs.tendermint.com/v0.34/introduction/what-is-tendermint.html). In other words, greater than a third of validators are always in a position to cause a proposal to fail outside the formalized governance process and the network's norms, such as by censoring transactions. The purpose of internalizing this aspect of the consensus protocol into the governance process is to discourage validators from relying on collusion and censorship tactics to influence voting outcomes.

[Proposal #103](https://www.mintscan.io/evmos/proposals/103) was passed in January 2023 by the Evmos network to formally define and adopt the meanings of each voting options aforementioned.

Expand Down
2 changes: 1 addition & 1 deletion x/recovery/types/keys.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const (
ModuleName = "recovery"

// StoreKey to be used when creating the KVStore
StoreKey = ModuleName
StoreKey = "recoveryv1"

// RouterKey to be used for message routing
RouterKey = ModuleName
Expand Down

0 comments on commit e96c909

Please sign in to comment.