-
Notifications
You must be signed in to change notification settings - Fork 847
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(upgrade): Prepare v15.0.0 upgrade (#1972)
* add v15 upgrade logic * replace v15rc2 upgrade handler with v15 handler in app.go * remove v15rc2 upgrade logic * adjust changelog for v15.0.0 * remove unnecessary stuff from test suite * add logic to remove crisis module from store * revert to using SDK v0.47.5 (without distribution authorization) * update gomod2nix.toml * fix(test): seq error on e2e test (#1909) * fix(test): seq error * refactor * refactor * refactor * chore: update precompiles file name (#1737) * chore: update precompiles file name to match the interface naming convention * add changelog entry * remove duplicated entry --------- Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com>
- Loading branch information
3 people
committed
Oct 31, 2023
1 parent
28feae6
commit ba5b8a3
Showing
22 changed files
with
218 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| // Copyright Tharsis Labs Ltd.(Evmos) | ||
| // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE) | ||
|
|
||
| package v15 | ||
|
|
||
| const ( | ||
| // UpgradeName is the shared upgrade plan name for mainnet | ||
| UpgradeName = "v15.0.0" | ||
| // UpgradeInfo defines the binaries that will be used for the upgrade | ||
| UpgradeInfo = `'{"binaries":{"darwin/arm64":"https://github.com/evmos/evmos/releases/download/v15.0.0/evmos_15.0.0_Darwin_arm64.tar.gz","darwin/amd64":"https://github.com/evmos/evmos/releases/download/v15.0.0/evmos_15.0.0_Darwin_amd64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v15.0.0/evmos_15.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v15.0.0/evmos_15.0.0_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v15.0.0/evmos_15.0.0_Windows_x86_64.zip"}}'` | ||
| ) |
2 changes: 1 addition & 1 deletion
2
app/upgrades/v15rc2/setup_test.go → app/upgrades/v15/setup_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Copyright Tharsis Labs Ltd.(Evmos) | ||
| // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE) | ||
|
|
||
| package v15 | ||
|
|
||
| import ( | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" | ||
| stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" | ||
| upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" | ||
| v14 "github.com/evmos/evmos/v15/app/upgrades/v14" | ||
| "github.com/evmos/evmos/v15/utils" | ||
| evmkeeper "github.com/evmos/evmos/v15/x/evm/keeper" | ||
| ) | ||
|
|
||
| // CreateUpgradeHandler creates an SDK upgrade handler for v15.0.0 | ||
| func CreateUpgradeHandler( | ||
| mm *module.Manager, | ||
| configurator module.Configurator, | ||
| bk bankkeeper.Keeper, | ||
| ek *evmkeeper.Keeper, | ||
| sk stakingkeeper.Keeper, | ||
| ) upgradetypes.UpgradeHandler { | ||
| return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { | ||
| logger := ctx.Logger().With("upgrade", UpgradeName) | ||
|
|
||
| if utils.IsMainnet(ctx.ChainID()) { | ||
| logger.Info("migrating strategic reserves") | ||
| if err := v14.MigrateNativeMultisigs( | ||
| ctx, bk, sk, v14.NewTeamStrategicReserveAcc, v14.OldStrategicReserves..., | ||
| ); err != nil { | ||
| // NOTE: log error instead of aborting the upgrade | ||
| logger.Error("error while migrating native multisigs", "error", err) | ||
| } | ||
|
|
||
| // Add EIP contained in Shanghai hard fork to the extra EIPs | ||
| // in the EVM parameters. This enables using the PUSH0 opcode and | ||
| // thus supports Solidity v0.8.20. | ||
| // | ||
| // NOTE: this was already enabled on testnet | ||
| logger.Info("adding EIP 3855 to EVM parameters") | ||
| err := EnableEIPs(ctx, ek, 3855) | ||
| if err != nil { | ||
| logger.Error("error while enabling EIPs", "error", err) | ||
| } | ||
|
|
||
| // we are deprecating the crisis module since it is not being used | ||
| // | ||
| // NOTE: this was already removed on testnet | ||
| logger.Debug("deleting crisis module from version map...") | ||
| delete(vm, "crisis") | ||
| } | ||
|
|
||
| // Leave modules are as-is to avoid running InitGenesis. | ||
| logger.Debug("running module migrations ...") | ||
| return mm.RunMigrations(ctx, configurator, vm) | ||
| } | ||
| } | ||
|
|
||
| // EnableEIPs enables the given EIPs in the EVM parameters. | ||
| func EnableEIPs(ctx sdk.Context, ek *evmkeeper.Keeper, eips ...int64) error { | ||
| evmParams := ek.GetParams(ctx) | ||
| evmParams.ExtraEIPs = append(evmParams.ExtraEIPs, eips...) | ||
|
|
||
| return ek.SetParams(ctx, evmParams) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Copyright Tharsis Labs Ltd.(Evmos) | ||
| // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE) | ||
|
|
||
| package v15_test | ||
|
|
||
| import ( | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| v15 "github.com/evmos/evmos/v15/app/upgrades/v15" | ||
| evmkeeper "github.com/evmos/evmos/v15/x/evm/keeper" | ||
| evmtypes "github.com/evmos/evmos/v15/x/evm/types" | ||
| ) | ||
|
|
||
| func (s *UpgradesTestSuite) TestEnableEIPs() { | ||
| testcases := []struct { | ||
| name string | ||
| extraEIPs []int64 | ||
| malleate func(sdk.Context, *evmkeeper.Keeper) | ||
| expEIPs []int64 | ||
| expPass bool | ||
| errContains string | ||
| }{ | ||
| { | ||
| name: "success - empty EIPs", | ||
| extraEIPs: []int64{}, | ||
| expPass: true, | ||
| }, | ||
| { | ||
| name: "success - single EIP", | ||
| extraEIPs: []int64{3855}, | ||
| expEIPs: []int64{3855}, | ||
| expPass: true, | ||
| }, | ||
| { | ||
| name: "success - multiple EIPs", | ||
| extraEIPs: []int64{3855, 2200, 1884, 1344}, | ||
| expEIPs: []int64{3855, 2200, 1884, 1344}, | ||
| expPass: true, | ||
| }, | ||
| { | ||
| name: "fail - duplicate EIP", | ||
| extraEIPs: []int64{3855, 1344, 2200}, | ||
| malleate: func(ctx sdk.Context, ek *evmkeeper.Keeper) { | ||
| params := evmtypes.DefaultParams() | ||
| params.ExtraEIPs = []int64{2200} | ||
| err := ek.SetParams(ctx, params) | ||
| s.Require().NoError(err, "expected no error setting params") | ||
| }, | ||
| expEIPs: []int64{2200}, // NOTE: since the function is failing, we expect the EIPs to remain the same | ||
| expPass: false, | ||
| errContains: "found duplicate EIP: 2200", | ||
| }, | ||
| { | ||
| name: "fail - invalid EIP", | ||
| extraEIPs: []int64{3860}, | ||
| expEIPs: []int64{}, | ||
| expPass: false, | ||
| errContains: "is not activateable, valid EIPS are", | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testcases { | ||
| tc := tc | ||
|
|
||
| s.Run(tc.name, func() { | ||
| s.SetupTest() | ||
|
|
||
| if tc.malleate != nil { | ||
| tc.malleate(s.ctx, s.app.EvmKeeper) | ||
| } | ||
|
|
||
| err := v15.EnableEIPs(s.ctx, s.app.EvmKeeper, tc.extraEIPs...) | ||
|
|
||
| if tc.expPass { | ||
| s.Require().NoError(err, "expected no error enabling EIPs") | ||
| } else { | ||
| s.Require().Error(err, "expected error enabling EIPs") | ||
| s.Require().ErrorContains(err, tc.errContains, "expected different error") | ||
| } | ||
|
|
||
| evmParams := s.app.EvmKeeper.GetParams(s.ctx) | ||
| s.Require().ElementsMatch(tc.expEIPs, evmParams.ExtraEIPs, "expected different EIPs after test") | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.