Fixed Bor Log appearing on Ethereum Mainnet (#10405) (#10420)

taratorio · Giulio2002 · web-flow · commit 6d4a614dfd14 · 2024-05-20T17:29:53.000Z
Cherry-pick: be889f6 Co-authored-by: Giulio rebuffo <giulio.rebuffo@gmail.com>
diff --git a/eth/backend.go b/eth/backend.go
@@ -1643,7 +1643,7 @@ func (s *Ethereum) DataDir() string {
 
 // setBorDefaultMinerGasPrice enforces Miner.GasPrice to be equal to BorDefaultMinerGasPrice (30gwei by default)
 func setBorDefaultMinerGasPrice(chainConfig *chain.Config, config *ethconfig.Config, logger log.Logger) {
-	if chainConfig.Bor != nil && config.Miner.GasPrice == nil || config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0 {
+	if chainConfig.Bor != nil && (config.Miner.GasPrice == nil || config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0) {
 		logger.Warn("Sanitizing invalid bor miner gas price", "provided", config.Miner.GasPrice, "updated", ethconfig.BorDefaultMinerGasPrice)
 		config.Miner.GasPrice = ethconfig.BorDefaultMinerGasPrice
 	}

Original file line number	Diff line number	Diff line change
`@@ -1643,7 +1643,7 @@ func (s *Ethereum) DataDir() string {`
`1643`	`1643`
`1644`	`1644`	`// setBorDefaultMinerGasPrice enforces Miner.GasPrice to be equal to BorDefaultMinerGasPrice (30gwei by default)`
`1645`	`1645`	`func setBorDefaultMinerGasPrice(chainConfig chain.Config, config ethconfig.Config, logger log.Logger) {`
`1646`		`- if chainConfig.Bor != nil && config.Miner.GasPrice == nil \|\| config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0 {`
	`1646`	`+ if chainConfig.Bor != nil && (config.Miner.GasPrice == nil \|\| config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0) {`
`1647`	`1647`	`logger.Warn("Sanitizing invalid bor miner gas price", "provided", config.Miner.GasPrice, "updated", ethconfig.BorDefaultMinerGasPrice)`
`1648`	`1648`	`config.Miner.GasPrice = ethconfig.BorDefaultMinerGasPrice`
`1649`	`1649`	`}`