Allow DA recorded blocks to come out-of-order

crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs

@@ -256,6 +256,14 @@ pub fn draw_bytes_and_cost_per_block(
     Ok(())
 }
 
+fn one_gwei_i128() -> i128 {
+    i128::from(ONE_GWEI)
+}
+
+fn one_gwei_u128() -> u128 {
+    u128::from(ONE_GWEI)
+}
+
 pub fn draw_profit(
     drawing_area: &DrawingArea<BitMapBackend, Shift>,
     actual_profit: &[i128],
@@ -267,14 +275,14 @@ pub fn draw_profit(
     const PROJECTED_PROFIT_COLOR: RGBColor = RED;
     const PESSIMISTIC_BLOCK_COST_COLOR: RGBColor = BLUE;
     let actual_profit_gwei: Vec<_> =
-        actual_profit.iter().map(|x| x / ONE_GWEI as i128).collect();
+        actual_profit.iter().map(|x| x / one_gwei_i128()).collect();
     let projected_profit_gwei: Vec<_> = projected_profit
         .iter()
-        .map(|x| x / ONE_GWEI as i128)
+        .map(|x| x / one_gwei_i128())
         .collect();
     let pessimistic_block_costs_gwei: Vec<_> = pessimistic_block_costs
         .iter()
-        .map(|x| x / ONE_GWEI as u128)
+        .map(|x| x / one_gwei_u128())
         .collect();
     let min = *std::cmp::min(
         actual_profit_gwei

crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs

@@ -103,7 +103,6 @@ impl Simulator {
             // Increase to make the da price change faster
             max_da_gas_price_change_percent: 10,
             total_da_rewards_excess: 0,
-            da_recorded_block_height: 0,
             // Change to adjust the cost per byte of the DA on block 0
             latest_da_cost_per_byte: 0,
             projected_total_da_cost: 0,
@@ -114,6 +113,7 @@ impl Simulator {
             last_profit: 0,
             second_to_last_profit: 0,
             l2_activity: always_normal_activity,
+            unrecorded_blocks_bytes: 0,
         }
     }
 
@@ -160,10 +160,9 @@ impl Simulator {
 
             // Update DA blocks on the occasion there is one
             if let Some((range, cost)) = da_block {
-                for height in range {
-                    updater
-                        .update_da_record_data(height..(height + 1), cost)
-                        .unwrap();
+                for height in range.to_owned() {
+                    let block_heights: Vec<u32> = (height..(height) + 1).collect();
+                    updater.update_da_record_data(&block_heights, cost).unwrap();
                     actual_costs.push(updater.latest_known_total_da_cost_excess)
                 }
             }

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

@@ -3,10 +3,7 @@ use std::{
     cmp::max,
     collections::BTreeMap,
     num::NonZeroU64,
-    ops::{
-        Div,
-        Range,
-    },
+    ops::Div,
 };
 
 #[cfg(test)]
@@ -16,14 +13,12 @@ mod tests;
 pub enum Error {
     #[error("Skipped L2 block update: expected {expected:?}, got {got:?}")]
     SkippedL2Block { expected: u32, got: u32 },
-    #[error("Skipped DA block update: expected {expected:?}, got {got:?}")]
-    SkippedDABlock { expected: u32, got: u32 },
     #[error("Could not calculate cost per byte: {bytes:?} bytes, {cost:?} cost")]
     CouldNotCalculateCostPerByte { bytes: u128, cost: u128 },
     #[error("Failed to include L2 block data: {0}")]
     FailedTooIncludeL2BlockData(String),
-    #[error("L2 block expected but not found in unrecorded blocks: {0}")]
-    L2BlockExpectedNotFound(u32),
+    #[error("L2 block expected but not found in unrecorded blocks: {height}")]
+    L2BlockExpectedNotFound { height: u32 },
 }
 
 // TODO: separate exec gas price and DA gas price into newtypes for clarity
@@ -131,8 +126,6 @@ pub struct AlgorithmUpdaterV1 {
     pub max_da_gas_price_change_percent: u16,
     /// The cumulative reward from the DA portion of the gas price
     pub total_da_rewards_excess: u128,
-    /// The height of the last L2 block recorded on the DA chain
-    pub da_recorded_block_height: u32,
     /// The cumulative cost of recording L2 blocks on the DA chain as of the last recorded block
     pub latest_known_total_da_cost_excess: u128,
     /// The predicted cost of recording L2 blocks on the DA chain as of the last L2 block
@@ -152,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.
@@ -307,11 +302,11 @@ impl core::ops::Deref for ClampedPercentage {
 impl AlgorithmUpdaterV1 {
     pub fn update_da_record_data(
         &mut self,
-        height_range: Range<u32>,
-        range_cost: u128,
+        heights: &[u32],
+        recording_cost: u128,
     ) -> Result<(), Error> {
-        if !height_range.is_empty() {
-            self.da_block_update(height_range, range_cost)?;
+        if !heights.is_empty() {
+            self.da_block_update(heights, recording_cost)?;
             self.recalculate_projected_cost();
         }
         Ok(())
@@ -355,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(())
         }
     }
@@ -514,60 +512,44 @@ impl AlgorithmUpdaterV1 {
 
     fn da_block_update(
         &mut self,
-        height_range: Range<u32>,
-        range_cost: u128,
+        heights: &[u32],
+        recording_cost: u128,
     ) -> Result<(), Error> {
-        let expected = self.da_recorded_block_height.saturating_add(1);
-        let first = height_range.start;
-        if first != expected {
-            Err(Error::SkippedDABlock {
-                expected,
-                got: first,
-            })
-        } else {
-            let last = height_range.end.saturating_sub(1);
-            let range_bytes = self.drain_l2_block_bytes_for_range(height_range)?;
-            let new_cost_per_byte: u128 = range_cost.checked_div(range_bytes).ok_or(
-                Error::CouldNotCalculateCostPerByte {
-                    bytes: range_bytes,
-                    cost: range_cost,
-                },
-            )?;
-            self.da_recorded_block_height = last;
-            let new_da_block_cost = self
-                .latest_known_total_da_cost_excess
-                .saturating_add(range_cost);
-            self.latest_known_total_da_cost_excess = new_da_block_cost;
-            self.latest_da_cost_per_byte = new_cost_per_byte;
-            Ok(())
-        }
+        let recorded_bytes = self.drain_l2_block_bytes_for_heights(heights)?;
+        let new_cost_per_byte: u128 = recording_cost.checked_div(recorded_bytes).ok_or(
+            Error::CouldNotCalculateCostPerByte {
+                bytes: recorded_bytes,
+                cost: recording_cost,
+            },
+        )?;
+        let new_da_block_cost = self
+            .latest_known_total_da_cost_excess
+            .saturating_add(recording_cost);
+        self.latest_known_total_da_cost_excess = new_da_block_cost;
+        self.latest_da_cost_per_byte = new_cost_per_byte;
+        Ok(())
     }
 
-    fn drain_l2_block_bytes_for_range(
+    fn drain_l2_block_bytes_for_heights(
         &mut self,
-        height_range: Range<u32>,
+        heights: &[u32],
     ) -> Result<u128, Error> {
         let mut total: u128 = 0;
-        for expected_height in height_range {
-            let (actual_height, bytes) = self
-                .unrecorded_blocks
-                .pop_first()
-                .ok_or(Error::L2BlockExpectedNotFound(expected_height))?;
-            if actual_height != expected_height {
-                return Err(Error::L2BlockExpectedNotFound(expected_height));
-            }
+        for expected_height in heights {
+            let bytes = self.unrecorded_blocks.remove(expected_height).ok_or(
+                Error::L2BlockExpectedNotFound {
+                    height: *expected_height,
+                },
+            )?;
             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)| (bytes as u128))
-            .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

@@ -35,7 +35,6 @@ pub struct UpdaterBuilder {
     l2_block_capacity_threshold: u8,
 
     total_rewards: u128,
-    da_recorded_block_height: u32,
     da_cost_per_byte: u128,
     project_total_cost: u128,
     latest_known_total_cost: u128,
@@ -63,7 +62,6 @@ impl UpdaterBuilder {
             l2_block_capacity_threshold: 50,
 
             total_rewards: 0,
-            da_recorded_block_height: 0,
             da_cost_per_byte: 0,
             project_total_cost: 0,
             latest_known_total_cost: 0,
@@ -133,11 +131,6 @@ impl UpdaterBuilder {
         self
     }
 
-    fn with_da_recorded_block_height(mut self, da_recorded_block_height: u32) -> Self {
-        self.da_recorded_block_height = da_recorded_block_height;
-        self
-    }
-
     fn with_da_cost_per_byte(mut self, da_cost_per_byte: u128) -> Self {
         self.da_cost_per_byte = da_cost_per_byte;
         self
@@ -184,7 +177,6 @@ impl UpdaterBuilder {
             l2_block_fullness_threshold_percent: self.l2_block_capacity_threshold.into(),
             total_da_rewards_excess: self.total_rewards,
 
-            da_recorded_block_height: self.da_recorded_block_height,
             latest_da_cost_per_byte: self.da_cost_per_byte,
             projected_total_da_cost: self.project_total_cost,
             latest_known_total_da_cost_excess: self.latest_known_total_cost,
@@ -201,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)),
         }
     }
 }