From da5b880669dd55a796b903ccddb27107d96251e8 Mon Sep 17 00:00:00 2001 From: Anshal Shukla Date: Mon, 23 Oct 2023 12:12:27 +0530 Subject: [PATCH] chg: club error conditions --- consensus/bor/bor.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index 80761ecba7..1dd630f755 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -822,15 +822,11 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header, headerNumber := header.Number.Uint64() - if withdrawals != nil { + if withdrawals != nil || header.WithdrawalsHash != nil { // withdrawals = nil is not required because withdrawals are not used - log.Warn("Bor does not support withdrawals", "number", headerNumber) - } - - if header.WithdrawalsHash != nil { header.WithdrawalsHash = nil - log.Warn("Bor does not support withdrawalHash", "number", headerNumber) + log.Warn("Bor does not support withdrawals", "number", headerNumber) } if IsSprintStart(headerNumber, c.config.CalculateSprint(headerNumber)) { @@ -907,15 +903,11 @@ func (c *Bor) FinalizeAndAssemble(ctx context.Context, chain consensus.ChainHead headerNumber := header.Number.Uint64() - if withdrawals != nil { + if withdrawals != nil || header.WithdrawalsHash != nil { // withdrawals != nil not required because withdrawals are not used - log.Warn("Bor does not support withdrawals", "number", headerNumber) - } - - if header.WithdrawalsHash != nil { header.WithdrawalsHash = nil - log.Warn("Bor does not support withdrawalHash", "number", headerNumber) + log.Warn("Bor does not support withdrawals", "number", headerNumber) } stateSyncData := []*types.StateSyncData{}