fix(gas_price_service_v1): block committer api format

crates/services/gas_price_service/Cargo.toml

@@ -17,10 +17,12 @@ fuel-core-storage = { workspace = true, features = ["std"] }
 fuel-core-types = { workspace = true, features = ["std"] }
 fuel-gas-price-algorithm = { workspace = true }
 futures = { workspace = true }
+mockito = { version = "1.6.1", optional = true }
 num_enum = { workspace = true }
 parking_lot = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true }
+serde_json = { workspace = true, optional = true }
 strum = { workspace = true, features = ["derive"] }
 strum_macros = { workspace = true }
 thiserror = { workspace = true }
@@ -32,4 +34,9 @@ tracing = { workspace = true }
 fuel-core-services = { workspace = true, features = ["test-helpers"] }
 fuel-core-storage = { workspace = true, features = ["test-helpers"] }
 fuel-core-types = { path = "./../../types", features = ["test-helpers"] }
+mockito = { version = "1.6.1" }
+serde_json = { workspace = true }
 tracing-subscriber = { workspace = true }
+
+[features]
+test-helpers = ["dep:mockito", "dep:serde_json"]

crates/services/gas_price_service/src/common/fuel_core_storage_adapter.rs

@@ -1,9 +1,9 @@
 use crate::{
     common::{
         fuel_core_storage_adapter::storage::{
-            BundleIdTable,
             GasPriceColumn,
             GasPriceMetadata,
+            RecordedHeights,
         },
         updater_metadata::UpdaterMetadata,
         utils::{
@@ -14,9 +14,9 @@ use crate::{
     },
     ports::{
         GasPriceServiceAtomicStorage,
-        GetDaBundleId,
+        GetLatestRecordedHeight,
         GetMetadataStorage,
-        SetDaBundleId,
+        SetLatestRecordedHeight,
         SetMetadataStorage,
     },
 };
@@ -99,25 +99,28 @@ where
     }
 }
 
-impl<Storage> GetDaBundleId for Storage
+impl<Storage> GetLatestRecordedHeight for Storage
 where
     Storage: Send + Sync,
-    Storage: StorageInspect<BundleIdTable, Error = StorageError>,
+    Storage: StorageInspect<RecordedHeights, Error = StorageError>,
 {
-    fn get_bundle_id(&self, block_height: &BlockHeight) -> GasPriceResult<Option<u32>> {
-        let bundle_id = self
-            .storage::<BundleIdTable>()
+    fn get_recorded_height(
+        &self,
+        block_height: &BlockHeight,
+    ) -> GasPriceResult<Option<BlockHeight>> {
+        let recorded_height = self
+            .storage::<RecordedHeights>()
             .get(block_height)
             .map_err(|err| GasPriceError::CouldNotFetchDARecord(err.into()))?
             .map(|no| *no);
-        Ok(bundle_id)
+        Ok(recorded_height)
     }
 }
 
 impl<Storage> GasPriceServiceAtomicStorage for Storage
 where
     Storage: 'static,
-    Storage: GetMetadataStorage + GetDaBundleId,
+    Storage: GetMetadataStorage + GetLatestRecordedHeight,
     Storage: KeyValueInspect<Column = GasPriceColumn> + Modifiable + Send + Sync,
 {
     type Transaction<'a> = StorageTransaction<&'a mut Storage> where Self: 'a;
@@ -135,18 +138,18 @@ where
     }
 }
 
-impl<Storage> SetDaBundleId for Storage
+impl<Storage> SetLatestRecordedHeight for Storage
 where
     Storage: Send + Sync,
-    Storage: StorageMutate<BundleIdTable, Error = StorageError>,
+    Storage: StorageMutate<RecordedHeights, Error = StorageError>,
 {
-    fn set_bundle_id(
+    fn set_recorded_height(
         &mut self,
         block_height: &BlockHeight,
-        bundle_id: u32,
+        recorded_height: BlockHeight,
     ) -> GasPriceResult<()> {
-        self.storage_as_mut::<BundleIdTable>()
-            .insert(block_height, &bundle_id)
+        self.storage_as_mut::<RecordedHeights>()
+            .insert(block_height, &recorded_height)
             .map_err(|err| GasPriceError::CouldNotFetchDARecord(err.into()))?;
         Ok(())
     }

crates/services/gas_price_service/src/common/fuel_core_storage_adapter/storage.rs

@@ -93,19 +93,16 @@ impl TableWithBlueprint for UnrecordedBlocksTable {
     }
 }
 
-pub struct BundleIdTable;
+pub struct RecordedHeights;
 
-/// The sequence number or bundle id of the posted blocks.
-type BundleId = u32;
-
-impl Mappable for BundleIdTable {
+impl Mappable for RecordedHeights {
     type Key = Self::OwnedKey;
     type OwnedKey = BlockHeight;
     type Value = Self::OwnedValue;
-    type OwnedValue = BundleId;
+    type OwnedValue = BlockHeight;
 }
 
-impl TableWithBlueprint for BundleIdTable {
+impl TableWithBlueprint for RecordedHeights {
     type Blueprint = Plain<Primitive<4>, Postcard>;
     type Column = GasPriceColumn;
 

crates/services/gas_price_service/src/ports.rs

@@ -35,26 +35,33 @@ pub trait GetMetadataStorage: Send + Sync {
         -> Result<Option<UpdaterMetadata>>;
 }
 
-pub trait SetDaBundleId: Send + Sync {
-    fn set_bundle_id(&mut self, block_height: &BlockHeight, bundle_id: u32)
-        -> Result<()>;
+pub trait SetLatestRecordedHeight: Send + Sync {
+    /// For any given L2 block produced, the DA will have committed some
+    fn set_recorded_height(
+        &mut self,
+        block_height: &BlockHeight,
+        recorded_height: BlockHeight,
+    ) -> Result<()>;
 }
 
-pub trait GetDaBundleId: Send + Sync {
-    fn get_bundle_id(&self, block_height: &BlockHeight) -> Result<Option<u32>>;
+pub trait GetLatestRecordedHeight: Send + Sync {
+    fn get_recorded_height(
+        &self,
+        block_height: &BlockHeight,
+    ) -> Result<Option<BlockHeight>>;
 }
 
 pub trait GasPriceServiceAtomicStorage
 where
     Self: 'static,
     Self: Send + Sync,
-    Self: GetMetadataStorage + GetDaBundleId,
+    Self: GetMetadataStorage + GetLatestRecordedHeight,
 {
     type Transaction<'a>: AsUnrecordedBlocks
         + SetMetadataStorage
         + GetMetadataStorage
-        + SetDaBundleId
-        + GetDaBundleId
+        + SetLatestRecordedHeight
+        + GetLatestRecordedHeight
     where
         Self: 'a;
 

crates/services/gas_price_service/src/v1/da_source_service.rs

@@ -9,6 +9,7 @@ pub mod service;
 #[derive(Debug, Default, Clone, Eq, Hash, PartialEq)]
 pub struct DaBlockCosts {
     pub bundle_id: u32,
+    // TODO: Should this be a range?
     pub l2_blocks: Vec<u32>,
     pub bundle_size_bytes: u32,
     pub blob_cost_wei: u128,