Merge pull request #1054 from maticnetwork/withdrawals

bor: make withdrawal objects nil
maticnetwork · Oct 23, 2023 · 95cee33 · 95cee33
2 parents 260deb8 + da5b880
commit 95cee33
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go
@@ -172,6 +172,12 @@ func encodeSigHeader(w io.Writer, header *types.Header, c *params.BorConfig) {
 		}
 	}
 
+	if header.WithdrawalsHash != nil {
+		header.WithdrawalsHash = nil
+
+		log.Warn("Bor does not support withdrawals", "number", header.Number)
+	}
+
 	if err := rlp.Encode(w, enc); err != nil {
 		panic("can't encode: " + err.Error())
 	}
@@ -816,14 +822,11 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
 
 	headerNumber := header.Number.Uint64()
 
-	if len(withdrawals) > 0 {
-		log.Error("Bor does not support withdrawals", "number", headerNumber)
-		return
-	}
+	if withdrawals != nil || header.WithdrawalsHash != nil {
+		// withdrawals = nil is not required because withdrawals are not used
+		header.WithdrawalsHash = nil
 
-	if header.WithdrawalsHash != nil {
-		log.Error("Bor does not support withdrawalHash", "number", headerNumber)
-		return
+		log.Warn("Bor does not support withdrawals", "number", headerNumber)
 	}
 
 	if IsSprintStart(headerNumber, c.config.CalculateSprint(headerNumber)) {
@@ -898,18 +901,17 @@ 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")
-	}
+	headerNumber := header.Number.Uint64()
 
-	if header.WithdrawalsHash != nil {
-		return nil, errors.New("Bor does not support withdrawalHash")
+	if withdrawals != nil || header.WithdrawalsHash != nil {
+		// withdrawals != nil not required because withdrawals are not used
+		header.WithdrawalsHash = nil
+
+		log.Warn("Bor does not support withdrawals", "number", headerNumber)
 	}
 
 	stateSyncData := []*types.StateSyncData{}
 
-	headerNumber := header.Number.Uint64()
-
 	var err error
 
 	if IsSprintStart(headerNumber, c.config.CalculateSprint(headerNumber)) {

diff --git a/core/genesis.go b/core/genesis.go
@@ -529,8 +529,8 @@ func (g *Genesis) ToBlock() *types.Block {
 	var withdrawals []*types.Withdrawal
 
 	if g.Config != nil && g.Config.IsShanghai(new(big.Int).SetUint64(g.Number)) {
-		head.WithdrawalsHash = &types.EmptyWithdrawalsHash
-		withdrawals = make([]*types.Withdrawal, 0)
+		head.WithdrawalsHash = nil
+		withdrawals = nil
 	}
 
 	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)).WithWithdrawals(withdrawals)

diff --git a/core/state_processor.go b/core/state_processor.go
@@ -101,9 +101,13 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 	}
 	// Fail if Shanghai not enabled and len(withdrawals) is non-zero.
 	withdrawals := block.Withdrawals()
-	if len(withdrawals) > 0 && !p.config.IsShanghai(block.Number()) {
+	if !p.config.IsShanghai(block.Number()) && withdrawals != nil {
 		return nil, nil, 0, fmt.Errorf("withdrawals before shanghai")
 	}
+	// Bor does not support withdrawals
+	if withdrawals != nil {
+		withdrawals = nil
+	}
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
 	p.engine.Finalize(p.bc, header, statedb, block.Transactions(), block.Uncles(), withdrawals)
 

diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go
@@ -367,11 +367,7 @@ func TestGetBlockBodies68(t *testing.T) {
 func testGetBlockBodies(t *testing.T, protocol uint) {
 	gen := func(n int, g *core.BlockGen) {
 		if n%2 == 0 {
-			w := &types.Withdrawal{
-				Address: common.Address{0xaa},
-				Amount:  42,
-			}
-			g.AddWithdrawal(w)
+			g.AddWithdrawal(&types.Withdrawal{})
 		}
 	}