mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
chg: club error conditions
This commit is contained in:
parent
a504fa6e2f
commit
da5b880669
1 changed files with 4 additions and 12 deletions
|
|
@ -822,15 +822,11 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
|
||||||
|
|
||||||
headerNumber := header.Number.Uint64()
|
headerNumber := header.Number.Uint64()
|
||||||
|
|
||||||
if withdrawals != nil {
|
if withdrawals != nil || header.WithdrawalsHash != nil {
|
||||||
// withdrawals = nil is not required because withdrawals are not used
|
// 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
|
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)) {
|
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()
|
headerNumber := header.Number.Uint64()
|
||||||
|
|
||||||
if withdrawals != nil {
|
if withdrawals != nil || header.WithdrawalsHash != nil {
|
||||||
// withdrawals != nil not required because withdrawals are not used
|
// 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
|
header.WithdrawalsHash = nil
|
||||||
|
|
||||||
log.Warn("Bor does not support withdrawalHash", "number", headerNumber)
|
log.Warn("Bor does not support withdrawals", "number", headerNumber)
|
||||||
}
|
}
|
||||||
|
|
||||||
stateSyncData := []*types.StateSyncData{}
|
stateSyncData := []*types.StateSyncData{}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue