Refactor fuel-core to use version of StorageRead::read with offset

CHANGELOG.md

@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - [2295](https://github.com/FuelLabs/fuel-core/pull/2295): `CombinedDb::from_config` now respects `state_rewind_policy` with tmp RocksDB.
 - [2378](https://github.com/FuelLabs/fuel-core/pull/2378): Use cached hash of the topic instead of calculating it on each publishing gossip message.
+- [2438](https://github.com/FuelLabs/fuel-core/pull/2438): Refactored service to use new implementation of `StorageRead::read` that takes an offset in input.
 - [2429](https://github.com/FuelLabs/fuel-core/pull/2429): Introduce custom enum for representing result of running service tasks
 - [2377](https://github.com/FuelLabs/fuel-core/pull/2377): Add more errors that can be returned as responses when using protocol `/fuel/req_res/0.0.2`. The errors supported are `ProtocolV1EmptyResponse` (status code `0`) for converting empty responses sent via protocol `/fuel/req_res/0.0.1`, `RequestedRangeTooLarge`(status code `1`) if the client requests a range of objects such as sealed block headers or transactions too large, `Timeout` (status code `2`) if the remote peer takes too long to fulfill a request, or `SyncProcessorOutOfCapacity` if the remote peer is fulfilling too many requests concurrently.
 - [2233](https://github.com/FuelLabs/fuel-core/pull/2233): Introduce a new column `modification_history_v2` for storing the modification history in the historical rocksDB. Keys in this column are stored in big endian order. Changed the behaviour of the historical rocksDB to write changes for new block heights to the new column, and to perform lookup of values from the `modification_history_v2` table first, and then from the `modification_history` table, performing a migration upon access if necessary.

Cargo.toml

@@ -87,7 +87,7 @@ fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
 fuel-gas-price-algorithm = { version = "0.40.0", path = "crates/fuel-gas-price-algorithm" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.58.2", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.59.0", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

benches/src/lib.rs

@@ -546,7 +546,8 @@ impl TryFrom<VmBench> for VmBenchPrepared {
         }
         let storage_diff = vm.storage_diff();
         let mut vm = vm.remove_recording();
-        let mut diff = start_vm.diff(&vm);
+        // TODO: Check if this is the intended use of rollback_to.
+        let mut diff = start_vm.rollback_to(&vm);
         diff += storage_diff;
         let diff: diff::Diff<diff::InitialVmState> = diff.into();
         vm.reset_vm_state(&diff);

crates/fuel-core/src/graphql_api/database.rs

@@ -261,8 +261,13 @@ impl StorageSize<BlobData> for ReadView {
 }
 
 impl StorageRead<BlobData> for ReadView {
-    fn read(&self, key: &BlobId, buf: &mut [u8]) -> Result<Option<usize>, Self::Error> {
-        StorageRead::<BlobData>::read(self.on_chain.as_ref(), key, buf)
+    fn read(
+        &self,
+        key: &BlobId,
+        offset: usize,
+        buf: &mut [u8],
+    ) -> Result<Option<usize>, Self::Error> {
+        StorageRead::<BlobData>::read(self.on_chain.as_ref(), key, offset, buf)
     }
 
     fn read_alloc(&self, key: &BlobId) -> Result<Option<Vec<u8>>, Self::Error> {

crates/fuel-core/src/schema/chain.rs

@@ -280,7 +280,9 @@ impl GasCosts {
             GasCostsValues::V1(_)
             | GasCostsValues::V2(_)
             | GasCostsValues::V3(_)
-            | GasCostsValues::V4(_) => GasCostsVersion::V1,
+            | GasCostsValues::V4(_)
+            //TODO: Handle new GasCostsValues variant properly
+            | GasCostsValues::V5(_) => GasCostsVersion::V1,
         }
     }
 

crates/fuel-core/src/schema/dap.rs

@@ -132,7 +132,7 @@ impl ConcreteStorage {
         let fee_params = params.fee_params();
 
         let ready_tx = checked_tx
-            .into_ready(GAS_PRICE, gas_costs, fee_params)
+            .into_ready(GAS_PRICE, gas_costs, fee_params, None)
             .map_err(|e| {
                 anyhow!("Failed to apply dynamic values to checked tx: {:?}", e)
             })?;
@@ -176,7 +176,7 @@ impl ConcreteStorage {
         let fee_params = params.fee_params();
 
         let ready_tx = checked_tx
-            .into_ready(GAS_PRICE, gas_costs, fee_params)
+            .into_ready(GAS_PRICE, gas_costs, fee_params, None)
             .map_err(|e| {
                 anyhow!("Failed to apply dynamic values to checked tx: {:?}", e)
             })?;
@@ -456,7 +456,7 @@ impl DapMutation {
         match checked_tx {
             CheckedTransaction::Script(script) => {
                 let ready_tx = script
-                    .into_ready(GAS_PRICE, gas_costs, fee_params)
+                    .into_ready(GAS_PRICE, gas_costs, fee_params, None)
                     .map_err(|e| {
                         anyhow!("Failed to apply dynamic values to checked tx: {:?}", e)
                     })?;

crates/fuel-core/src/state/data_source.rs

@@ -67,9 +67,10 @@ where
         &self,
         key: &[u8],
         column: Self::Column,
+        offset: usize,
         buf: &mut [u8],
     ) -> StorageResult<Option<usize>> {
-        self.data.read(key, column, buf)
+        self.data.read(key, column, offset, buf)
     }
 }
 

crates/fuel-core/src/state/generic_database.rs

@@ -79,8 +79,13 @@ where
     M: Mappable,
     StructuredStorage<Storage>: StorageRead<M, Error = StorageError>,
 {
-    fn read(&self, key: &M::Key, buf: &mut [u8]) -> Result<Option<usize>, Self::Error> {
-        self.storage.storage::<M>().read(key, buf)
+    fn read(
+        &self,
+        key: &M::Key,
+        offset: usize,
+        buf: &mut [u8],
+    ) -> Result<Option<usize>, Self::Error> {
+        self.storage.storage::<M>().read(key, offset, buf)
     }
 
     fn read_alloc(&self, key: &M::Key) -> Result<Option<Vec<u8>>, Self::Error> {
@@ -124,9 +129,10 @@ where
         &self,
         key: &[u8],
         column: Self::Column,
+        offset: usize,
         buf: &mut [u8],
     ) -> StorageResult<Option<usize>> {
-        KeyValueInspect::read(&self.storage, key, column, buf)
+        KeyValueInspect::read(&self.storage, key, column, offset, buf)
     }
 }
 

crates/fuel-core/src/state/historical_rocksdb.rs

@@ -534,9 +534,11 @@ where
         &self,
         key: &[u8],
         column: Self::Column,
+        offset: usize,
         buf: &mut [u8],
     ) -> StorageResult<Option<usize>> {
-        self.db.read(key, Column::OriginalColumn(column), buf)
+        self.db
+            .read(key, Column::OriginalColumn(column), offset, buf)
     }
 }
 

crates/fuel-core/src/state/iterable_key_value_view.rs

@@ -67,9 +67,10 @@ where
         &self,
         key: &[u8],
         column: Self::Column,
+        offset: usize,
         buf: &mut [u8],
     ) -> StorageResult<Option<usize>> {
-        self.0.read(key, column, buf)
+        self.0.read(key, column, offset, buf)
     }
 }
 

crates/fuel-core/src/state/key_value_view.rs

@@ -54,8 +54,9 @@ where
         &self,
         key: &[u8],
         column: Self::Column,
+        offset: usize,
         buf: &mut [u8],
     ) -> StorageResult<Option<usize>> {
-        self.0.read(key, column, buf)
+        self.0.read(key, column, offset, buf)
     }
 }