Skip to content

Commit 50bf779

Browse files
arboleyaarboleya
authored
chore: downgrading forc back to 0.48.1 (FuelLabs#1680)
1 parent bb60c88 commit 50bf779

File tree

25 files changed

+130
-342
lines changed

25 files changed

+130
-342
lines changed

‎.changeset/kind-toes-promise.md ‎.changeset/lucky-donkeys-smile.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"@fuel-ts/versions": patch
44
---
55

6-
Upgrading forc to 0.49.1
6+
Downgrading forc back to `0.48.1`

‎apps/docs-snippets/test/fixtures/forc-projects/script-transfer-to-contract/src/main.sw

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #region custom-transactions-1
22
script;
33

4-
use std::asset::force_transfer_to_contract;
4+
use std::token::force_transfer_to_contract;
55

66
fn main(
77
contract_address: b256,

‎apps/docs-snippets/test/fixtures/forc-projects/transfer-to-address/src/main.sw

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #region contract-balance-2
22
contract;
33

4-
use std::asset::transfer_to_address;
4+
use std::token::transfer_to_address;
55

66
abi TransferToAddress {
77
#[payable]

‎packages/abi-typegen/test/fixtures/forc-projects/full/src/main.sw

+3-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ impl MyContract for Contract {
105105
x
106106
}
107107
fn types_evm_address(x: EvmAddress) -> EvmAddress {
108-
EvmAddress::from(0x0606060606060606060606060606060606060606060606060606060606060606)
108+
EvmAddress::from(
109+
0x0606060606060606060606060606060606060606060606060606060606060606,
110+
)
109111
}
110112
fn types_bytes(x: Bytes) -> Bytes {
111113
x

‎packages/forc/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.49.1
1+
0.48.1

‎packages/fuel-gauge/test/fixtures/forc-projects/advanced-logging-other-contract/src/main.sw

-32
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,6 @@ use std::logging::log;
44

55
use advanced_logging_other_contract_abi::AdvancedLoggingOtherContract;
66

7-
impl AbiEncode for str[25] {
8-
fn abi_encode(self, ref mut buffer: Buffer) {
9-
let s = from_str_array(self);
10-
11-
let len = s.len();
12-
let ptr = s.as_ptr();
13-
14-
let mut i = 0;
15-
while i < len {
16-
let byte = ptr.add::<u8>(i).read::<u8>();
17-
buffer.push(byte);
18-
i += 1;
19-
}
20-
}
21-
}
22-
23-
impl AbiEncode for str[34] {
24-
fn abi_encode(self, ref mut buffer: Buffer) {
25-
let s = from_str_array(self);
26-
27-
let len = s.len();
28-
let ptr = s.as_ptr();
29-
30-
let mut i = 0;
31-
while i < len {
32-
let byte = ptr.add::<u8>(i).read::<u8>();
33-
buffer.push(byte);
34-
i += 1;
35-
}
36-
}
37-
}
38-
397
impl AdvancedLoggingOtherContract for Contract {
408
fn msg_from_other_contract(a: u8) {
419
log(__to_str_array("Hello from other Contract"));

‎packages/fuel-gauge/test/fixtures/forc-projects/advanced-logging/src/main.sw

+6-114
Original file line numberDiff line numberDiff line change
@@ -7,118 +7,6 @@ use std::contract_id::ContractId;
77

88
use advanced_logging_other_contract_abi::AdvancedLoggingOtherContract;
99

10-
impl AbiEncode for str[8] {
11-
fn abi_encode(self, ref mut buffer: Buffer) {
12-
let s = from_str_array(self);
13-
14-
let len = s.len();
15-
let ptr = s.as_ptr();
16-
17-
let mut i = 0;
18-
while i < len {
19-
let byte = ptr.add::<u8>(i).read::<u8>();
20-
buffer.push(byte);
21-
i += 1;
22-
}
23-
}
24-
}
25-
26-
impl AbiEncode for str[10] {
27-
fn abi_encode(self, ref mut buffer: Buffer) {
28-
let s = from_str_array(self);
29-
30-
let len = s.len();
31-
let ptr = s.as_ptr();
32-
33-
let mut i = 0;
34-
while i < len {
35-
let byte = ptr.add::<u8>(i).read::<u8>();
36-
buffer.push(byte);
37-
i += 1;
38-
}
39-
}
40-
}
41-
42-
impl AbiEncode for str[11] {
43-
fn abi_encode(self, ref mut buffer: Buffer) {
44-
let s = from_str_array(self);
45-
46-
let len = s.len();
47-
let ptr = s.as_ptr();
48-
49-
let mut i = 0;
50-
while i < len {
51-
let byte = ptr.add::<u8>(i).read::<u8>();
52-
buffer.push(byte);
53-
i += 1;
54-
}
55-
}
56-
}
57-
58-
impl AbiEncode for str[12] {
59-
fn abi_encode(self, ref mut buffer: Buffer) {
60-
let s = from_str_array(self);
61-
62-
let len = s.len();
63-
let ptr = s.as_ptr();
64-
65-
let mut i = 0;
66-
while i < len {
67-
let byte = ptr.add::<u8>(i).read::<u8>();
68-
buffer.push(byte);
69-
i += 1;
70-
}
71-
}
72-
}
73-
74-
impl AbiEncode for str[14] {
75-
fn abi_encode(self, ref mut buffer: Buffer) {
76-
let s = from_str_array(self);
77-
78-
let len = s.len();
79-
let ptr = s.as_ptr();
80-
81-
let mut i = 0;
82-
while i < len {
83-
let byte = ptr.add::<u8>(i).read::<u8>();
84-
buffer.push(byte);
85-
i += 1;
86-
}
87-
}
88-
}
89-
90-
impl AbiEncode for str[18] {
91-
fn abi_encode(self, ref mut buffer: Buffer) {
92-
let s = from_str_array(self);
93-
94-
let len = s.len();
95-
let ptr = s.as_ptr();
96-
97-
let mut i = 0;
98-
while i < len {
99-
let byte = ptr.add::<u8>(i).read::<u8>();
100-
buffer.push(byte);
101-
i += 1;
102-
}
103-
}
104-
}
105-
106-
impl AbiEncode for str[24] {
107-
fn abi_encode(self, ref mut buffer: Buffer) {
108-
let s = from_str_array(self);
109-
110-
let len = s.len();
111-
let ptr = s.as_ptr();
112-
113-
let mut i = 0;
114-
while i < len {
115-
let byte = ptr.add::<u8>(i).read::<u8>();
116-
buffer.push(byte);
117-
i += 1;
118-
}
119-
}
120-
}
121-
12210
enum GameState {
12311
Playing: u8,
12412
GameOver: u8,
@@ -157,7 +45,9 @@ impl AdvancedLogging for Contract {
15745
ammo: 10,
15846
game_id: 10_11_12u64,
15947
state: GameState::Playing(1),
160-
contract_Id: ContractId::from(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
48+
contract_Id: ContractId::from(
49+
0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
50+
),
16151
difficulty: Difficulty::Medium(true),
16252
};
16353

@@ -205,7 +95,9 @@ impl AdvancedLogging for Contract {
20595
ammo: 10,
20696
game_id: 10_11_12u64,
20797
state: GameState::Playing(1),
208-
contract_Id: ContractId::from(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
98+
contract_Id: ContractId::from(
99+
0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
100+
),
209101
difficulty: Difficulty::Medium(true),
210102
};
211103
require(a == b, game_ref);

‎packages/fuel-gauge/test/fixtures/forc-projects/call-test-contract/src/main.sw

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl TestContract for Contract {
7878
value + 1
7979
}
8080
fn call_external_foo(param: u64, contract_id: b256) -> u64 {
81-
let external_contract = abi(TestContract, contract_id);
81+
let external_contract = abi(TestContract, contract_id().into());
8282
let response = external_contract.foo(param);
8383
response + 1
8484
}

‎packages/fuel-gauge/test/fixtures/forc-projects/configurable-contract/src/main.sw

+5-1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ impl ConfigurableContract for Contract {
9090
}
9191

9292
fn echo_configurables() -> (u8, u16, u32, u64, bool, b256, Colors, [[u32; 2]; 2], str[4], (u8, bool, str[2]), Struct1) {
93-
(U8, U16, U32, U64, BOOL, B256, ENUM, ARRAY, STR_4, TUPLE, STRUCT_1)
93+
(
94+
U8,
95+
U16, U32, U64, BOOL, B256, ENUM, ARRAY, STR_4, TUPLE,
96+
STRUCT_1,
97+
)
9498
}
9599
}

‎packages/fuel-gauge/test/fixtures/forc-projects/coverage-contract/src/main.sw

-32
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,6 @@ use std::assert::assert;
1010
use std::logging::log;
1111
use std::b512::B512;
1212

13-
impl AbiEncode for str[10] {
14-
fn abi_encode(self, ref mut buffer: Buffer) {
15-
let s = from_str_array(self);
16-
17-
let len = s.len();
18-
let ptr = s.as_ptr();
19-
20-
let mut i = 0;
21-
while i < len {
22-
let byte = ptr.add::<u8>(i).read::<u8>();
23-
buffer.push(byte);
24-
i += 1;
25-
}
26-
}
27-
}
28-
29-
impl AbiEncode for str[12] {
30-
fn abi_encode(self, ref mut buffer: Buffer) {
31-
let s = from_str_array(self);
32-
33-
let len = s.len();
34-
let ptr = s.as_ptr();
35-
36-
let mut i = 0;
37-
while i < len {
38-
let byte = ptr.add::<u8>(i).read::<u8>();
39-
buffer.push(byte);
40-
i += 1;
41-
}
42-
}
43-
}
44-
4513
pub struct U8Struct {
4614
i: u8,
4715
}

‎packages/fuel-gauge/test/fixtures/forc-projects/liquidity-pool/src/main.sw

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ contract;
44
use std::constants::ZERO_B256;
55

66
use std::{
7-
asset::{
8-
mint_to_address,
9-
transfer_to_address,
10-
},
117
call_frames::{
128
contract_id,
139
msg_asset_id,
1410
},
1511
context::msg_amount,
12+
token::{
13+
mint_to_address,
14+
transfer_to_address,
15+
},
1616
};
1717

1818
abi LiquidityPool {

‎packages/fuel-gauge/test/fixtures/forc-projects/multi-token-contract/src/main.sw

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ contract;
22

33
use std::{
44
address::Address,
5-
asset::*,
65
context::balance_of,
76
context::msg_amount,
87
contract_id::ContractId,
8+
token::*,
99
};
1010

1111
use std::constants::ZERO_B256;

‎packages/fuel-gauge/test/fixtures/forc-projects/predicate-vector-types/src/main.sw

+13-10
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ fn main(
2525

2626
result = result && (u32_vec.get(1).unwrap() == 1u32);
2727

28-
result = result && (vec_in_vec.get(0).unwrap().get(1).unwrap() == 1u32);
28+
result = result && (vec_in_vec
29+
.get(0)
30+
.unwrap()
31+
.get(1)
32+
.unwrap() == 1u32);
2933

3034
result = result && (struct_in_vec.get(0).unwrap().a == 0u32);
3135

@@ -54,15 +58,14 @@ fn main(
5458
let (tuple_a, tuple_b) = vec_in_tuple;
5559
result = result && (tuple_a.get(1).unwrap() == 1u32);
5660

57-
result = result
58-
&& (vec_in_a_vec_in_a_struct_in_a_vec
59-
.get(1)
60-
.unwrap()
61-
.a
62-
.get(1)
63-
.unwrap()
64-
.get(1)
65-
.unwrap() == 10u32);
61+
result = result && (vec_in_a_vec_in_a_struct_in_a_vec
62+
.get(1)
63+
.unwrap()
64+
.a
65+
.get(1)
66+
.unwrap()
67+
.get(1)
68+
.unwrap() == 10u32);
6669

6770
result
6871
}

‎packages/fuel-gauge/test/fixtures/forc-projects/revert-error/src/main.sw

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
contract;
22

33
use std::{
4-
asset::{
5-
transfer_to_address,
6-
},
74
bytes::Bytes,
85
constants::BASE_ASSET_ID,
96
logging::log,
107
message::{
118
send_message,
129
},
10+
token::{
11+
transfer_to_address,
12+
},
1313
};
1414
use custom_errors::{AccessError, InputError};
1515

‎packages/fuel-gauge/test/fixtures/forc-projects/script-main-args/src/main.sw

-16
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,6 @@ script;
33

44
use std::logging::log;
55

6-
impl AbiEncode for str[6] {
7-
fn abi_encode(self, ref mut buffer: Buffer) {
8-
let s = from_str_array(self);
9-
10-
let len = s.len();
11-
let ptr = s.as_ptr();
12-
13-
let mut i = 0;
14-
while i < len {
15-
let byte = ptr.add::<u8>(i).read::<u8>();
16-
buffer.push(byte);
17-
i += 1;
18-
}
19-
}
20-
}
21-
226
fn main(foo: u8) -> u8 {
237
log(__to_str_array("u8 foo"));
248
log(foo);

0 commit comments

Comments
 (0)