chore: bump fuel-core to 0.33.0 (#1486)

FuelLabs · Aug 20, 2024 · 466d335 · 466d335
1 parent 3421ac2
commit 466d335
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ env:
   CARGO_TERM_COLOR: always
   DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v2.3.6/dasel_linux_amd64
   RUSTFLAGS: "-D warnings"
-  FUEL_CORE_VERSION: 0.32.1
+  FUEL_CORE_VERSION: 0.33.0
   FUEL_CORE_PATCH_BRANCH:
   RUST_VERSION: 1.79.0
   FORC_VERSION: 0.63.1
@@ -166,6 +166,7 @@ jobs:
         with:
           toolchain: ${{ env.RUST_VERSION }}
           components: clippy,rustfmt
+          targets: wasm32-unknown-unknown
 
         # selecting a toolchain either by action or manual `rustup` calls should happen
         # before the cache plugin, as it uses the current rustc version as its cache key
@@ -219,7 +220,6 @@ jobs:
       - name: Test WASM
         if: ${{ matrix.command == 'test_wasm' }}
         run: |
-          rustup target add wasm32-unknown-unknown
           curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
           cd wasm-tests
           wasm-pack test --node

diff --git a/Cargo.toml b/Cargo.toml
@@ -82,12 +82,14 @@ which = { version = "6.0.0", default-features = false }
 zeroize = "1.7.0"
 
 # Dependencies from the `fuel-core` repository:
-fuel-core = { version = "0.32.1", default-features = false }
-fuel-core-chain-config = { version = "0.32.1", default-features = false }
-fuel-core-client = { version = "0.32.1", default-features = false }
-fuel-core-poa = { version = "0.32.1", default-features = false }
-fuel-core-services = { version = "0.32.1", default-features = false }
-fuel-core-types = { version = "0.32.1", default-features = false }
+fuel-core = { version = "0.33.0", default-features = false, features = [
+  "wasm-executor",
+] }
+fuel-core-chain-config = { version = "0.33.0", default-features = false }
+fuel-core-client = { version = "0.33.0", default-features = false }
+fuel-core-poa = { version = "0.33.0", default-features = false }
+fuel-core-services = { version = "0.33.0", default-features = false }
+fuel-core-types = { version = "0.33.0", default-features = false }
 
 # Dependencies from the `fuel-vm` repository:
 fuel-asm = { version = "0.56.0" }

diff --git a/e2e/tests/providers.rs b/e2e/tests/providers.rs
@@ -509,7 +509,7 @@ async fn test_gas_errors() -> Result<()> {
         .await
         .expect_err("should error");
 
-    let expected = "provider: io error: Response errors; Validity(InsufficientFeeAmount";
+    let expected = "Response errors; Validity(InsufficientFeeAmount";
     assert!(response.to_string().contains(expected));
 
     Ok(())

diff --git a/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs b/packages/fuels-accounts/src/provider/supported_fuel_core_version.rs
@@ -1 +1 @@
-pub const SUPPORTED_FUEL_CORE_VERSION: semver::Version = semver::Version::new(0, 32, 1);
+pub const SUPPORTED_FUEL_CORE_VERSION: semver::Version = semver::Version::new(0, 33, 0);
diff --git a/packages/fuels-test-helpers/Cargo.toml b/packages/fuels-test-helpers/Cargo.toml
@@ -12,6 +12,7 @@ description = "Fuel Rust SDK test helpers."
 [dependencies]
 fuel-core = { workspace = true, default-features = false, features = [
   "test-helpers",
+  "wasm-executor",
 ], optional = true }
 fuel-core-chain-config = { workspace = true, features = ["test-helpers"] }
 fuel-core-client = { workspace = true }

diff --git a/packages/fuels-test-helpers/src/service.rs b/packages/fuels-test-helpers/src/service.rs
@@ -3,8 +3,6 @@ use std::net::SocketAddr;
 #[cfg(feature = "fuel-core-lib")]
 use fuel_core::service::{Config as ServiceConfig, FuelService as CoreFuelService};
 use fuel_core_chain_config::{ChainConfig, StateConfig};
-#[cfg(feature = "fuel-core-lib")]
-use fuel_core_services::Service;
 use fuel_core_services::State;
 use fuels_core::types::errors::{error, Result};
 
@@ -47,7 +45,7 @@ impl FuelService {
 
     pub async fn stop(&self) -> Result<State> {
         #[cfg(feature = "fuel-core-lib")]
-        let result = self.service.stop_and_await().await;
+        let result = self.service.send_stop_signal_and_await_shutdown().await;
 
         #[cfg(not(feature = "fuel-core-lib"))]
         let result = self.service.stop();

diff --git a/packages/fuels/Cargo.toml b/packages/fuels/Cargo.toml
@@ -14,7 +14,6 @@ description = "Fuel Rust SDK."
 ignored = ["fuel-core"]
 
 [dependencies]
-fuel-core = { workspace = true, default-features = false, optional = true }
 fuel-core-client = { workspace = true, optional = true }
 fuel-crypto = { workspace = true }
 fuel-tx = { workspace = true }
@@ -40,5 +39,5 @@ std = [
   "fuels-core/std",
   "fuels-test-helpers?/std",
 ]
-fuel-core-lib = ["fuels-test-helpers?/fuel-core-lib", "dep:fuel-core"]
-rocksdb = ["fuel-core?/rocksdb", "fuels-test-helpers?/rocksdb"]
+fuel-core-lib = ["fuels-test-helpers?/fuel-core-lib"]
+rocksdb = ["fuels-test-helpers?/rocksdb"]