From 0b1b8e15c4fedcebb5b7850b5a6cd7e02918416b Mon Sep 17 00:00:00 2001 From: meows Date: Wed, 6 Dec 2023 07:11:04 -0700 Subject: [PATCH] cmd/utils: these flags are not exclusive - 1100disable flag deactivates the feature - 1100.nodisable prevents safety mechanisms from toggling it once activated Date: 2023-12-06 07:11:04-07:00 Signed-off-by: meows --- cmd/utils/flags.go | 1 - core/blockchain_af.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3d1eb8ef4c..ba6e071614 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2086,7 +2086,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { cfg.EthDiscoveryURLs = SplitAndTrim(urls) } } - CheckExclusive(ctx, ECBP1100DisableFlag, ECBP1100NoDisableFlag) // Override any default configs for hard coded networks. diff --git a/core/blockchain_af.go b/core/blockchain_af.go index 8ec368ba02..d61358a301 100644 --- a/core/blockchain_af.go +++ b/core/blockchain_af.go @@ -27,7 +27,7 @@ func (bc *BlockChain) ArtificialFinalityNoDisable(n int32) { if n == 1 { disabledTransition := bc.chainConfig.GetECBP1100DisableTransition() if disabledTransition != nil && big.NewInt(int64(*disabledTransition)).Cmp(big.NewInt(0)) > 0 { - log.Warn("Disable ECBP1100 (MESS) block activation number is set together with '--ecbp1100.nodisable'. ECBP1100 will not be disabled.", "disable transition block", *disabledTransition) + log.Warn("Disable ECBP1100 (MESS) block activation number is set together with '--ecbp1100.nodisable'.", "disable transition block", *disabledTransition) } } }