From 4734f6bc95ea2b7acad1d4af57d479558e4f1be9 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:00:50 +0200 Subject: [PATCH 1/3] chore(app): set up v7 fork upgrade height (backport #820) (#821) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore(app): set up v7 fork upgrade height (#820) (cherry picked from commit 7e8e55416a4785eb754db564c15f26435b5bd30f) # Conflicts: # app/upgrades/v7/constants.go Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> --- app/forks.go | 8 +++++++- app/upgrades/v7/constants.go | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/upgrades/v7/constants.go diff --git a/app/forks.go b/app/forks.go index 692f87ee0d..e867f0565b 100644 --- a/app/forks.go +++ b/app/forks.go @@ -8,6 +8,7 @@ import ( v2 "github.com/evmos/evmos/v6/app/upgrades/v2" v4 "github.com/evmos/evmos/v6/app/upgrades/v4" + v7 "github.com/evmos/evmos/v6/app/upgrades/v7" "github.com/evmos/evmos/v6/types" ) @@ -29,7 +30,7 @@ func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) { Height: ctx.BlockHeight(), } - // handle mainnet forks + // handle mainnet forks with their corresponding upgrade name and info switch ctx.BlockHeight() { case v2.MainnetUpgradeHeight: upgradePlan.Name = v2.UpgradeName @@ -37,11 +38,16 @@ func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) { case v4.MainnetUpgradeHeight: upgradePlan.Name = v4.UpgradeName upgradePlan.Info = v4.UpgradeInfo + case v7.MainnetUpgradeHeight: + upgradePlan.Name = v7.UpgradeName + upgradePlan.Info = v7.UpgradeInfo default: // No-op return } + // schedule the upgrade plan to the current block hight, effectively performing + // a hard fork that uses the upgrade handler to manage the migration. if err := app.UpgradeKeeper.ScheduleUpgrade(ctx, upgradePlan); err != nil { panic( fmt.Errorf( diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go new file mode 100644 index 0000000000..86da39f038 --- /dev/null +++ b/app/upgrades/v7/constants.go @@ -0,0 +1,22 @@ +package v7 + +const ( + // UpgradeName is the shared upgrade plan name for mainnet and testnet + UpgradeName = "v7.0.0" + // MainnetUpgradeHeight defines the Evmos mainnet block height on which the upgrade will take place + MainnetUpgradeHeight = 2_476_000 + // TODO: TestnetUpgradeHeight defines the Evmos testnet block height on which the upgrade will take place + TestnetUpgradeHeight = 2_176_500 + // UpgradeInfo defines the binaries that will be used for the upgrade + UpgradeInfo = `'{"binaries":{"darwin/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_arm64.tar.gz","linux/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_x86_64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Windows_x86_64.zip"}}'` + + // FaucetAddressFrom is the inaccessible secp address of the Testnet Faucet + FaucetAddressFrom = "evmos1z4ya98ga2xnffn2mhjym7tzlsm49ec23890sze" + // FaucetAddressTo is the new eth_secp address of the Testnet Faucet + FaucetAddressTo = "evmos1ujm4z5v9zkdqm70xnptr027gqu90f7lxjr0fch" + + // ContributorAddrFrom is the lost address of an early contributor + ContributorAddrFrom = "evmos1659xwt0hnu5humgek7scefhnpcm2w6hyvy4fsq" + // ContributorAddrTo is the new address of an early contributor + ContributorAddrTo = "evmos1pktlmqrz448cuazl98tqmsj4kjwpqpmaa0cjcf" +) From 5c17d3be6ee55bb979eadbc60cc376cc91ed7fc2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:10:41 +0200 Subject: [PATCH 2/3] build(deps): bump github.com/cosmos/ibc-go/v3 from 3.1.0 to 3.1.1 (backport #819) (#822) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build(deps): bump github.com/cosmos/ibc-go/v3 from 3.1.0 to 3.1.1 (#819) (cherry picked from commit a458abe8218c747a24a7a4e4a319813a005801d9) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a1f0f86727..77e510859e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/armon/go-metrics v0.4.0 github.com/cosmos/cosmos-sdk v0.45.5 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/ibc-go/v3 v3.1.0 + github.com/cosmos/ibc-go/v3 v3.1.1 github.com/ethereum/go-ethereum v1.10.16 github.com/evmos/ethermint v0.17.2 github.com/gogo/protobuf v1.3.3 diff --git a/go.sum b/go.sum index 2d0e695c4a..1eacc84719 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.1.0 h1:aVPqkrGBluz6t9+d/sLZIG/zQ9O1KJzVeR4UlL/IFTQ= -github.com/cosmos/ibc-go/v3 v3.1.0/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBdAfL9tT40= +github.com/cosmos/ibc-go/v3 v3.1.1 h1:Yodps4ezxbKS8u0TNJkdYsf+MCb0XzUuIuxIkSUMwbA= +github.com/cosmos/ibc-go/v3 v3.1.1/go.mod h1:IR1bpjywC1i0YcElPa4d2IevNUBZehKoD5bscQlbDyM= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= From 6ce34e5c13e83e559628e625df53f53dfca57d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?= <31522760+fedekunze@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:16:21 +0200 Subject: [PATCH 3/3] release: v6.0.4 changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b127224d..0307cb9e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,16 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## [v6.0.4] - 2002-08-03 + +### Improvements + +- (deps) [\#819](https://github.com/evmos/evmos/pull/819) Bump ibc-go version to [`v3.1.1`](https://github.com/cosmos/ibc-go/releases/tag/v3.1.1) + +### Bug Fixes + +- (app) [\#820](https://github.com/evmos/evmos/pull/820) Set fork upgrade block height for `v7.0.0` + ## [v6.0.3] - 2002-07-26 ### Bug Fixes