miner: fix payload building

Author: MariusVanDerWijden

beacon/engine/types.go

@@ -262,8 +262,8 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, blobs []kzg4844.Bl
 		Proofs:      make([]hexutil.Bytes, 0),
 	}
 	for i := range blobs {
-		blobsBundle.Commitments = append(blobsBundle.Commitments, hexutil.Bytes(commitments[i][:]))
 		blobsBundle.Blobs = append(blobsBundle.Blobs, hexutil.Bytes(blobs[i][:]))
+		blobsBundle.Commitments = append(blobsBundle.Commitments, hexutil.Bytes(commitments[i][:]))
 		blobsBundle.Proofs = append(blobsBundle.Proofs, hexutil.Bytes(proofs[i][:]))
 	}
 	return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &blobsBundle}

miner/worker.go

@@ -759,6 +759,10 @@ func (w *worker) commitTransaction(env *environment, tx *txpool.Transaction) ([]
 		snap = env.state.Snapshot()
 		gp   = env.gasPool.Gas()
 	)
+	// TODO (MariusVanDerWijden): Move this check
+	if len(env.blobs)+len(tx.BlobHashes())*params.BlobTxDataGasPerBlob > params.BlobTxMaxDataGasPerBlock {
+		return nil, errors.New("max data blobs reached")
+	}
 	receipt, err := core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx.Tx, &env.header.GasUsed, *w.chain.GetVMConfig())
 	if err != nil {
 		env.state.RevertToSnapshot(snap)