chore: bump forc to 0.49.1 (#1251)

FuelLabs · Jan 22, 2024 · 23a11a3 · 23a11a3
1 parent d22ff4c
commit 23a11a3
Show file tree

Hide file tree

Showing 20 changed files with 105 additions and 94 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ env:
   FUEL_CORE_VERSION: 0.22.0
   FUEL_CORE_PATCH_BRANCH:
   RUST_VERSION: 1.74.0
-  FORC_VERSION: 0.48.0
+  FORC_VERSION: 0.49.1
   FORC_PATCH_BRANCH: ""
   FORC_PATCH_REVISION: ""
 

diff --git a/packages/fuels-code-gen/src/program_bindings/utils.rs b/packages/fuels-code-gen/src/program_bindings/utils.rs
@@ -141,7 +141,7 @@ pub(crate) fn tokenize_generics(generics: &[Ident]) -> (TokenStream, TokenStream
 pub(crate) fn sdk_provided_custom_types_lookup() -> HashMap<TypePath, TypePath> {
     [
         ("std::address::Address", "::fuels::types::Address"),
-        ("std::contract_id::AssetId", "::fuels::types::AssetId"),
+        ("std::asset_id::AssetId", "::fuels::types::AssetId"),
         ("std::b512::B512", "::fuels::types::B512"),
         ("std::bytes::Bytes", "::fuels::types::Bytes"),
         ("std::contract_id::ContractId", "::fuels::types::ContractId"),

diff --git a/packages/fuels/tests/contracts/lib_contract/src/main.sw b/packages/fuels/tests/contracts/lib_contract/src/main.sw
@@ -2,6 +2,22 @@ contract;
 
 use lib_contract::LibContract;
 
+impl AbiEncode for str[21] {
+    fn abi_encode(self, ref mut buffer: Buffer) {
+        let s = from_str_array(self);
+
+        let len = s.len();
+        let ptr = s.as_ptr();
+
+        let mut i = 0;
+        while i < len {
+            let byte = ptr.add::<u8>(i).read::<u8>();
+            buffer.push(byte);
+            i += 1;
+        }
+    }
+}
+
 impl LibContract for Contract {
     fn increment(value: u64) -> u64 {
         value + 1

diff --git a/packages/fuels/tests/contracts/lib_contract_caller/src/main.sw b/packages/fuels/tests/contracts/lib_contract_caller/src/main.sw
@@ -1,8 +1,7 @@
 contract;
 
 use lib_contract::LibContract;
-use std::token::mint_to_address;
-use std::constants::ZERO_B256;
+use std::{asset::mint_to_address, constants::ZERO_B256};
 
 abi ContractCaller {
     fn increment_from_contract(contract_id: ContractId, value: u64) -> u64;

diff --git a/packages/fuels/tests/contracts/liquidity_pool/src/main.sw b/packages/fuels/tests/contracts/liquidity_pool/src/main.sw
@@ -1,17 +1,17 @@
 contract;
 
 use std::{
+    asset::{
+        mint_to_address,
+        transfer_to_address,
+    },
     call_frames::{
         contract_id,
         msg_asset_id,
     },
+    constants::ZERO_B256,
     context::msg_amount,
-    token::{
-        mint_to_address,
-        transfer_to_address,
-    },
 };
-use std::constants::ZERO_B256;
 
 abi LiquidityPool {
     #[payable]
@@ -20,9 +20,7 @@ abi LiquidityPool {
     fn withdraw(recipient: Address);
 }
 
-const BASE_TOKEN: AssetId = AssetId::from(
-    0x9ae5b658754e096e4d681c548daf46354495a437cc61492599e33fc64dcdc30c,
-);
+const BASE_TOKEN: AssetId = AssetId::from(0x9ae5b658754e096e4d681c548daf46354495a437cc61492599e33fc64dcdc30c);
 
 impl LiquidityPool for Contract {
     #[payable]

diff --git a/packages/fuels/tests/contracts/needs_custom_decoder/src/main.sw b/packages/fuels/tests/contracts/needs_custom_decoder/src/main.sw
@@ -1,5 +1,16 @@
 contract;
 
+impl AbiEncode for [u8; 1000] {
+    #[allow(dead_code)]
+    fn abi_encode(self, ref mut buffer: Buffer) {
+        let mut i = 0;
+        while i < 1000 {
+            self[i].abi_encode(buffer);
+            i += 1;
+        }
+    }
+}
+
 abi MyContract {
     fn i_return_a_1k_el_array() -> [u8; 1000];
     fn i_log_a_1k_el_array();

diff --git a/packages/fuels/tests/contracts/token_ops/src/main.sw b/packages/fuels/tests/contracts/token_ops/src/main.sw
@@ -1,7 +1,13 @@
 contract;
 
-use std::{bytes::Bytes, context::balance_of, context::msg_amount, message::send_message, token::*};
-use std::constants::ZERO_B256;
+use std::{
+    asset::*,
+    bytes::Bytes,
+    constants::ZERO_B256,
+    context::balance_of,
+    context::msg_amount,
+    message::send_message,
+};
 
 abi TestFuelCoin {
     fn mint_coins(mint_amount: u64);

diff --git a/packages/fuels/tests/logs/contract_logs/src/main.sw b/packages/fuels/tests/logs/contract_logs/src/main.sw
@@ -132,7 +132,7 @@ impl ContractLogs for Contract {
         // produce a custom log with log id 128
         // this log id will not be present in abi JSON
         asm(r1: 0, r2: 128, r3: 0, r4: 0) {
-            log  r1 r2 r3 r4;
+            log r1 r2 r3 r4;
         }
 
         log(123);

diff --git a/packages/fuels/tests/logs/script_needs_custom_decoder_logging/src/main.sw b/packages/fuels/tests/logs/script_needs_custom_decoder_logging/src/main.sw
@@ -1,5 +1,16 @@
 script;
 
+impl AbiEncode for [u8; 1000] {
+    #[allow(dead_code)]
+    fn abi_encode(self, ref mut buffer: Buffer) {
+        let mut i = 0;
+        while i < 1000 {
+            self[i].abi_encode(buffer);
+            i += 1;
+        }
+    }
+}
+
 fn main() {
     // TODO: This file can be made obsolete once
     // [retry](`https://github.com/FuelLabs/fuels-rs/issues/1020`) lands.

diff --git a/packages/fuels/tests/predicates/swap/src/main.sw b/packages/fuels/tests/predicates/swap/src/main.sw
@@ -11,9 +11,7 @@ use std::{
 };
 
 fn main() -> bool {
-    let receiver = Address::from(
-        0x09c0b2d1a486c439a87bcba6b46a7a1a23f3897cc83a94521a96da5c23bc58db,
-    );
+    let receiver = Address::from(0x09c0b2d1a486c439a87bcba6b46a7a1a23f3897cc83a94521a96da5c23bc58db);
     let ask_amount = 100;
 
     let output_index = 0;

diff --git a/packages/fuels/tests/scripts/script_needs_custom_decoder/src/main.sw b/packages/fuels/tests/scripts/script_needs_custom_decoder/src/main.sw
@@ -1,5 +1,16 @@
 script;
 
+impl AbiEncode for [u8; 1000] {
+    #[allow(dead_code)]
+    fn abi_encode(self, ref mut buffer: Buffer) {
+        let mut i = 0;
+        while i < 1000 {
+            self[i].abi_encode(buffer);
+            i += 1;
+        }
+    }
+}
+
 fn main() -> [u8; 1000] {
     let arr: [u8; 1000] = [0; 1000];
     log(arr);

diff --git a/packages/fuels/tests/scripts/transfer_script/src/main.sw b/packages/fuels/tests/scripts/transfer_script/src/main.sw
@@ -1,6 +1,6 @@
 script;
 
-use std::token::transfer_to_address;
+use std::asset::transfer_to_address;
 
 fn main(amount: u64, asset: AssetId, receiver: Address) -> () {
     transfer_to_address(receiver, asset, amount);

diff --git a/packages/fuels/tests/types/contracts/evm_address/src/main.sw b/packages/fuels/tests/types/contracts/evm_address/src/main.sw
@@ -10,17 +10,13 @@ abi EvmTest {
 
 impl EvmTest for Contract {
     fn evm_address_as_input(evm_addr: EvmAddress) -> bool {
-        let evm_addr2 = EvmAddress::from(
-            0x1616060606060606060606060606060606060606060606060606060606060606,
-        );
+        let evm_addr2 = EvmAddress::from(0x1616060606060606060606060606060606060606060606060606060606060606);
 
         evm_addr == evm_addr2
     }
 
     fn evm_address_from_literal() -> EvmAddress {
-        EvmAddress::from(
-            0x0606060606060606060606060606060606060606060606060606060606060606,
-        )
+        EvmAddress::from(0x0606060606060606060606060606060606060606060606060606060606060606)
     }
 
     fn evm_address_from_argument(raw_address: b256) -> EvmAddress {

diff --git a/packages/fuels/tests/types/contracts/heap_type_in_enums/src/main.sw b/packages/fuels/tests/types/contracts/heap_type_in_enums/src/main.sw
@@ -115,9 +115,7 @@ impl MyContract for Contract {
     }
 
     fn would_raise_a_memory_overflow() -> Result<Bytes, b256> {
-        Result::Err(
-            0x1111111111111111111111111111111111111111111111111111111111111111,
-        )
+        Result::Err(0x1111111111111111111111111111111111111111111111111111111111111111)
     }
 
     fn returns_a_heap_type_too_deep() -> Result<Bimbam, u64> {

diff --git a/packages/fuels/tests/types/contracts/tuples/src/main.sw b/packages/fuels/tests/types/contracts/tuples/src/main.sw
@@ -42,9 +42,7 @@ impl MyContract for Contract {
             name: __to_str_array("Jane"),
         });
         assert(input.0 == expected.0);
-        assert(
-            sha256(from_str_array(input.1.name)) == sha256(from_str_array(expected.1.name)),
-        );
+        assert(sha256(from_str_array(input.1.name)) == sha256(from_str_array(expected.1.name)));
 
         expected
     }

diff --git a/packages/fuels/tests/types/contracts/u256/src/main.sw b/packages/fuels/tests/types/contracts/u256/src/main.sw
@@ -18,9 +18,7 @@ impl MyContract for Contract {
     }
 
     fn u256_in_enum_output() -> SomeEnum<u256> {
-        SomeEnum::B(
-            0x0000000000000001000000000000000200000000000000030000000000000004u256,
-        )
+        SomeEnum::B(0x0000000000000001000000000000000200000000000000030000000000000004u256)
     }
 
     fn u256_in_enum_input(some_enum: SomeEnum<u256>) {

diff --git a/packages/fuels/tests/types/predicates/address/src/main.sw b/packages/fuels/tests/types/predicates/address/src/main.sw
@@ -1,9 +1,7 @@
 predicate;
 
 fn main(input: Address) -> bool {
-    let expected_addr = Address::from(
-        0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a,
-    );
+    let expected_addr = Address::from(0xef86afa9696cf0dc6385e2c407a6e159a1103cefb7e2ae0636fb33d3cb2a9e4a);
 
     input == expected_addr
 }
diff --git a/packages/fuels/tests/types/predicates/predicate_tuples/src/main.sw b/packages/fuels/tests/types/predicates/predicate_tuples/src/main.sw
@@ -14,8 +14,7 @@ fn main(input_tuple: (u64, TestStruct, TestEnum), number: u64) -> bool {
     let (u64_number, test_struct, test_enum) = input_tuple;
 
     if let TestEnum::Value(enum_value) = test_enum {
-        return u64_number == 16 && test_struct
-            .value == 32u32 && enum_value == 64 && number == 128;
+        return u64_number == 16 && test_struct.value == 32u32 && enum_value == 64 && number == 128;
     }
 
     false

diff --git a/packages/fuels/tests/types/predicates/predicate_vectors/src/main.sw b/packages/fuels/tests/types/predicates/predicate_vectors/src/main.sw
@@ -26,25 +26,16 @@ fn main(
 
     result = result && (u32_vec.get(1).unwrap() == 4u32);
 
-    result = result && (vec_in_vec
-        .get(0)
-        .unwrap()
-        .get(1)
-        .unwrap() == 2u32);
+    result = result && (vec_in_vec.get(0).unwrap().get(1).unwrap() == 2u32);
 
     result = result && (struct_in_vec.get(0).unwrap().a == 8u32);
 
-    result = result && (vec_in_struct
-        .a
-        .get(1)
-        .unwrap() == 16u32);
+    result = result && (vec_in_struct.a.get(1).unwrap() == 16u32);
 
     let array: [u64; 2] = array_in_vec.get(1).unwrap();
     result = result && (array[0] == 32u64);
 
-    result = result && (vec_in_array[0]
-        .get(1)
-        .unwrap() == 64u32);
+    result = result && (vec_in_array[0].get(1).unwrap() == 64u32);
 
     if let SomeEnum::A(some_vec) = vec_in_enum {
         result = result && (some_vec.get(2).unwrap() == 128u32);
@@ -59,21 +50,20 @@ fn main(
         result = false;
     }
 
-    result = result && (tuple_in_vec
-        .get(1)
-        .unwrap().0 == 128u32);
+    result = result && (tuple_in_vec.get(1).unwrap().0 == 128u32);
 
     let (tuple_a, _) = vec_in_tuple;
     result = result && (tuple_a.get(1).unwrap() == 64u32);
 
-    result = result && (vec_in_a_vec_in_a_struct_in_a_vec
-        .get(1)
-        .unwrap()
-        .a
-        .get(1)
-        .unwrap()
-        .get(1)
-        .unwrap() == 32u32);
+    result = result
+        && (vec_in_a_vec_in_a_struct_in_a_vec
+                .get(1)
+                .unwrap()
+                .a
+                .get(1)
+                .unwrap()
+                .get(1)
+                .unwrap() == 32u32);
 
     result
 }