beacon/engine, eth/catalyst: encode payload body access lists

beacon/engine/types.go

@@ -440,7 +440,7 @@ type ExecutionPayloadBody struct {
 // ExecutionPayloadBodyV2 extends ExecutionPayloadBody with the block access list.
 type ExecutionPayloadBodyV2 struct {
 	ExecutionPayloadBody
-	BlockAccessList *bal.BlockAccessList `json:"blockAccessList"`
+	BlockAccessList *hexutil.Bytes `json:"blockAccessList"`
 }
 
 // Client identifiers to support ClientVersionV1.

eth/catalyst/api.go

@@ -1320,9 +1320,15 @@ func getBodyV2(block *types.Block) *engine.ExecutionPayloadBodyV2 {
 	if body == nil {
 		return nil
 	}
+	var blockAccessList *hexutil.Bytes
+	if accessList := block.AccessList(); accessList != nil {
+		encoded, _ := rlp.EncodeToBytes(accessList)
+		data := hexutil.Bytes(encoded)
+		blockAccessList = &data
+	}
 	return &engine.ExecutionPayloadBodyV2{
 		ExecutionPayloadBody: *body,
-		BlockAccessList:      block.AccessList(),
+		BlockAccessList:      blockAccessList,
 	}
 }
 

eth/catalyst/api_test.go

@@ -1594,7 +1594,7 @@ func TestGetPayloadBodyV2BlockAccessList(t *testing.T) {
 			name:       "retained empty BAL",
 			header:     &types.Header{BlockAccessListHash: &emptyHash},
 			accessList: &empty,
-			want:       "[]",
+			want:       `"0xc0"`,
 		},
 		{
 			name:   "pruned BAL",