feat: Expose fair_pubdata_price for blocks and batches

core/bin/external_node/src/tests.rs

@@ -34,6 +34,7 @@ fn block_details_base(hash: H256) -> api::BlockDetailsBase {
         executed_at: None,
         l1_gas_price: 0,
         l2_fair_gas_price: 0,
+        fair_pubdata_price: None,
         base_system_contracts_hashes: Default::default(),
     }
 }

core/lib/dal/src/blocks_web3_dal.rs

@@ -629,6 +629,7 @@ impl BlocksWeb3Dal<'_, '_> {
                 execute_tx.confirmed_at AS "executed_at?",
                 miniblocks.l1_gas_price,
                 miniblocks.l2_fair_gas_price,
+                miniblocks.fair_pubdata_price,
                 miniblocks.bootloader_code_hash,
                 miniblocks.default_aa_code_hash,
                 miniblocks.protocol_version,
@@ -673,7 +674,8 @@ impl BlocksWeb3Dal<'_, '_> {
                 mb AS (
                     SELECT
                         l1_gas_price,
-                        l2_fair_gas_price
+                        l2_fair_gas_price,
+                        fair_pubdata_price
                     FROM
                         miniblocks
                     WHERE
@@ -695,6 +697,7 @@ impl BlocksWeb3Dal<'_, '_> {
                 execute_tx.confirmed_at AS "executed_at?",
                 mb.l1_gas_price,
                 mb.l2_fair_gas_price,
+                mb.fair_pubdata_price,
                 l1_batches.bootloader_code_hash,
                 l1_batches.default_aa_code_hash
             FROM

core/lib/dal/src/models/storage_block.rs

@@ -269,6 +269,8 @@ pub(crate) struct StorageBlockDetails {
     pub l1_gas_price: i64,
     // L2 gas price assumed in the corresponding batch
     pub l2_fair_gas_price: i64,
+    // Cost of publishing 1 byte (in wei).
+    pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
     pub fee_account_address: Vec<u8>,
@@ -312,6 +314,7 @@ impl From<StorageBlockDetails> for api::BlockDetails {
                 .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: details.l1_gas_price as u64,
             l2_fair_gas_price: details.l2_fair_gas_price as u64,
+            fair_pubdata_price: details.fair_pubdata_price.map(|x| x as u64),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,
@@ -344,6 +347,7 @@ pub(crate) struct StorageL1BatchDetails {
     pub executed_at: Option<NaiveDateTime>,
     pub l1_gas_price: i64,
     pub l2_fair_gas_price: i64,
+    pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
 }
@@ -385,6 +389,7 @@ impl From<StorageL1BatchDetails> for api::L1BatchDetails {
                 .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: details.l1_gas_price as u64,
             l2_fair_gas_price: details.l2_fair_gas_price as u64,
+            fair_pubdata_price: details.fair_pubdata_price.map(|x| x as u64),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,

core/lib/snapshots_applier/src/tests/utils.rs

@@ -156,6 +156,7 @@ fn block_details_base(hash: H256) -> api::BlockDetailsBase {
         executed_at: None,
         l1_gas_price: 0,
         l2_fair_gas_price: 0,
+        fair_pubdata_price: None,
         base_system_contracts_hashes: Default::default(),
     }
 }

core/lib/types/src/api/mod.rs

@@ -761,6 +761,8 @@ pub struct BlockDetailsBase {
     pub executed_at: Option<DateTime<Utc>>,
     pub l1_gas_price: u64,
     pub l2_fair_gas_price: u64,
+    // Cost of publishing one byte (in wei).
+    pub fair_pubdata_price: Option<u64>,
     pub base_system_contracts_hashes: BaseSystemContractsHashes,
 }
 

core/node/node_sync/src/batch_status_updater/tests.rs

@@ -158,6 +158,7 @@ fn mock_block_details(number: u32, stage: L1BatchStage) -> api::BlockDetails {
                 .then(|| Utc.timestamp_opt(300, 0).unwrap()),
             l1_gas_price: 1,
             l2_fair_gas_price: 2,
+            fair_pubdata_price: None,
             base_system_contracts_hashes: BaseSystemContractsHashes::default(),
         },
         operator_address: Address::zero(),

core/node/node_sync/src/tree_data_fetcher/provider/tests.rs

@@ -39,6 +39,7 @@ fn mock_block_details_base(number: u32, hash: Option<H256>) -> api::BlockDetails
         executed_at: None,
         l1_gas_price: 10,
         l2_fair_gas_price: 100,
+        fair_pubdata_price: None,
         base_system_contracts_hashes: Default::default(),
     }
 }