diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b72b891f6..05dd566cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ### State Machine Breaking - [#1318](https://github.com/crypto-org-chain/cronos/pull/1318) Add packet_sequence index in relayer event. +- [#1318](https://github.com/crypto-org-chain/cronos/pull/1318) Fix filter rule for eth_getLogs. +- [#1322](https://github.com/crypto-org-chain/cronos/pull/1322) Add `v1.1.0-testnet-1` upgrade plan for testnet. *February 5, 2024* diff --git a/app/upgrades.go b/app/upgrades.go index 8747431025..b26c55c034 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -119,25 +119,12 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie return m, nil }) - testnetPlanName := "v1.1.0-testnet" + testnetPlanName := "v1.1.0-testnet-1" app.UpgradeKeeper.SetUpgradeHandler(testnetPlanName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { m, err := app.mm.RunMigrations(ctx, app.configurator, fromVM) if err != nil { return m, err } - params := app.CronosKeeper.GetParams(ctx) - params.MaxCallbackGas = cronostypes.MaxCallbackGasDefaultValue - if err := app.CronosKeeper.SetParams(ctx, params); err != nil { - return m, err - } - - feeparams := app.FeeMarketKeeper.GetParams(ctx) - feeparams.BaseFeeChangeDenominator = 300 - feeparams.ElasticityMultiplier = 4 - feeparams.BaseFee = sdk.NewInt(10000000000000) - feeparams.MinGasPrice = sdk.NewDec(10000000000000) - app.FeeMarketKeeper.SetParams(ctx, feeparams) - return m, nil }) @@ -159,13 +146,6 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie }, } app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) - } else if upgradeInfo.Name == testnetPlanName { - storeUpgrades := storetypes.StoreUpgrades{ - Deleted: []string{ - authzkeeper.StoreKey, - }, - } - app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) } } } diff --git a/integration_tests/configs/upgrade-testnet-test-package.nix b/integration_tests/configs/upgrade-testnet-test-package.nix index 709e8080f7..3ba625a91d 100644 --- a/integration_tests/configs/upgrade-testnet-test-package.nix +++ b/integration_tests/configs/upgrade-testnet-test-package.nix @@ -7,11 +7,11 @@ let shortRev = builtins.substring 0 7 rev; }; }).defaultNix; - # v1.1.0-rc1 - released = (fetchFlake "crypto-org-chain/cronos" "e61acd9193ac455098987e578ee6374ecc249836").default; + # v1.1.0-rc3 + released = (fetchFlake "crypto-org-chain/cronos" "b7b261a3652cdf3ee2e224e777a40ce6dbbb0da5").default; current = pkgs.callPackage ../../. { }; in pkgs.linkFarm "upgrade-test-package" [ { name = "genesis"; path = released; } - { name = "v1.1.0-testnet"; path = current; } + { name = "v1.1.0-testnet-1"; path = current; } ] diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py index b5ae672788..54cdb6813e 100644 --- a/integration_tests/test_upgrade.py +++ b/integration_tests/test_upgrade.py @@ -139,7 +139,7 @@ def exec(c, tmp_path_factory, testnet=True): ) print("old values", old_height, old_balance, old_base_fee) - plan_name = "v1.1.0-testnet" if testnet else "v1.1.0" + plan_name = "v1.1.0-testnet-1" if testnet else "v1.1.0" rsp = cli.gov_propose_legacy( "community", "software-upgrade",