Bump to fuels 0.17.0 (#2273)

Author: mohammadfawaz

forc/src/utils/defaults.rs

@@ -30,7 +30,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-fuels = {{ version = "0.16", features = ["fuel-core-lib"] }}
+fuels = {{ version = "0.17", features = ["fuel-core-lib"] }}
 tokio = {{ version = "1.12", features = ["rt", "macros"] }}
 
 [[test]]
@@ -90,7 +90,7 @@ fn main() -> bool {
 // to provide further information for writing tests/working with sway
 pub(crate) fn default_test_program(project_name: &str) -> String {
     format!(
-        "{}{}{}{}{}",
+        "{}{}{}{}{}{}{}",
         r#"use fuels::{prelude::*, tx::ContractId};
 
 // Load abi from json
@@ -100,13 +100,22 @@ abigen!(MyContract, "out/debug/"#,
 
 async fn get_contract_instance() -> (MyContract, ContractId) {
     // Launch a local network and deploy the contract
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
 
-    let id = Contract::deploy("./out/debug/"#,
+    let id = Contract::deploy(
+        "./out/debug/"#,
         project_name,
-        r#".bin", &wallet, TxParameters::default())
-        .await
-        .unwrap();
+        r#".bin",
+        &wallet,
+        TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "./out/debug/"#,
+        project_name,
+        r#"-storage_slots.json".to_string(),
+        )),
+    )
+    .await
+    .unwrap();
 
     let instance = MyContract::new(id.to_string(), wallet);
 

test/src/sdk-harness/Cargo.toml

@@ -11,7 +11,7 @@ fuel-core = { version = "0.9", default-features = false }
 fuel-gql-client = { version = "0.9", default-features = false }
 fuel-types = "0.5"
 fuel-vm = "0.12"
-fuels = { version = "0.16", features = ["fuel-core-lib"] }
+fuels = { version = "0.17", features = ["fuel-core-lib"] }
 hex = "0.4.3"
 sha2 = "0.10"
 sha3 = "0.10.1"

test/src/sdk-harness/test_projects/auth/mod.rs

@@ -50,12 +50,17 @@ async fn get_contracts() -> (
     ContractId,
     LocalWallet,
 ) {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
 
     let id_1 = Contract::deploy(
         "test_artifacts/auth_testing_contract/out/debug/auth_testing_contract.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(
+            Some(
+                "test_artifacts/auth_testing_contract/out/debug/auth_testing_contract-storage_slots.json".to_string(),
+                )
+        )
     )
     .await
     .unwrap();
@@ -64,6 +69,10 @@ async fn get_contracts() -> (
         "test_artifacts/auth_caller_contract/out/debug/auth_caller_contract.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/auth_caller_contract/out/debug/auth_caller_contract-storage_slots.json"
+                .to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/call_frames/mod.rs

@@ -7,11 +7,14 @@ abigen!(
 );
 
 async fn get_call_frames_instance() -> (CallFramesTestContract, ContractId) {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let id = Contract::deploy(
         "test_projects/call_frames/out/debug/call_frames.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/call_frames/out/debug/call_frames-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/context/mod.rs

@@ -20,18 +20,24 @@ async fn get_contracts() -> (
     TestContextCallerContract,
     ContractId,
 ) {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let id_1 = Contract::deploy(
         "test_projects/context/out/debug/context.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/context/out/debug/context-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();
     let id_2 = Contract::deploy(
         "test_artifacts/context_caller_contract/out/debug/context_caller_contract.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/context_caller_contract/out/debug/context_caller_contract-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/evm/mod.rs

@@ -1,16 +1,16 @@
 use fuels::{prelude::*, tx::ContractId};
 
-abigen!(
-    EvmTestContract,
-    "test_projects/evm/out/debug/evm-abi.json"
-);
+abigen!(EvmTestContract, "test_projects/evm/out/debug/evm-abi.json");
 
 async fn get_evm_test_instance() -> (EvmTestContract, ContractId) {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let id = Contract::deploy(
         "test_projects/evm/out/debug/evm.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/evm/out/debug/evm-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();
@@ -22,7 +22,7 @@ async fn get_evm_test_instance() -> (EvmTestContract, ContractId) {
 #[tokio::test]
 async fn can_call_from_literal() {
     let (instance, _) = get_evm_test_instance().await;
-    
+
     let raw_address = [6; 32]; // hardcoded in the contract to test calling `from()` with a literal
     let result = instance.evm_address_from_literal().call().await.unwrap();
     assert_eq!(result.value.value[0..12], [0; 12]);
@@ -32,9 +32,13 @@ async fn can_call_from_literal() {
 #[tokio::test]
 async fn can_call_from_argument() {
     let (instance, _) = get_evm_test_instance().await;
-    
+
     let raw_address = [7; 32];
-    let result = instance.evm_address_from_argument(raw_address.into()).call().await.unwrap();
+    let result = instance
+        .evm_address_from_argument(raw_address.into())
+        .call()
+        .await
+        .unwrap();
     assert_eq!(result.value.value[0..12], [0; 12]);
     assert_eq!(result.value.value[12..32], raw_address[12..32]);
 }

test/src/sdk-harness/test_projects/exponentiation/mod.rs

@@ -7,7 +7,7 @@ abigen!(TestPowContract, "test_artifacts/pow/out/debug/pow-abi.json");
 #[tokio::test]
 #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u64_panics() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance
         .u64_overflow(100u64, 100u64)
@@ -20,7 +20,7 @@ async fn overflowing_pow_u64_panics() {
 // TODO won't overflow until https://github.com/FuelLabs/fuel-specs/issues/90 lands
 // #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u32_panics() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance
         .u32_overflow(10u32, 11u32)
@@ -32,7 +32,7 @@ async fn overflowing_pow_u32_panics() {
 #[tokio::test]
 #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u32_panics_max() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance
         .u32_overflow(u32::MAX, u32::MAX)
@@ -45,15 +45,15 @@ async fn overflowing_pow_u32_panics_max() {
 // TODO won't overflow until https://github.com/FuelLabs/fuel-specs/issues/90 lands
 // #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u16_panics() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance.u16_overflow(10u16, 5u16).call().await.unwrap();
 }
 
 #[tokio::test]
 #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u16_panics_max() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance
         .u16_overflow(u16::MAX, u16::MAX)
@@ -66,15 +66,15 @@ async fn overflowing_pow_u16_panics_max() {
 // TODO won't overflow until https://github.com/FuelLabs/fuel-specs/issues/90 lands
 // #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u8_panics() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance.u8_overflow(10u8, 3u8).call().await.unwrap();
 }
 
 #[tokio::test]
 #[should_panic(expected = "ArithmeticOverflow")]
 async fn overflowing_pow_u8_panics_max() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let (pow_instance, _) = get_pow_test_instance(wallet).await;
     pow_instance
         .u8_overflow(u8::MAX, u8::MAX)
@@ -88,6 +88,9 @@ async fn get_pow_test_instance(wallet: LocalWallet) -> (TestPowContract, Contrac
         "test_artifacts/pow/out/debug/pow.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/pow/out/debug/pow-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/hashing/mod.rs

@@ -121,12 +121,15 @@ fn hash_struct(arr: [u8; 80], algorithm: Hash) -> [u8; 32] {
 }
 
 async fn get_hashing_instance() -> (HashingTestContract, ContractId) {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
 
     let id = Contract::deploy(
         "test_projects/hashing/out/debug/hashing.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/hashing/out/debug/hashing-storage_slots.json".to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/methods/mod.rs

@@ -8,7 +8,7 @@ abigen!(
 
 #[tokio::test]
 async fn run_methods_test() {
-    let wallet = launch_provider_and_get_single_wallet().await;
+    let wallet = launch_provider_and_get_wallet().await;
     let instance = get_methods_instance(wallet).await;
 
     let result = instance.test_function().call().await.unwrap();
@@ -20,6 +20,10 @@ async fn get_methods_instance(wallet: Wallet) -> MethodsContract {
         "test_artifacts/methods_contract/out/debug/methods_contract.bin",
         &wallet,
         TxParameters::default(),
+        StorageConfiguration::with_storage_path(Some(
+            "test_artifacts/methods_contract/out/debug/methods_contract-storage_slots.json"
+                .to_string(),
+        )),
     )
     .await
     .unwrap();

test/src/sdk-harness/test_projects/predicate_data_simple/mod.rs

@@ -1,28 +1,33 @@
 use fuel_core::service::Config;
 use fuel_vm::consts::*;
 use fuel_vm::prelude::Opcode;
+use fuels::contract::abi_encoder::ABIEncoder;
 use fuels::contract::script::Script;
 use fuels::prelude::*;
 use fuels::signers::wallet::Wallet;
-use fuels::contract::abi_encoder::ABIEncoder;
 use fuels::tx::{Address, AssetId, Contract, Input, Output, Transaction, UtxoId};
 use std::str::FromStr;
 
 async fn setup() -> (Vec<u8>, Address, Wallet, u64, AssetId) {
-    let predicate_code = std::fs::read("test_projects/predicate_data_simple/out/debug/predicate_data_simple.bin").unwrap();
+    let predicate_code =
+        std::fs::read("test_projects/predicate_data_simple/out/debug/predicate_data_simple.bin")
+            .unwrap();
     let predicate_address = (*Contract::root_from_code(&predicate_code)).into();
 
-    let wallet = launch_custom_provider_and_get_single_wallet(Some(Config {
-        predicates: true,
-        utxo_validation: true,
-        ..Config::local_node()
-    }))
+    let wallets = launch_custom_provider_and_get_wallets(
+        WalletsConfig::default(),
+        Some(Config {
+            predicates: true,
+            utxo_validation: true,
+            ..Config::local_node()
+        }),
+    )
     .await;
 
     (
         predicate_code,
         predicate_address,
-        wallet,
+        wallets[0].clone(),
         1000,
         AssetId::default(),
     )
@@ -167,7 +172,7 @@ async fn invalid_predicate_data_simple() {
     let arg = Token::U32(1001_u32);
     let args: Vec<Token> = vec![arg];
     let predicate_data = ABIEncoder::encode(&args).unwrap();
-    
+
     let receiver_address =
         Address::from_str("0xde97d8624a438121b86a1956544bd72ed68cd69f2c99555b08b1e8c51ffd511c")
             .unwrap();