From 78e8d0903b7240146178d8070bb8e610b91387b6 Mon Sep 17 00:00:00 2001 From: hal3e Date: Mon, 22 Jan 2024 11:35:04 +0100 Subject: [PATCH] chore: bump `forc` to `0.49.1` (#1251) --- .github/workflows/ci.yml | 2 +- .../src/program_bindings/utils.rs | 2 +- .../tests/contracts/lib_contract/src/main.sw | 16 +++++++ .../contracts/lib_contract_caller/src/main.sw | 3 +- .../contracts/liquidity_pool/src/main.sw | 14 +++--- .../needs_custom_decoder/src/main.sw | 11 +++++ .../tests/contracts/token_ops/src/main.sw | 10 +++- .../tests/logs/contract_logs/src/main.sw | 2 +- .../src/main.sw | 11 +++++ .../fuels/tests/predicates/swap/src/main.sw | 4 +- .../script_needs_custom_decoder/src/main.sw | 11 +++++ .../tests/scripts/transfer_script/src/main.sw | 2 +- .../types/contracts/evm_address/src/main.sw | 8 +--- .../contracts/heap_type_in_enums/src/main.sw | 4 +- .../tests/types/contracts/tuples/src/main.sw | 4 +- .../tests/types/contracts/u256/src/main.sw | 4 +- .../types/predicates/address/src/main.sw | 4 +- .../predicates/predicate_tuples/src/main.sw | 3 +- .../predicates/predicate_vectors/src/main.sw | 36 +++++--------- .../types/scripts/script_vectors/src/main.sw | 48 +++++++------------ 20 files changed, 105 insertions(+), 94 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3982b92a03..763ead3d5f 100644 --- 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 index 56671a371b..75b81d8edb 100644 --- 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 { [ ("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 index bedcd0610f..ae4cf896e4 100644 --- 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::(i).read::(); + 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 index c517b41090..216610fcbc 100644 --- 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 index c923f56bf5..d9b7177e03 100644 --- 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 index 2d7280fc47..7ec32330b2 100644 --- 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 index 542c666fe4..c6f0c01883 100644 --- 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 index 5c88e1901f..b78058ae4d 100644 --- 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 index 65c9daa56f..b5265d7c46 100644 --- 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 index 3d79de95e5..0538cb188d 100644 --- 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 index 9e0ba87709..a8ccaa9b17 100644 --- 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 index 2366121d2d..332ed88c39 100644 --- 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 index 278686f085..6abd15413f 100644 --- 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 index 5c329c6332..941d637f97 100644 --- 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 { - Result::Err( - 0x1111111111111111111111111111111111111111111111111111111111111111, - ) + Result::Err(0x1111111111111111111111111111111111111111111111111111111111111111) } fn returns_a_heap_type_too_deep() -> Result { diff --git a/packages/fuels/tests/types/contracts/tuples/src/main.sw b/packages/fuels/tests/types/contracts/tuples/src/main.sw index 0b8ffebd8d..14e7a70f57 100644 --- 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 index 5a1bd9955b..e0b8ab0bec 100644 --- 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 { - SomeEnum::B( - 0x0000000000000001000000000000000200000000000000030000000000000004u256, - ) + SomeEnum::B(0x0000000000000001000000000000000200000000000000030000000000000004u256) } fn u256_in_enum_input(some_enum: SomeEnum) { diff --git a/packages/fuels/tests/types/predicates/address/src/main.sw b/packages/fuels/tests/types/predicates/address/src/main.sw index 1d2275732f..c431b853e0 100644 --- 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 index d4d2e6dfa4..3426226ce6 100644 --- 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 index ceb9650aa1..861fc618d2 100644 --- 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 } diff --git a/packages/fuels/tests/types/scripts/script_vectors/src/main.sw b/packages/fuels/tests/types/scripts/script_vectors/src/main.sw index 5bc99a0735..7e3a126b50 100644 --- a/packages/fuels/tests/types/scripts/script_vectors/src/main.sw +++ b/packages/fuels/tests/types/scripts/script_vectors/src/main.sw @@ -28,19 +28,15 @@ fn main( } { let mut exp_vec_in_vec = Vec::new(); - exp_vec_in_vec - .push(vec_from([0u32, 1u32, 2u32])); - exp_vec_in_vec - .push(vec_from([0u32, 1u32, 2u32])); + exp_vec_in_vec.push(vec_from([0u32, 1u32, 2u32])); + exp_vec_in_vec.push(vec_from([0u32, 1u32, 2u32])); require(vec_in_vec == exp_vec_in_vec, "vec_in_vec err"); } { let mut exp_struct_in_vec = Vec::new(); - exp_struct_in_vec - .push(SomeStruct { a: 0u32 }); - exp_struct_in_vec - .push(SomeStruct { a: 1u32 }); + exp_struct_in_vec.push(SomeStruct { a: 0u32 }); + exp_struct_in_vec.push(SomeStruct { a: 1u32 }); require(struct_in_vec == exp_struct_in_vec, "struct_in_vec err"); } @@ -53,10 +49,8 @@ fn main( } { let mut exp_array_in_vec = Vec::new(); - exp_array_in_vec - .push([0, 1]); - exp_array_in_vec - .push([0, 1]); + exp_array_in_vec.push([0, 1]); + exp_array_in_vec.push([0, 1]); require(array_in_vec == exp_array_in_vec, "array_in_vec err"); } @@ -73,19 +67,15 @@ fn main( } { let mut exp_enum_in_vec = Vec::new(); - exp_enum_in_vec - .push(SomeEnum::a(0u32)); - exp_enum_in_vec - .push(SomeEnum::a(1u32)); + exp_enum_in_vec.push(SomeEnum::a(0u32)); + exp_enum_in_vec.push(SomeEnum::a(1u32)); require(enum_in_vec == exp_enum_in_vec, "enum_in_vec err"); } { let mut exp_tuple_in_vec = Vec::new(); - exp_tuple_in_vec - .push((0u32, 0u32)); - exp_tuple_in_vec - .push((1u32, 1u32)); + exp_tuple_in_vec.push((0u32, 0u32)); + exp_tuple_in_vec.push((1u32, 1u32)); require(tuple_in_vec == exp_tuple_in_vec, "tuple_in_vec err"); } @@ -100,28 +90,22 @@ fn main( let mut inner_vec_1 = Vec::new(); let inner_inner_vec_1 = vec_from([0u32, 1u32, 2u32]); - inner_vec_1 - .push(inner_inner_vec_1); + inner_vec_1.push(inner_inner_vec_1); let inner_inner_vec_2 = vec_from([3u32, 4u32, 5u32]); - inner_vec_1 - .push(inner_inner_vec_2); + inner_vec_1.push(inner_inner_vec_2); - exp_vec_in_a_vec_in_a_struct_in_a_vec - .push(SomeStruct { a: inner_vec_1 }); + exp_vec_in_a_vec_in_a_struct_in_a_vec.push(SomeStruct { a: inner_vec_1 }); let mut inner_vec_2 = Vec::new(); let inner_inner_vec_3 = vec_from([6u32, 7u32, 8u32]); - inner_vec_2 - .push(inner_inner_vec_3); + inner_vec_2.push(inner_inner_vec_3); let inner_inner_vec_4 = vec_from([9u32, 10u32, 11u32]); - inner_vec_2 - .push(inner_inner_vec_4); + inner_vec_2.push(inner_inner_vec_4); - exp_vec_in_a_vec_in_a_struct_in_a_vec - .push(SomeStruct { a: inner_vec_2 }); + exp_vec_in_a_vec_in_a_struct_in_a_vec.push(SomeStruct { a: inner_vec_2 }); require( vec_in_a_vec_in_a_struct_in_a_vec == exp_vec_in_a_vec_in_a_struct_in_a_vec,