Allow DA recorded blocks to come out-of-order

crates/fuel-gas-price-algorithm/src/v1.rs

@@ -145,6 +145,8 @@ pub struct AlgorithmUpdaterV1 {
     pub l2_activity: L2ActivityTracker,
     /// The unrecorded blocks that are used to calculate the projected cost of recording blocks
     pub unrecorded_blocks: BTreeMap<Height, Bytes>,
+    /// Total unrecorded block bytes
+    pub unrecorded_blocks_bytes: u128,
 }
 
 /// The `L2ActivityTracker` tracks the chain activity to determine a safety mode for setting the DA price.
@@ -348,6 +350,9 @@ impl AlgorithmUpdaterV1 {
 
             // metadata
             self.unrecorded_blocks.insert(height, block_bytes);
+            self.unrecorded_blocks_bytes = self
+                .unrecorded_blocks_bytes
+                .saturating_add(block_bytes as u128);
             Ok(())
         }
     }
@@ -538,16 +543,13 @@ impl AlgorithmUpdaterV1 {
             )?;
             total = total.saturating_add(bytes as u128);
         }
+        self.unrecorded_blocks_bytes = self.unrecorded_blocks_bytes.saturating_sub(total);
         Ok(total)
     }
 
     fn recalculate_projected_cost(&mut self) {
-        // add the cost of the remaining blocks
-        let projection_portion: u128 = self
-            .unrecorded_blocks
-            .iter()
-            .map(|(_, &bytes)| u128::from(bytes))
-            .fold(0_u128, |acc, n| acc.saturating_add(n))
+        let projection_portion = self
+            .unrecorded_blocks_bytes
             .saturating_mul(self.latest_da_cost_per_byte);
         self.projected_total_da_cost = self
             .latest_known_total_da_cost_excess

crates/fuel-gas-price-algorithm/src/v1/tests.rs

@@ -193,6 +193,10 @@ impl UpdaterBuilder {
                 .try_into()
                 .expect("Should never be non-zero"),
             l2_activity: self.l2_activity,
+            unrecorded_blocks_bytes: self
+                .unrecorded_blocks
+                .iter()
+                .fold(0u128, |acc, b| acc + u128::from(b.block_bytes)),
         }
     }
 }

crates/fuel-gas-price-algorithm/src/v1/tests/update_l2_block_data_tests.rs

@@ -591,9 +591,10 @@ fn update_l2_block_data__retains_existing_blocks_and_adds_l2_block_to_unrecorded
 {
     // given
     let starting_block = 0;
+    let first_block_bytes = 1200;
     let preexisting_block = BlockBytes {
         height: 0,
-        block_bytes: 1000,
+        block_bytes: first_block_bytes,
     };
 
     let mut updater = UpdaterBuilder::new()
@@ -604,27 +605,33 @@ fn update_l2_block_data__retains_existing_blocks_and_adds_l2_block_to_unrecorded
     let height = 1;
     let used = 50;
     let capacity = 100.try_into().unwrap();
-    let block_bytes = 1000;
+    let new_block_bytes = 1000;
     let new_gas_price = 100;
 
     // when
     updater
-        .update_l2_block_data(height, used, capacity, block_bytes, new_gas_price)
+        .update_l2_block_data(height, used, capacity, new_block_bytes, new_gas_price)
         .unwrap();
 
     //  then
     let block_bytes = BlockBytes {
         height,
-        block_bytes,
+        block_bytes: new_block_bytes,
     };
     let contains_block_bytes =
         updater.unrecorded_blocks.contains_key(&block_bytes.height);
     assert!(contains_block_bytes);
 
+    // and
     let contains_preexisting_block_bytes = updater
         .unrecorded_blocks
         .contains_key(&preexisting_block.height);
     assert!(contains_preexisting_block_bytes);
+
+    // and
+    let expected = first_block_bytes + new_block_bytes;
+    let actual = updater.unrecorded_blocks_bytes;
+    assert_eq!(expected as u128, actual);
 }
 
 fn capped_l2_activity_tracker() -> L2ActivityTracker {