Merge branch 'master' into st/chore/add-latency-detection-scripts

FuelLabs · Jan 24, 2025 · aaf8330 · aaf8330
2 parents 7e700a7 + 68e4b5a
commit aaf8330
Show file tree

Hide file tree

Showing 45 changed files with 105 additions and 150 deletions.
diff --git a/.changeset/lemon-avocados-walk.md b/.changeset/lemon-avocados-walk.md
@@ -0,0 +1,7 @@
+---
+"@internal/forc": patch
+"create-fuels": patch
+"@fuel-ts/versions": patch
+---
+
+chore: bump `forc` to `0.66.6`
diff --git a/.changeset/pink-mails-dream.md b/.changeset/pink-mails-dream.md
@@ -0,0 +1,6 @@
+---
+"@fuel-ts/account": patch
+"@fuel-ts/utils": patch
+---
+
+chore: update `amountPerCoin` prop in `WalletConfig` to accept BN
diff --git a/.changeset/six-moles-wonder.md b/.changeset/six-moles-wonder.md
@@ -0,0 +1,6 @@
+---
+"@fuel-ts/abi-typegen": patch
+"@fuel-ts/recipes": patch
+---
+
+chore: prevent naming collisions on typegen
diff --git a/apps/create-fuels-counter-guide/fuel-toolchain.toml b/apps/create-fuels-counter-guide/fuel-toolchain.toml
@@ -2,5 +2,5 @@
 channel = "testnet"
 
 [components]
-forc = "0.66.5"
+forc = "0.66.6"
 fuel-core = "0.40.2"
diff --git a/apps/docs/sway/liquidity-pool/src/main.sw b/apps/docs/sway/liquidity-pool/src/main.sw
@@ -1,40 +1,32 @@
 // #region deposit-and-withdraw-cookbook-1
 contract;
 
-use std::{asset::{mint_to, transfer,}, call_frames::{msg_asset_id,}, context::msg_amount,};
+use std::{asset::{mint_to, transfer}, call_frames::msg_asset_id, context::msg_amount};
 use std::constants::ZERO_B256;
-
 abi LiquidityPool {
     #[payable]
     fn deposit(recipient: Address);
     #[payable]
     fn withdraw(recipient: Address);
 }
-
 configurable {
     TOKEN: AssetId = AssetId::from(0x0000000000000000000000000000000000000000000000000000000000000000),
 }
