Update to fuel-vm 0.60.0 (#2767)

Bumps fuel-vm to latest version. Currently waiting for new version
release: FuelLabs/fuel-vm#921

## Checklist
- [x] Breaking changes are clearly marked as such in the PR description
and changelog
- [x] New behavior is reflected in tests
- [x] [The specification](https://github.com/FuelLabs/fuel-specs/)
matches the implemented behavior (link update PR if changes are needed)

### Before requesting review
- [x] I have reviewed the code myself
- [x] I have created follow-up issues caused by this PR and linked them
here

Author: GeorgeBake

.changes/changed/2767.md

@@ -0,0 +1 @@
+Updated fuel-vm to v0.60.0, see [release notes](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.60.0).

Cargo.lock

@@ -103,7 +103,7 @@ fuel-core-global-merkle-root-storage = { version = "0.41.7", path = "./crates/pr
 fuel-core-global-merkle-root-service = { version = "0.41.7", path = "./crates/proof_system/global_merkle_root/service" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.59.2", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.60.0", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

Cargo.toml

@@ -59,7 +59,7 @@ where
                         black_box(vm.prepare_call(ra, rb, rc, rd)).unwrap();
                     }
                     _ => {
-                        black_box(vm.instruction(*instruction).unwrap());
+                        black_box(vm.instruction::<_, false>(*instruction).unwrap());
                     }
                 }
                 black_box(&vm);

benches/benches/vm.rs

@@ -536,7 +536,7 @@ impl TryFrom<VmBench> for VmBenchPrepared {
             vm.prepare_call(ra, rb, rc, rd)
                 .map_err(anyhow::Error::msg)?;
             for instruction in post_call {
-                vm.instruction(instruction).unwrap();
+                vm.instruction::<_, false>(instruction).unwrap();
             }
         }
 
@@ -548,7 +548,7 @@ impl TryFrom<VmBench> for VmBenchPrepared {
                 vm.prepare_call(ra, rb, rc, rd).unwrap();
             }
             _ => {
-                vm.instruction(instruction).unwrap();
+                vm.instruction::<_, false>(instruction).unwrap();
             }
         }
         let storage_diff = vm.storage_diff();

benches/src/lib.rs

@@ -57,22 +57,21 @@ where
     for<'a> StorageTransaction<&'a Storage>: StorageWrite<M, Error = StorageError>,
     Self: Modifiable,
 {
-    fn write_bytes(&mut self, key: &M::Key, buf: &[u8]) -> Result<usize, Self::Error> {
+    fn write_bytes(&mut self, key: &M::Key, buf: &[u8]) -> Result<(), Self::Error> {
         let mut transaction = StorageTransaction::transaction(
             self.as_ref(),
             ConflictPolicy::Overwrite,
             Default::default(),
         );
-        let prev = <_ as StorageWrite<M>>::write_bytes(&mut transaction, key, buf)?;
-        self.commit_changes(transaction.into_changes())?;
-        Ok(prev)
+        <_ as StorageWrite<M>>::write_bytes(&mut transaction, key, buf)?;
+        self.commit_changes(transaction.into_changes())
     }
 
     fn replace_bytes(
         &mut self,
         key: &M::Key,
         buf: &[u8],
-    ) -> Result<(usize, Option<Vec<u8>>), Self::Error> {
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
         let mut transaction = StorageTransaction::transaction(
             self.as_ref(),
             ConflictPolicy::Overwrite,

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

@@ -311,7 +311,7 @@ impl StorageRead<BlobData> for ReadView {
         key: &BlobId,
         offset: usize,
         buf: &mut [u8],
-    ) -> Result<Option<usize>, Self::Error> {
+    ) -> Result<bool, Self::Error> {
         StorageRead::<BlobData>::read(self.on_chain.as_ref(), key, offset, buf)
     }
 

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

@@ -207,7 +207,7 @@ impl ConcreteStorage {
     pub fn exec(&mut self, id: &ID, op: Instruction) -> anyhow::Result<()> {
         self.vm
             .get_mut(id)
-            .map(|vm| vm.instruction(op))
+            .map(|vm| vm.instruction::<_, false>(op))
             .transpose()
             .map_err(|e| anyhow::anyhow!(e))?
             .map(|_| ())

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

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

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

@@ -93,7 +93,7 @@ where
         key: &M::Key,
         offset: usize,
         buf: &mut [u8],
-    ) -> Result<Option<usize>, Self::Error> {
+    ) -> Result<bool, Self::Error> {
         self.storage.storage::<M>().read(key, offset, buf)
     }
 
@@ -141,7 +141,7 @@ where
         column: Self::Column,
         offset: usize,
         buf: &mut [u8],
-    ) -> StorageResult<Option<usize>> {
+    ) -> StorageResult<bool> {
         KeyValueInspect::read(&self.storage, key, column, offset, buf)
     }
 }