Increment DA usage for non-deposit sequencer transactions (e.g. via CL sync)

Author: danyalprout

crates/op-rbuilder/src/builders/context.rs

@@ -1,5 +1,5 @@
 use alloy_consensus::{Eip658Value, Transaction, conditional::BlockConditionalAttributes};
-use alloy_eips::Typed2718;
+use alloy_eips::{Encodable2718, Typed2718};
 use alloy_evm::Database;
 use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
 use alloy_primitives::{BlockHash, Bytes, U256};
@@ -338,6 +338,12 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
             let gas_used = result.gas_used();
             info.cumulative_gas_used += gas_used;
 
+            if !sequencer_tx.is_deposit() {
+                info.cumulative_da_bytes_used += op_alloy_flz::tx_estimated_size_fjord_bytes(
+                    sequencer_tx.encoded_2718().as_slice(),
+                );
+            }
+
             let ctx = ReceiptBuilderCtx {
                 tx: sequencer_tx.inner(),
                 evm: &evm,

crates/op-rbuilder/src/tests/forks.rs

@@ -1,5 +1,5 @@
 use crate::tests::{BlockTransactionsExt, LocalInstance};
-use alloy_eips::{BlockNumberOrTag::Latest, eip1559::MIN_PROTOCOL_BASE_FEE};
+use alloy_eips::{BlockNumberOrTag::Latest, Encodable2718, eip1559::MIN_PROTOCOL_BASE_FEE};
 use alloy_primitives::bytes;
 use macros::{if_flashblocks, if_standard, rb_test};
 use std::time::Duration;
@@ -40,6 +40,51 @@ async fn jovian_block_parameters_set(rbuilder: LocalInstance) -> eyre::Result<()
     Ok(())
 }
 
+#[rb_test]
+async fn jovian_no_tx_pool_sync(rbuilder: LocalInstance) -> eyre::Result<()> {
+    let driver = rbuilder.driver().await?;
+    let block = driver
+        .build_new_block_with_txs_timestamp(vec![], Some(true), None, None, Some(0))
+        .await?;
+
+    // Deposit transaction + user transaction
+    if_flashblocks! {
+        assert_eq!(block.transactions.len(), 1);
+        assert_eq!(block.header.blob_gas_used, Some(0));
+    }
+
+    // Standard includes a builder transaction when no-tx-pool is set
+    if_standard! {
+        assert_eq!(block.transactions.len(), 2);
+        assert_eq!(block.header.blob_gas_used, Some(40_000));
+    }
+
+    let tx = driver.create_transaction().build().await;
+    let block = driver
+        .build_new_block_with_txs_timestamp(
+            vec![tx.encoded_2718().into()],
+            Some(true),
+            None,
+            None,
+            Some(0),
+        )
+        .await?;
+
+    // Deposit transaction + user transaction
+    if_flashblocks! {
+        assert_eq!(block.transactions.len(), 2);
+        assert_eq!(block.header.blob_gas_used, Some(40_000));
+    }
+
+    // Standard includes a builder transaction when no-tx-pool is set
+    if_standard! {
+        assert_eq!(block.transactions.len(), 3);
+        assert_eq!(block.header.blob_gas_used, Some(80_000));
+    }
+
+    Ok(())
+}
+
 #[rb_test]
 async fn jovian_minimum_base_fee(rbuilder: LocalInstance) -> eyre::Result<()> {
     let driver = rbuilder.driver().await?;