Skip to content

Commit

Permalink
Bumped the version of the fuel-vm to 0.50.0 (#1910)
Browse files Browse the repository at this point in the history
### Before requesting review
- [x] I have reviewed the code myself
  • Loading branch information
xgreenx authored May 29, 2024
1 parent 3fddb12 commit 9a27968
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- [#1894](https://github.com/FuelLabs/fuel-core/pull/1894): Use testnet configuration for local testnet.
- [#1894](https://github.com/FuelLabs/fuel-core/pull/1894): Removed support for helm chart.
- [#1910](https://github.com/FuelLabs/fuel-core/pull/1910): `fuel-vm` upgraded to `0.50.0`. More information in the [changelog](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.50.0).

## [Version 0.26.0]

Expand Down
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fuel-core-wasm-executor = { version = "0.26.0", path = "./crates/services/upgrad
fuel-core-xtask = { version = "0.0.0", path = "./xtask" }

# Fuel dependencies
fuel-vm-private = { version = "0.49.0", package = "fuel-vm", default-features = false }
fuel-vm-private = { version = "0.50.0", package = "fuel-vm", default-features = false }

# Common dependencies
anyhow = "1.0"
Expand Down
11 changes: 11 additions & 0 deletions crates/storage/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#![deny(missing_docs)]
#![deny(warnings)]

use anyhow::anyhow;
use core::array::TryFromSliceError;
use fuel_core_types::services::executor::Error as ExecutorError;

Expand All @@ -33,6 +34,7 @@ pub mod test_helpers;
pub mod transactional;
pub mod vm_storage;

use fuel_core_types::fuel_merkle::binary::MerkleTreeError;
pub use fuel_vm_private::storage::{
ContractsAssetKey,
ContractsStateData,
Expand Down Expand Up @@ -96,6 +98,15 @@ impl From<Error> for fuel_vm_private::prelude::RuntimeError<Error> {
}
}

impl From<MerkleTreeError<Error>> for Error {
fn from(e: MerkleTreeError<Error>) -> Self {
match e {
MerkleTreeError::StorageError(s) => s,
e => Error::Other(anyhow!(e)),
}
}
}

/// The helper trait to work with storage errors.
pub trait IsNotFound {
/// Return `true` if the error is [`Error::NotFound`].
Expand Down

0 comments on commit 9a27968

Please sign in to comment.