From 9598823f6981fb24454aee11333d89009b4c3ff1 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Mon, 16 Dec 2024 09:33:57 -0500 Subject: [PATCH] chore: remove default upgrade height v2 from this backport --- cmd/celestia-appd/cmd/start.go | 14 -------------- pkg/appconsts/upgrade_heights.go | 13 ------------- 2 files changed, 27 deletions(-) delete mode 100644 pkg/appconsts/upgrade_heights.go diff --git a/cmd/celestia-appd/cmd/start.go b/cmd/celestia-appd/cmd/start.go index 057ae4422a..65f02a5e7e 100644 --- a/cmd/celestia-appd/cmd/start.go +++ b/cmd/celestia-appd/cmd/start.go @@ -118,20 +118,6 @@ is performed. Note, when enabled, gRPC will also be automatically enabled. return err } - switch clientCtx.ChainID { - case appconsts.ArabicaChainID: - serverCtx.Logger.Info(fmt.Sprintf("Since the chainID is %v, configuring the default v2 upgrade height to %v", appconsts.ArabicaChainID, appconsts.ArabicaUpgradeHeightV2)) - serverCtx.Viper.SetDefault(UpgradeHeightFlag, appconsts.ArabicaUpgradeHeightV2) - case appconsts.MochaChainID: - serverCtx.Logger.Info(fmt.Sprintf("Since the chainID is %v, configuring the default v2 upgrade height to %v", appconsts.MochaChainID, appconsts.MochaUpgradeHeightV2)) - serverCtx.Viper.SetDefault(UpgradeHeightFlag, appconsts.MochaUpgradeHeightV2) - case appconsts.MainnetChainID: - serverCtx.Logger.Info(fmt.Sprintf("Since the chainID is %v, configuring the default v2 upgrade height to %v", appconsts.MainnetChainID, appconsts.MainnetUpgradeHeightV2)) - serverCtx.Viper.SetDefault(UpgradeHeightFlag, appconsts.MainnetUpgradeHeightV2) - default: - serverCtx.Logger.Info(fmt.Sprintf("No default value exists for the v2 upgrade height when the chainID is %v", clientCtx.ChainID)) - } - if contains(appconsts.PublicNetworks, clientCtx.ChainID) && serverCtx.Viper.GetDuration(TimeoutCommitFlag) != 0 { return fmt.Errorf("the --timeout-commit flag was used on %v but it is unsupported on public networks: %v. The --timeout-commit flag should only be used on private testnets", clientCtx.ChainID, strings.Join(appconsts.PublicNetworks, ", ")) } diff --git a/pkg/appconsts/upgrade_heights.go b/pkg/appconsts/upgrade_heights.go deleted file mode 100644 index 13ee0963f0..0000000000 --- a/pkg/appconsts/upgrade_heights.go +++ /dev/null @@ -1,13 +0,0 @@ -package appconsts - -const ( - // ArabicaUpgradeHeightV2 is the block height at which the arabica-11 - // upgraded from app version 1 to 2. - ArabicaUpgradeHeightV2 = 1751707 - // MochaUpgradeHeightV2 is the block height at which the mocha-4 upgraded - // from app version 1 to 2. - MochaUpgradeHeightV2 = 2585031 - // MainnetUpgradeHeightV2 is the block height at which the celestia upgraded - // from app version 1 to 2. - MainnetUpgradeHeightV2 = 2371495 -)