-
 impl LiquidityPool for Contract {
     #[payable]
     fn deposit(recipient: Address) {
         assert(TOKEN == msg_asset_id());
         assert(0 < msg_amount());
-
         // Mint two times the amount.
         let amount_to_mint = msg_amount() * 2;
-
         // Mint some LP token based upon the amount of the base token.
         mint_to(Identity::Address(recipient), ZERO_B256, amount_to_mint);
     }
-
     #[payable]
     fn withdraw(recipient: Address) {
         assert(0 < msg_amount());
-
         // Amount to withdraw.
         let amount_to_transfer = msg_amount() / 2;
-
         // Transfer base token to recipient.
         transfer(Identity::Address(recipient), TOKEN, amount_to_transfer);
     }

diff --git a/apps/docs/sway/simple-token/src/main.sw b/apps/docs/sway/simple-token/src/main.sw
@@ -1,12 +1,13 @@
 // #region inter-contract-calls-1
 contract;
 
-use ::simple_token_abi::SimpleToken;
-
 use std::hash::*;
+use simple_token_abi::SimpleToken;
+
 storage {
     balances: StorageMap<b256, u64> = StorageMap {},
 }
+
 impl SimpleToken for Contract {
     #[storage(read, write)]
     fn deposit(address: b256, amount: u64) {

diff --git a/apps/docs/sway/token-depositor/src/main.sw b/apps/docs/sway/token-depositor/src/main.sw
@@ -3,7 +3,7 @@ contract;
 
 use std::auth::msg_sender;
 
-use ::simple_token_abi::SimpleToken;
+use simple_token_abi::SimpleToken;
 
 abi TokenDepositor {
     fn deposit_to_simple_token(contract_id: b256, amount: u64);

diff --git a/internal/forc/VERSION b/internal/forc/VERSION
@@ -1 +1 @@
-0.66.5
+0.66.6
diff --git a/packages/abi-typegen/src/templates/contract/factory.hbs b/packages/abi-typegen/src/templates/contract/factory.hbs
@@ -1,13 +1,13 @@
 {{header}}
 
-import { ContractFactory, decompressBytecode } from "fuels";
+import { ContractFactory as __ContractFactory, decompressBytecode } from "fuels";
 import type { Provider, Account, DeployContractOptions } from "fuels";
 
 import { {{capitalizedName}} } from "./{{capitalizedName}}";
 
 const bytecode = decompressBytecode("{{compressedBytecode}}");
 
-export class {{capitalizedName}}Factory extends ContractFactory<{{capitalizedName}}> {
+export class {{capitalizedName}}Factory extends __ContractFactory<{{capitalizedName}}> {
 
   static readonly bytecode = bytecode;
 

diff --git a/packages/abi-typegen/src/templates/contract/main.hbs b/packages/abi-typegen/src/templates/contract/main.hbs
@@ -1,6 +1,6 @@
 {{header}}
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 {{#if imports}}
 import type {
   Provider,
@@ -69,7 +69,7 @@ export class {{capitalizedName}}Interface extends Interface {
   };
 }
 
-export class {{capitalizedName}} extends Contract {
+export class {{capitalizedName}} extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

diff --git a/packages/abi-typegen/src/templates/predicate/main.hbs b/packages/abi-typegen/src/templates/predicate/main.hbs
@@ -61,7 +61,7 @@ const abi = {{abiJsonString}};
 
 const bytecode = decompressBytecode('{{compressedBytecode}}');
 
-export class {{capitalizedName}} extends Predicate<
+export class {{capitalizedName}} extends __Predicate<
   {{capitalizedName}}Inputs,
   {{capitalizedName}}Configurables
 > {

diff --git a/packages/abi-typegen/src/templates/predicate/main.ts b/packages/abi-typegen/src/templates/predicate/main.ts
@@ -34,7 +34,13 @@ export function renderMainTemplate(params: { abi: Abi; versions: BinaryVersions
   const { structs } = formatStructs({ types });
   const { imports } = formatImports({
     types,
-    baseMembers: ['Predicate', 'Provider', 'InputValue', 'PredicateParams', 'decompressBytecode'],
+    baseMembers: [
+      'Predicate as __Predicate',
+      'Provider',
+      'InputValue',
+      'PredicateParams',
+      'decompressBytecode',
+    ],
   });
 
   const { prefixedInputs: inputs, output } = func.attributes;

diff --git a/packages/abi-typegen/src/templates/script/main.hbs b/packages/abi-typegen/src/templates/script/main.hbs
@@ -55,7 +55,7 @@ const abi = {{abiJsonString}};
 
 const bytecode = decompressBytecode('{{compressedBytecode}}');
 
-export class {{capitalizedName}} extends Script<{{capitalizedName}}Inputs, {{capitalizedName}}Output> {
+export class {{capitalizedName}} extends __Script<{{capitalizedName}}Inputs, {{capitalizedName}}Output> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

diff --git a/packages/abi-typegen/src/templates/script/main.ts b/packages/abi-typegen/src/templates/script/main.ts
@@ -34,7 +34,7 @@ export function renderMainTemplate(params: { abi: Abi; versions: BinaryVersions
   const { structs } = formatStructs({ types });
   const { imports } = formatImports({
     types,
-    baseMembers: ['Script', 'Account', 'decompressBytecode'],
+    baseMembers: ['Script as __Script', 'Account', 'decompressBytecode'],
   });
 
   const { prefixedInputs: inputs, output } = func.attributes;

diff --git a/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/contract-with-configurable/main.hbs
@@ -10,7 +10,7 @@
   Fuel-Core version: 33.33.33
 */
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 import type {
   Provider,
   Account,
@@ -160,17 +160,17 @@ const abi = {
     {
       "name": "SHOULD_RETURN",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 2816
+      "offset": 2584
     },
     {
       "name": "AN_OPTION",
       "concreteTypeId": "2da102c46c7263beeed95818cd7bee801716ba8303dddafdcd0f6c9efda4a0f1",
-      "offset": 2792
+      "offset": 2560
     },
     {
       "name": "A_GENERIC_STRUCT",
       "concreteTypeId": "71df88006611ffff852cf617defb70f77adaf507305088cedd41d276c783aab0",
-      "offset": 2808
+      "offset": 2576
     }
   ]
 };
@@ -187,7 +187,7 @@ export class MyContractInterface extends Interface {
   };
 }
 
-export class MyContract extends Contract {
+export class MyContract extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

diff --git a/packages/abi-typegen/test/fixtures/templates/contract/factory.hbs b/packages/abi-typegen/test/fixtures/templates/contract/factory.hbs
@@ -10,14 +10,14 @@
   Fuel-Core version: 33.33.33
 */
 
-import { ContractFactory, decompressBytecode } from "fuels";
+import { ContractFactory as __ContractFactory, decompressBytecode } from "fuels";
 import type { Provider, Account, DeployContractOptions } from "fuels";
 
 import { MyContract } from "./MyContract";
 
 const bytecode = decompressBytecode("0x-bytecode-here");
 
-export class MyContractFactory extends ContractFactory<MyContract> {
+export class MyContractFactory extends __ContractFactory<MyContract> {
 
   static readonly bytecode = bytecode;
 

diff --git a/packages/abi-typegen/test/fixtures/templates/contract/main.hbs b/packages/abi-typegen/test/fixtures/templates/contract/main.hbs
@@ -10,7 +10,7 @@
   Fuel-Core version: 33.33.33
 */
 
-import { Contract, Interface } from "fuels";
+import { Contract as __Contract, Interface } from "fuels";
 import type {
   Provider,
   Account,
@@ -1199,7 +1199,7 @@ export class MyContractInterface extends Interface {
   };
 }
 
-export class MyContract extends Contract {
+export class MyContract extends __Contract {
   static readonly abi = abi;
   static readonly storageSlots = storageSlots;
 

diff --git a/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/predicate-with-configurable/main.hbs
@@ -14,7 +14,7 @@ import {
   BigNumberish,
   decompressBytecode,
   InputValue,
-  Predicate,
+  Predicate as __Predicate,
   PredicateParams,
   Provider,
 } from 'fuels';
@@ -73,19 +73,19 @@ const abi = {
     {
       "name": "FEE",
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
-      "offset": 936
+      "offset": 888
     },
     {
       "name": "ADDRESS",
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
-      "offset": 904
+      "offset": 856
     }
   ]
 };
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyPredicate extends Predicate<
+export class MyPredicate extends __Predicate<
   MyPredicateInputs,
   MyPredicateConfigurables
 > {

diff --git a/packages/abi-typegen/test/fixtures/templates/predicate/main.hbs b/packages/abi-typegen/test/fixtures/templates/predicate/main.hbs
@@ -15,7 +15,7 @@ import {
   BN,
   decompressBytecode,
   InputValue,
-  Predicate,
+  Predicate as __Predicate,
   PredicateParams,
   Provider,
 } from 'fuels';
@@ -276,7 +276,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyPredicate extends Predicate<
+export class MyPredicate extends __Predicate<
   MyPredicateInputs,
   MyPredicateConfigurables
 > {

diff --git a/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs b/packages/abi-typegen/test/fixtures/templates/script-with-configurable/main.hbs
@@ -14,7 +14,7 @@ import {
   Account,
   BigNumberish,
   decompressBytecode,
-  Script,
+  Script as __Script,
 } from 'fuels';
 
 export type ScoreInput = { user: BigNumberish, points: BigNumberish };
@@ -81,14 +81,14 @@ const abi = {
     {
       "name": "SHOULD_RETURN",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 768
+      "offset": 696
     }
   ]
 };
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyScript extends Script<MyScriptInputs, MyScriptOutput> {
+export class MyScript extends __Script<MyScriptInputs, MyScriptOutput> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

diff --git a/packages/abi-typegen/test/fixtures/templates/script/main.hbs b/packages/abi-typegen/test/fixtures/templates/script/main.hbs
@@ -15,7 +15,7 @@ import {
   BigNumberish,
   BN,
   decompressBytecode,
-  Script,
+  Script as __Script,
 } from 'fuels';
 
 import type { Option, Enum, Vec, Result } from "./common";
@@ -268,7 +268,7 @@ const abi = {
 
 const bytecode = decompressBytecode('0x-bytecode-here');
 
-export class MyScript extends Script<MyScriptInputs, MyScriptOutput> {
+export class MyScript extends __Script<MyScriptInputs, MyScriptOutput> {
 
   static readonly abi = abi;
   static readonly bytecode = bytecode;

diff --git a/packages/account/src/test-utils/wallet-config.ts b/packages/account/src/test-utils/wallet-config.ts
@@ -1,5 +1,6 @@
 import { randomBytes } from '@fuel-ts/crypto';
 import { FuelError } from '@fuel-ts/errors';
+import { bn, type BigNumberish } from '@fuel-ts/math';
 import { defaultSnapshotConfigs, hexlify, type SnapshotConfigs } from '@fuel-ts/utils';
 import type { PartialDeep } from 'type-fest';
 
@@ -29,7 +30,7 @@ export interface WalletsConfigOptions {
   /**
    * For each coin, the amount it'll contain.
    */
-  amountPerCoin: number;
+  amountPerCoin: BigNumberish;
 
   /**
    * Messages that are supposed to be on the wallet.
@@ -105,7 +106,7 @@ export class WalletsConfig {
     baseAssetId: string,
     assets: number | TestAssetId[],
     coinsPerAsset: number,
-    amountPerCoin: number
+    amountPerCoin: BigNumberish
   ) {
     const coins: SnapshotConfigs['stateConfig']['coins'] = [];
 
@@ -122,7 +123,7 @@ export class WalletsConfig {
         assetIds.forEach((assetId) => {
           for (let index = 0; index < coinsPerAsset; index++) {
             coins.push({
-              amount: amountPerCoin,
+              amount: bn(amountPerCoin).toString(),
               asset_id: assetId,
               owner: walletAddress,
               tx_pointer_block_height: 0,
@@ -167,7 +168,7 @@ export class WalletsConfig {
         'Number of coins per asset must be greater than zero.'
       );
     }
-    if (amountPerCoin < 0) {
+    if (bn(amountPerCoin).lt(0)) {
       throw new FuelError(
         FuelError.CODES.INVALID_INPUT_PARAMETERS,
         'Amount per coin must be greater than or equal to zero.'

diff --git a/packages/create-fuels/test/cli.test.ts b/packages/create-fuels/test/cli.test.ts
@@ -86,7 +86,7 @@ describe('CLI', { timeout: 15_000 }, () => {
 
     expect(toolchain).toEqual({ channel: 'testnet' });
     expect(components).toEqual({
-      forc: '0.66.5',
+      forc: '0.66.6',
       'fuel-core': '0.40.2',
     });
   });