Bump SDK to 0.34 (FuelLabs#3879)

Bumps the rust SDK for the `sdk_harness` tests. Co-authored-by: Toby Hutton <[email protected]> Co-authored-by: Mohammad Fawaz <[email protected]> Co-authored-by: João Matos <[email protected]>
caseyryback8 · Jan 25, 2023 · b070579 · b070579
1 parent 0419c19
commit b070579
Show file tree

Hide file tree

Showing 43 changed files with 298 additions and 257 deletions.
diff --git a/test/src/sdk-harness/Cargo.toml b/test/src/sdk-harness/Cargo.toml
@@ -9,9 +9,8 @@ version = "0.0.0"
 assert_matches = "1.5.0"
 fuel-core = { version = "0.15", default-features = false }
 fuel-gql-client = { version = "0.15", default-features = false }
-fuel-types = "0.5"
 fuel-vm = "0.22"
-fuels = { version = "0.33", features = ["fuel-core-lib"] }
+fuels = { version = "0.34", features = ["fuel-core-lib"] }
 hex = "0.4.3"
 rand = "0.8"
 sha2 = "0.10"

diff --git a/test/src/sdk-harness/test_projects/auth/mod.rs b/test/src/sdk-harness/test_projects/auth/mod.rs
@@ -1,12 +1,14 @@
 use fuels::{prelude::*, tx::ContractId};
 
 abigen!(
-    AuthContract,
-    "test_artifacts/auth_testing_contract/out/debug/auth_testing_contract-abi.json"
-);
-abigen!(
-    AuthCallerContract,
-    "test_artifacts/auth_caller_contract/out/debug/auth_caller_contract-abi.json"
+    Contract(
+        name = "AuthContract",
+        abi = "test_artifacts/auth_testing_contract/out/debug/auth_testing_contract-abi.json"
+    ),
+    Contract(
+        name = "AuthCallerContract",
+        abi = "test_artifacts/auth_caller_contract/out/debug/auth_caller_contract-abi.json"
+    )
 );
 
 #[tokio::test]
@@ -37,12 +39,12 @@ async fn msg_sender_from_sdk() {
 
 #[tokio::test]
 async fn msg_sender_from_contract() {
-    let (_, auth_id, caller_instance, caller_id, _) = get_contracts().await;
+    let (auth_instance, auth_id, caller_instance, caller_id, _) = get_contracts().await;
 
     let result = caller_instance
         .methods()
         .call_auth_contract(auth_id, caller_id)
-        .set_contracts(&[auth_id.into()])
+        .set_contracts(&[&auth_instance])
         .call()
         .await
         .unwrap();

diff --git a/test/src/sdk-harness/test_projects/block/mod.rs b/test/src/sdk-harness/test_projects/block/mod.rs
@@ -2,10 +2,10 @@ use fuels::prelude::*;
 use tai64::Tai64;
 use tokio::time::{sleep, Duration};
 
-abigen!(
-    BlockTestContract,
-    "test_projects/block/out/debug/block-abi.json"
-);
+abigen!(Contract(
+    name = "BlockTestContract",
+    abi = "test_projects/block/out/debug/block-abi.json"
+));
 
 async fn get_block_instance() -> (BlockTestContract, ContractId) {
     let wallet = launch_provider_and_get_wallet().await;

diff --git a/test/src/sdk-harness/test_projects/call_frames/mod.rs b/test/src/sdk-harness/test_projects/call_frames/mod.rs
@@ -3,10 +3,10 @@ use fuels::{prelude::*, tx::ContractId};
 
 use sha2::{Digest, Sha256};
 
-abigen!(
-    CallFramesTestContract,
-    "test_projects/call_frames/out/debug/call_frames-abi.json"
-);
+abigen!(Contract(
+    name = "CallFramesTestContract",
+    abi = "test_projects/call_frames/out/debug/call_frames-abi.json"
+));
 
 async fn get_call_frames_instance() -> (CallFramesTestContract, ContractId) {
     let wallet = launch_provider_and_get_wallet().await;

diff --git a/test/src/sdk-harness/test_projects/context/mod.rs b/test/src/sdk-harness/test_projects/context/mod.rs
@@ -2,16 +2,18 @@ use fuel_vm::consts::VM_MAX_RAM;
 use fuels::{prelude::*, tx::ContractId};
 
 abigen!(
-    TestContextContract,
-    "test_projects/context/out/debug/context-abi.json",
-);
-abigen!(
-    TestContextCallerContract,
-    "test_artifacts/context_caller_contract/out/debug/context_caller_contract-abi.json",
-);
-abigen!(
-    FuelCoin,
-    "test_projects/token_ops/out/debug/token_ops-abi.json"
+    Contract(
+        name = "TestContextContract",
+        abi = "test_projects/context/out/debug/context-abi.json",
+    ),
+    Contract(
+        name = "TestContextCallerContract",
+        abi = "test_artifacts/context_caller_contract/out/debug/context_caller_contract-abi.json",
+    ),
+    Contract(
+        name = "FuelCoin",
+        abi = "test_projects/token_ops/out/debug/token_ops-abi.json"
+    )
 );
 
 async fn get_contracts() -> (
@@ -63,7 +65,7 @@ async fn can_get_this_balance() {
     caller_instance
         .methods()
         .call_receive_coins(send_amount, context_id)
-        .set_contracts(&[context_id.into()])
+        .set_contracts(&[&context_instance])
         .tx_params(TxParameters::new(None, Some(1_000_000), None))
         .call()
         .await
@@ -94,7 +96,7 @@ async fn can_get_balance_of_contract() {
     let result = context_instance
         .methods()
         .get_balance_of_contract(caller_id.clone(), caller_id.clone())
-        .set_contracts(&[caller_id.into()])
+        .set_contracts(&[&caller_instance])
         .call()
         .await
         .unwrap();
@@ -104,7 +106,7 @@ async fn can_get_balance_of_contract() {
 
 #[tokio::test]
 async fn can_get_msg_value() {
-    let (_, context_id, caller_instance, _) = get_contracts().await;
+    let (context_instance, context_id, caller_instance, _) = get_contracts().await;
     let send_amount = 11;
 
     caller_instance
@@ -117,7 +119,7 @@ async fn can_get_msg_value() {
     let result = caller_instance
         .methods()
         .call_get_amount_with_coins(send_amount, context_id)
-        .set_contracts(&[context_id.into()])
+        .set_contracts(&[&context_instance])
         .call()
         .await
         .unwrap();
@@ -127,7 +129,7 @@ async fn can_get_msg_value() {
 
 #[tokio::test]
 async fn can_get_msg_id() {
-    let (_, context_id, caller_instance, caller_id) = get_contracts().await;
+    let (context_instance, context_id, caller_instance, caller_id) = get_contracts().await;
     let send_amount = 42;
 
     caller_instance
@@ -140,7 +142,7 @@ async fn can_get_msg_id() {
     let result = caller_instance
         .methods()
         .call_get_asset_id_with_coins(send_amount, context_id)
-        .set_contracts(&[context_id.into()])
+        .set_contracts(&[&context_instance])
         .tx_params(TxParameters::new(None, Some(1_000_000), None))
         .call()
         .await
@@ -151,7 +153,7 @@ async fn can_get_msg_id() {
 
 #[tokio::test]
 async fn can_get_msg_gas() {
-    let (_, context_id, caller_instance, _) = get_contracts().await;
+    let (context_instance, context_id, caller_instance, _) = get_contracts().await;
     let send_amount = 11;
 
     caller_instance
@@ -164,7 +166,7 @@ async fn can_get_msg_gas() {
     let result = caller_instance
         .methods()
         .call_get_gas_with_coins(send_amount, context_id)
-        .set_contracts(&[context_id.into()])
+        .set_contracts(&[&context_instance])
         .tx_params(TxParameters::new(Some(0), Some(1_000_000), None))
         .call()
         .await
@@ -175,7 +177,7 @@ async fn can_get_msg_gas() {
 
 #[tokio::test]
 async fn can_get_global_gas() {
-    let (_, context_id, caller_instance, _) = get_contracts().await;
+    let (context_instance, context_id, caller_instance, _) = get_contracts().await;
     let send_amount = 11;
 
     caller_instance
@@ -189,7 +191,7 @@ async fn can_get_global_gas() {
     let result = caller_instance
         .methods()
         .call_get_global_gas_with_coins(send_amount, context_id)
-        .set_contracts(&[context_id.into()])
+        .set_contracts(&[&context_instance])
         .tx_params(TxParameters::new(None, Some(1_000_000), None))
         .call()
         .await

diff --git a/test/src/sdk-harness/test_projects/contract_bytecode/mod.rs b/test/src/sdk-harness/test_projects/contract_bytecode/mod.rs
@@ -1,10 +1,9 @@
-use fuels::prelude::*;
-use fuels::tx::Contract as FuelsTxContract;
+use fuels::{prelude::*, tx::Contract as FuelsTxContract, types::core::Bits256};
 
-abigen!(
-    ContractBytecodeTest,
-    "test_projects/contract_bytecode/out/debug/contract_bytecode-abi.json"
-);
+abigen!(Contract(
+    name = "ContractBytecodeTest",
+    abi = "test_projects/contract_bytecode/out/debug/contract_bytecode-abi.json"
+));
 
 #[tokio::test]
 async fn can_get_bytecode_root() {
@@ -15,7 +14,7 @@ async fn can_get_bytecode_root() {
     let bytecode_root = contract_instance
         .methods()
         .get_contract_bytecode_root(ContractId::from(id.clone()))
-        .set_contracts(&[id.clone()])
+        .set_contracts(&[&contract_instance])
         .call()
         .await
         .unwrap()

diff --git a/test/src/sdk-harness/test_projects/ec_recover/mod.rs b/test/src/sdk-harness/test_projects/ec_recover/mod.rs
@@ -1,15 +1,16 @@
-use fuel_types::Bytes64;
+use fuel_vm::fuel_types::Bytes64;
 use fuels::{
     prelude::*,
     signers::fuel_crypto::{Message, PublicKey, SecretKey, Signature},
     tx::Bytes32,
+    types::core::Bits256,
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
 
-abigen!(
-    EcRecoverContract,
-    "test_projects/ec_recover/out/debug/ec_recover-abi.json"
-);
+abigen!(Contract(
+    name = "EcRecoverContract",
+    abi = "test_projects/ec_recover/out/debug/ec_recover-abi.json"
+));
 
 async fn setup_env() -> Result<
     (

diff --git a/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs b/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/mod.rs
@@ -1,8 +1,14 @@
-use fuels::prelude::*;
+use fuels::{prelude::*, types::core::B512};
+
+abigen!(
+    Predicate(
+        name = "TestPredicate",
+        abi = "test_projects/ec_recover_and_match_predicate/out/debug/ec_recover_and_match_predicate-abi.json"
+    )
+);
 
 #[tokio::test]
 async fn ec_recover_and_match_predicate_test() -> Result<(), Error> {
-    use fuels::contract::predicate::Predicate;
     use fuels::signers::fuel_crypto::SecretKey;
 
     let secret_key1: SecretKey =
@@ -23,7 +29,7 @@ async fn ec_recover_and_match_predicate_test() -> Result<(), Error> {
     let mut wallet = WalletUnlocked::new_from_private_key(secret_key1, None);
     let mut wallet2 = WalletUnlocked::new_from_private_key(secret_key2, None);
     let mut wallet3 = WalletUnlocked::new_from_private_key(secret_key3, None);
-    let receiver = WalletUnlocked::new_random(None);
+    let mut receiver = WalletUnlocked::new_random(None);
 
     let all_coins = [&wallet, &wallet2, &wallet3]
         .iter()
@@ -43,11 +49,11 @@ async fn ec_recover_and_match_predicate_test() -> Result<(), Error> {
     )
     .await;
 
-    [&mut wallet, &mut wallet2, &mut wallet3]
+    [&mut wallet, &mut wallet2, &mut wallet3, &mut receiver]
         .iter_mut()
         .for_each(|wallet| wallet.set_provider(provider.clone()));
 
-    let predicate = Predicate::load_from(
+    let predicate = TestPredicate::load_from(
         "test_projects/ec_recover_and_match_predicate/out/debug/ec_recover_and_match_predicate.bin",
     )?;
 
@@ -71,23 +77,27 @@ async fn ec_recover_and_match_predicate_test() -> Result<(), Error> {
     assert_eq!(predicate_balance, amount_to_predicate);
 
     let data_to_sign = [0; 32];
-    let signature1 = wallet.sign_message(&data_to_sign).await?.to_vec();
-    let signature2 = wallet2.sign_message(&data_to_sign).await?.to_vec();
-    let signature3 = wallet3.sign_message(&data_to_sign).await?.to_vec();
-
-    let signatures = vec![signature1, signature2, signature3];
-
-    let predicate_data = signatures.into_iter().flatten().collect();
-    wallet
-        .spend_predicate(
-            predicate_address,
-            predicate_code,
-            amount_to_predicate,
-            asset_id,
-            receiver.address(),
-            Some(predicate_data),
-            TxParameters::default(),
-        )
+    let signature1: B512 = wallet
+        .sign_message(&data_to_sign)
+        .await?
+        .as_ref()
+        .try_into()?;
+    let signature2: B512 = wallet2
+        .sign_message(&data_to_sign)
+        .await?
+        .as_ref()
+        .try_into()?;
+    let signature3: B512 = wallet3
+        .sign_message(&data_to_sign)
+        .await?
+        .as_ref()
+        .try_into()?;
+
+    let signatures = [signature1, signature2, signature3];
+
+    predicate
+        .encode_data(signatures)
+        .spend(&receiver, amount_to_predicate, asset_id, None)
         .await?;
 
     let receiver_balance_after = provider

diff --git a/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/src/main.sw b/test/src/sdk-harness/test_projects/ec_recover_and_match_predicate/src/main.sw
@@ -12,9 +12,9 @@ fn extract_public_key_and_match(signature: B512, expected_public_key: b256) -> u
     0
 }
 
-fn main() -> bool {
-    let signatures: [B512; 3] = input_predicate_data(0);
+fn main(signatures: [B512; 3]) -> bool {
 
+    // let signatures: [B512; 3] = input_predicate_data(0);
     let public_keys = [
         0xd58573593432a30a800f97ad32f877425c223a9e427ab557aab5d5bb89156db0,
         0x14df7c7e4e662db31fe2763b1734a3d680e7b743516319a49baaa22b2032a857,

diff --git a/test/src/sdk-harness/test_projects/evm/mod.rs b/test/src/sdk-harness/test_projects/evm/mod.rs
@@ -1,6 +1,13 @@
-use fuels::{prelude::*, tx::ContractId};
+use fuels::{
+    prelude::*,
+    tx::ContractId,
+    types::core::{Bits256, EvmAddress},
+};
 
-abigen!(EvmTestContract, "test_projects/evm/out/debug/evm-abi.json");
+abigen!(Contract(
+    name = "EvmTestContract",
+    abi = "test_projects/evm/out/debug/evm-abi.json"
+));
 
 async fn get_evm_test_instance() -> (EvmTestContract, ContractId) {
     let wallet = launch_provider_and_get_wallet().await;

diff --git a/test/src/sdk-harness/test_projects/evm_ec_recover/mod.rs b/test/src/sdk-harness/test_projects/evm_ec_recover/mod.rs
@@ -1,16 +1,17 @@
-use fuel_types::Bytes64;
+use fuel_vm::fuel_types::Bytes64;
 use fuels::{
     prelude::*,
     signers::fuel_crypto::{Message, PublicKey, SecretKey, Signature},
     tx::Bytes32,
+    types::core::{Bits256, EvmAddress},
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use sha3::{Digest, Keccak256};
 
-abigen!(
-    EvmEcRecoverContract,
-    "test_projects/evm_ec_recover/out/debug/evm_ec_recover-abi.json"
-);
+abigen!(Contract(
+    name = "EvmEcRecoverContract",
+    abi = "test_projects/evm_ec_recover/out/debug/evm_ec_recover-abi.json"
+));
 
 fn keccak_hash<B>(data: B) -> Bytes32
 where

diff --git a/test/src/sdk-harness/test_projects/exponentiation/mod.rs b/test/src/sdk-harness/test_projects/exponentiation/mod.rs
@@ -1,7 +1,10 @@
 use fuels::prelude::*;
 use fuels::tx::ContractId;
 
-abigen!(TestPowContract, "test_artifacts/pow/out/debug/pow-abi.json");
+abigen!(Contract(
+    name = "TestPowContract",
+    abi = "test_artifacts/pow/out/debug/pow-abi.json"
+));
 
 #[tokio::test]
 #[should_panic(expected = "ArithmeticOverflow")]