From 25c6656f81a702360befa8a3cb72171ae387de93 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Mon, 21 Aug 2023 15:08:29 +0530 Subject: [PATCH] add : withdrawals check in bor consensus, config block formatting --- consensus/bor/bor.go | 4 ++++ params/config.go | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index ad1457d578..54f0b47c83 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -888,6 +888,10 @@ func (c *Bor) FinalizeAndAssemble(ctx context.Context, chain consensus.ChainHead finalizeCtx, finalizeSpan := tracing.StartSpan(ctx, "bor.FinalizeAndAssemble") defer tracing.EndSpan(finalizeSpan) + if len(withdrawals) > 0 { + return nil, errors.New("Bor does not support withdrawals") + } + stateSyncData := []*types.StateSyncData{} headerNumber := header.Number.Uint64() diff --git a/params/config.go b/params/config.go index 39552c284c..3b9591d595 100644 --- a/params/config.go +++ b/params/config.go @@ -898,15 +898,15 @@ func (c *ChainConfig) Description() string { // Create a list of forks post-merge banner += "Post-Merge hard forks (timestamp based):\n" if c.ShanghaiBlock != nil { - banner += fmt.Sprintf(" - Shanghai: @%-10v (https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)\n", *c.ShanghaiBlock) + banner += fmt.Sprintf(" - Shanghai: @%-8v (https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)\n", *c.ShanghaiBlock) } if c.CancunBlock != nil { - banner += fmt.Sprintf(" - Cancun: @%-10v\n", *c.CancunBlock) + banner += fmt.Sprintf(" - Cancun: @%-8v\n", *c.CancunBlock) } if c.PragueBlock != nil { - banner += fmt.Sprintf(" - Prague: @%-10v\n", *c.PragueBlock) + banner += fmt.Sprintf(" - Prague: @%-8v\n", *c.PragueBlock) } return banner