Refactor fuel-core to use version of StorageRead::read with offset (Full update to 0.59.1)

CHANGELOG.md

@@ -45,11 +45,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [2468](https://github.com/FuelLabs/fuel-core/pull/2468): Abstract unrecorded blocks concept for V1 algorithm, create new storage impl. Introduce `TransactionableStorage` trait to allow atomic changes to the storage.
 - [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.
 
 #### Breaking
+- [2438](https://github.com/FuelLabs/fuel-core/pull/2438): The `fuel-core-client` can only work with new version of the `fuel-core`. The `0.40` and all older versions are not supported.
+- [2438](https://github.com/FuelLabs/fuel-core/pull/2438): Updated `fuel-vm` to `0.59.1` release. Check [release notes](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.59.0) for more details.
 - [2389](https://github.com/FuelLabs/fuel-core/pull/2258): Updated the `messageProof` GraphQL schema to return a non-nullable `MessageProof`.
 - [2154](https://github.com/FuelLabs/fuel-core/pull/2154): Transaction graphql endpoints use `TransactionType` instead of `fuel_tx::Transaction`.
 - [2446](https://github.com/FuelLabs/fuel-core/pull/2446): Use graphiql instead of graphql-playground due to known vulnerability and stale development.

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.1", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

benches/benches/vm.rs

@@ -41,7 +41,6 @@ where
             let clock = quanta::Clock::new();
 
             let original_db = vm.as_mut().database_mut().clone();
-            let original_memory = vm.memory().clone();
             // During block production/validation for each state, which may affect the state of the database,
             // we create a new storage transaction. The code here simulates the same behavior to have
             // the same nesting level and the same performance.
@@ -53,7 +52,6 @@ where
 
             let mut total = core::time::Duration::ZERO;
             for _ in 0..iters {
-                vm.memory_mut().clone_from(&original_memory);
                 let start = black_box(clock.raw());
                 match instruction {
                     Instruction::CALL(call) => {
@@ -72,7 +70,6 @@ where
                 vm.as_mut().database_mut().reset_changes();
             }
             *vm.as_mut().database_mut() = original_db;
-            *vm.memory_mut() = original_memory;
             total
         })
     });

benches/src/default_gas_costs.rs

@@ -1,7 +1,7 @@
 use super::*;
-use fuel_core_types::fuel_tx::consensus_parameters::gas::GasCostsValuesV4;
+use fuel_core_types::fuel_tx::consensus_parameters::gas::GasCostsValuesV5;
 pub fn default_gas_costs() -> GasCostsValues {
-    GasCostsValuesV4 {
+    GasCostsValuesV5 {
         add: 2,
         addi: 2,
         and: 2,
@@ -90,6 +90,13 @@ pub fn default_gas_costs() -> GasCostsValues {
         wqmm: 6,
         xor: 2,
         xori: 2,
+        // TODO: Change to correct values
+        ecop: 2,
+        // TODO: Change to correct values
+        epar: DependentCost::HeavyOperation {
+            base: 2,
+            gas_per_unit: 2,
+        },
         aloc: DependentCost::LightOperation {
             base: 2,
             units_per_gas: 35,

benches/src/lib.rs

@@ -398,7 +398,6 @@ impl TryFrom<VmBench> for VmBenchPrepared {
         let prepare_script = prepare_script
             .into_iter()
             .chain(iter::once(op::ret(RegId::ONE)))
-            .chain(iter::once(instruction))
             .collect();
 
         let mut tx = TransactionBuilder::script(prepare_script, data);
@@ -531,9 +530,7 @@ impl TryFrom<VmBench> for VmBenchPrepared {
             }
         }
 
-        let start_vm = vm.clone();
-        let original_db = vm.as_mut().database_mut().clone();
-        let original_memory = vm.memory().clone();
+        let vm_before_first_instruction = vm.clone();
         let mut vm = vm.add_recording();
         match instruction {
             Instruction::CALL(call) => {
@@ -546,12 +543,11 @@ impl TryFrom<VmBench> for VmBenchPrepared {
         }
         let storage_diff = vm.storage_diff();
         let mut vm = vm.remove_recording();
-        let mut diff = start_vm.diff(&vm);
+        let mut diff = vm.rollback_to(&vm_before_first_instruction);
         diff += storage_diff;
         let diff: diff::Diff<diff::InitialVmState> = diff.into();
         vm.reset_vm_state(&diff);
-        *vm.as_mut().database_mut() = original_db;
-        *vm.memory_mut() = original_memory;
+        assert_eq!(vm_before_first_instruction, vm);
 
         Ok(Self {
             vm,