Ensure withdrawals in payload is non-nil (ethereum#76)

Inphi · Dec 7, 2022 · c4b56fd · c4b56fd
1 parent ff64102
commit c4b56fd
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/core/beacon/types.go b/core/beacon/types.go
@@ -226,6 +226,7 @@ func BlockToExecutableData(block *types.Block) *ExecutableData {
 		Transactions:  encodeTransactions(block.Transactions()),
 		Random:        block.MixDigest(),
 		ExtraData:     block.Extra(),
+		Withdrawals:   block.Withdrawals(),
 	}
 }
 

diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -298,6 +298,7 @@ func (api *ConsensusAPI) forkchoiceUpdated(update beacon.ForkchoiceStateV1, payl
 			Timestamp:    payloadAttributes.Timestamp,
 			FeeRecipient: payloadAttributes.SuggestedFeeRecipient,
 			Random:       payloadAttributes.Random,
+			Withdrawals:  payloadAttributes.Withdrawals,
 		}
 		id := args.Id()
 		// If we already are busy generating this work, then we do not need

diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
@@ -1045,3 +1045,45 @@ func TestEIP4844(t *testing.T) {
 		t.Fatal("latest block is missing excessDataGas")
 	}
 }
+
+func TestEIP4844Withdrawals(t *testing.T) {
+	genesis, blocks := generateChain(10, true)
+	lastBlockTime := blocks[len(blocks)-1].Time()
+	genesis.Config.ShanghaiTime = new(uint64)
+	*genesis.Config.ShanghaiTime = lastBlockTime + 10 // chainmakers block time is fixed at 10 seconds
+	genesis.Config.TerminalTotalDifficulty.Sub(genesis.Config.TerminalTotalDifficulty, blocks[0].Difficulty())
+
+	n, ethservice := startEthService(t, genesis, blocks)
+	ethservice.Merger().ReachTTD()
+	defer n.Close()
+
+	api := NewConsensusAPI(ethservice)
+
+	// 10: Build Shanghai block with no withdrawals.
+	parent := ethservice.BlockChain().CurrentHeader()
+	params := beacon.PayloadAttributes{
+		Timestamp:   parent.Time + 5,
+		Withdrawals: make([]*types.Withdrawal, 0),
+	}
+	fcState := beacon.ForkchoiceStateV1{
+		HeadBlockHash: parent.Hash(),
+	}
+	resp, err := api.ForkchoiceUpdatedV2(fcState, &params)
+	if err != nil {
+		t.Fatalf("error preparing payload, err=%v", err)
+	}
+	if resp.PayloadStatus.Status != beacon.VALID {
+		t.Fatalf("unexpected status (got: %s, want: %s)", resp.PayloadStatus.Status, beacon.VALID)
+	}
+
+	execData, err := api.GetPayloadV2(*resp.PayloadID)
+	if err != nil {
+		t.Fatalf("error getting payload, err=%v", err)
+	}
+	if execData.StateRoot != parent.Root {
+		t.Fatalf("mismatch state roots (got: %s, want: %s)", execData.StateRoot, blocks[8].Root())
+	}
+	if execData.Withdrawals == nil || len(execData.Withdrawals) != 0 {
+		t.Fatalf("expected empty withdrawals list. got %v", execData.Withdrawals)
+	}
+}