From f78193fe0625d5cd14492ee335e8f63142d65c55 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Tue, 30 May 2023 17:24:40 +0200 Subject: [PATCH 1/2] bump GB and set burn --- README.md | 6 +++--- RELEASE_NOTES.md | 6 +++++- app/app.go | 1 + go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0889ca0f63..5e2e5da1b6 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ See [Release procedure](CONTRIBUTING.md#release-procedure) for more information | v4.0.x | ✓ | v0.46.6+ | v5.1.x | v1.3.x+ | v2.0.3 | umee/v4 v1.5.3-umee-4 | v1.1.1 | | v4.1.x | ✓ | v0.46.7+ | v5.2.x | v1.3.x+ | v2.1.0 | umee/v4 v1.5.3-umee-4 | v1.1.1 | | v4.2.x | ✓ | v0.46.10+ | v5.2.x | v1.3.x+ | umee/v2.1.1 | umee/v4 v1.5.3-umee-4 | v1.1.1 | -| v4.3.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.1 | umee/v4 v1.5.3-umee-5 | v1.2.1 | -| v4.4.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.4+ | umee/v4 v1.5.3-umee-5 | v1.2.3 | -| v5.0.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.4+ | umee/v4 v1.5.3-umee-5 | v1.2.3 | +| v4.3.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.1 | umee/v4 v1.5.3-umee-6 | v1.2.1 | +| v4.4.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.4+ | umee/v4 v1.5.3-umee-6 | v1.2.3 | +| v5.0.x | ✓ | v0.46.11+ | v6.1.x | v1.3.x+ | umee/v2.1.4+ | umee/v4 v1.5.3-umee-8 | v1.2.3 | #### Price Feeder diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6694f94e65..0ac74bc208 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -11,6 +11,10 @@ Release Procedure is defined in the [CONTRIBUTING](CONTRIBUTING.md#release-proce Highlights: - Updated to the latest Cosmos SDK v0.46.12 +- Gravity Bridge phase-3: shutdown of the transfers. In this release we introduce valset burn mechanism, + which will block the Ethereum smart contract for processing any further transactions, as well + as sending transfers back to Ethereum. This follows the plan approved through in the + [prop-67](https://www.mintscan.io/umee/proposals/67). @@ -45,7 +49,7 @@ You MUST also set the related parameter when starting Peggo `--cosmos-gas-prices - Wait for software upgrade proposal to pass and trigger the chain upgrade. - Swap binaries. - Ensure latest Peggo (v1.4.0) is running -- Ensure latest Price Feeder (v2.1.1) is running and check your price feeder config is up to date. Price Feeder was moved to the new repository: [ojo-network/price-feeder](https://github.com/ojo-network/price-feeder/tree/umee). +- Ensure latest Price Feeder (see [compatibility matrix](https://github.com/umee-network/umee/#release-compatibility-matrix)) is running and check your price feeder config is up to date. - Restart the chain. You can use Cosmovisor → see [instructions](https://github.com/umee-network/umee/#cosmovisor). diff --git a/app/app.go b/app/app.go index 4561a79235..5d5227cbec 100644 --- a/app/app.go +++ b/app/app.go @@ -502,6 +502,7 @@ func New( &app.IBCTransferKeeper, &app.bech32IbcKeeper, ) + app.GravityKeeper.BurnValset(true) // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks diff --git a/go.mod b/go.mod index 776c0c19ae..ed97971a83 100644 --- a/go.mod +++ b/go.mod @@ -334,7 +334,7 @@ require ( replace ( github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.31.0-umee.46 - github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-6 + github.com/Gravity-Bridge/Gravity-Bridge/module => github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-8 github.com/cosmos/cosmos-sdk => github.com/umee-network/cosmos-sdk v0.46.12-umee // dgrijalva/jwt-go is deprecated and doesn't receive security updates. github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index 1a5476e5d8..e11bcc37a4 100644 --- a/go.sum +++ b/go.sum @@ -1470,8 +1470,8 @@ github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iL github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-6 h1:GwPsecwrP1jusGCR0NiobVHivFohsiRfPz0uNGKnOu4= -github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-6/go.mod h1:UJ7hid9S/fX6EPPqu0iiwOlnRVPB4Awrkrf52f+MuRY= +github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-8 h1:wTu1bGrlgGtBKoWT4+K3Snr9X1x0b/ydyBwF1rtPl04= +github.com/umee-network/Gravity-Bridge/module v1.5.3-umee-8/go.mod h1:NR6UwQPZUoLckpOtCxgROWNEDzepe2JhxQ2u9cL+pbo= github.com/umee-network/bech32-ibc v0.3.3 h1:wUX5uSYZl8yiFdttOvunfRihsE4miYmzl7pK2FEUs+U= github.com/umee-network/bech32-ibc v0.3.3/go.mod h1:UbhzCKN+Z7RoUdCkAanmIy+wufwQ/aQJrDEoVORhC2Y= github.com/umee-network/cosmos-sdk v0.46.12-umee h1:s8/vB6M5psGNBFfwakV2z6oWFkZ377DDlh0TZfwRqbM= From bc1335fbf61fdadc087ff2a410b1e349d1c40a90 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Tue, 30 May 2023 17:58:10 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + RELEASE_NOTES.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cbfac093e..e61d0a761a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ - [1952](https://github.com/umee-network/umee/pull/1952) Add `x/incentive` module - [1888](https://github.com/umee-network/umee/pull/1888) Created `/sdkclient` and `/client` (umee client) packages to easy the E2E tests and external tools. Essentially, you can import that client and broadcast transactions easily. - [1993](https://github.com/umee-network/umee/pull/1993) Updated our Cosmos SDK fork to 0.46.12 and included an option to disable colored logs. +- [2071](https://github.com/umee-network/umee/pull/2071) Update GB and enable Valset Burn mechanism. ### Improvements diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0ac74bc208..15c6bda170 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -15,6 +15,7 @@ Highlights: which will block the Ethereum smart contract for processing any further transactions, as well as sending transfers back to Ethereum. This follows the plan approved through in the [prop-67](https://www.mintscan.io/umee/proposals/67). + NOTE: All validators must continue to use Peggo to not get slashed.