add : withdrawals check in bor consensus, config block formatting

This commit is contained in:
Shivam Sharma 2023-08-21 15:08:29 +05:30
parent 56ca065961
commit 25c6656f81
2 changed files with 7 additions and 3 deletions

View file

@ -888,6 +888,10 @@ func (c *Bor) FinalizeAndAssemble(ctx context.Context, chain consensus.ChainHead
finalizeCtx, finalizeSpan := tracing.StartSpan(ctx, "bor.FinalizeAndAssemble") finalizeCtx, finalizeSpan := tracing.StartSpan(ctx, "bor.FinalizeAndAssemble")
defer tracing.EndSpan(finalizeSpan) defer tracing.EndSpan(finalizeSpan)
if len(withdrawals) > 0 {
return nil, errors.New("Bor does not support withdrawals")
}
stateSyncData := []*types.StateSyncData{} stateSyncData := []*types.StateSyncData{}
headerNumber := header.Number.Uint64() headerNumber := header.Number.Uint64()

View file

@ -898,15 +898,15 @@ func (c *ChainConfig) Description() string {
// Create a list of forks post-merge // Create a list of forks post-merge
banner += "Post-Merge hard forks (timestamp based):\n" banner += "Post-Merge hard forks (timestamp based):\n"
if c.ShanghaiBlock != nil { 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 { if c.CancunBlock != nil {
banner += fmt.Sprintf(" - Cancun: @%-10v\n", *c.CancunBlock) banner += fmt.Sprintf(" - Cancun: @%-8v\n", *c.CancunBlock)
} }
if c.PragueBlock != nil { if c.PragueBlock != nil {
banner += fmt.Sprintf(" - Prague: @%-10v\n", *c.PragueBlock) banner += fmt.Sprintf(" - Prague: @%-8v\n", *c.PragueBlock)
} }
return banner return banner