chore: upgrading forc to 0.49.2 (#1707)

.changeset/witty-hounds-work.md

@@ -0,0 +1,11 @@
+---
+"@fuel-ts/abi-typegen": patch
+"@fuel-ts/forc": patch
+"@fuel-ts/fuel-core": patch
+"fuels": patch
+"@fuel-ts/script": patch
+"@fuel-ts/transactions": patch
+"@fuel-ts/versions": patch
+---
+
+Upgrading `forc` to `0.49.2`

.github/actions/ci-setup/action.yaml

@@ -22,6 +22,7 @@ runs:
           apps/docs/.typedoc
           apps/docs/src/api
           packages/providers/src/__generated__
+          templates/src/sway-api
         key: ${{ runner.os }}-generated-${{ github.sha }}
 
     - name: Cache Build
@@ -37,6 +38,7 @@ runs:
           apps/docs/.typedoc
           apps/docs/src/api
           packages/providers/src/__generated__
+          templates/src/sway-api
         key: ${{ runner.os }}-generated-${{ github.sha }}
 
     - name: Setup Node.js

apps/docs-snippets/test/fixtures/forc-projects/liquidity-pool/src/main.sw

@@ -2,14 +2,14 @@
 contract;
 
 use std::{
+    asset::{
+        mint_to_address,
+        transfer_to_address,
+    },
     call_frames::{
         msg_asset_id,
     },
     context::msg_amount,
-    token::{
-        mint_to_address,
-        transfer_to_address,
-    },
 };
 use std::constants::ZERO_B256;
 
@@ -20,9 +20,7 @@ abi LiquidityPool {
     fn withdraw(recipient: Address);
 }
 
-const BASE_TOKEN: AssetId = AssetId::from(
-    0x0000000000000000000000000000000000000000000000000000000000000000,
-);
+const BASE_TOKEN: AssetId = AssetId::from(0x0000000000000000000000000000000000000000000000000000000000000000);
 
 impl LiquidityPool for Contract {
     #[payable]

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

@@ -1,7 +1,7 @@
 // #region custom-transactions-1
 script;
 
-use std::token::force_transfer_to_contract;
+use std::asset::force_transfer_to_contract;
 
 fn main(
     contract_address: b256,

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

@@ -1,7 +1,7 @@
 // #region contract-balance-2
 contract;
 
-use std::token::transfer_to_address;
+use std::asset::transfer_to_address;
 
 abi TransferToAddress {
     #[payable]

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

@@ -105,9 +105,7 @@ impl MyContract for Contract {
         x
     }
     fn types_evm_address(x: EvmAddress) -> EvmAddress {
-        EvmAddress::from(
-            0x0606060606060606060606060606060606060606060606060606060606060606,
-        )
+        EvmAddress::from(0x0606060606060606060606060606060606060606060606060606060606060606)
     }
     fn types_bytes(x: Bytes) -> Bytes {
         x

packages/forc/VERSION

@@ -1 +1 @@
-0.48.1
+0.49.2

packages/forc/lib/install.js

@@ -21,39 +21,51 @@ import {
   const pkgPlatform = getPkgPlatform();
   const forcVersion = await getCurrentVersion();
 
-  // If a git branch is specified in the VERSION file, build from that branch
-  if (isGitBranch(forcVersion)) {
-    const branchName = forcVersion.split(':')[1];
-    buildFromGitBranch(branchName);
-    return;
-  }
-
   const pkgName = `forc-binaries-${pkgPlatform}.tar.gz`;
   const pkgUrl = `https://github.com/FuelLabs/sway/releases/download/v${forcVersion}/${pkgName}`;
 
   const pkgPath = join(__dirname, pkgName);
   const binDir = join(__dirname, '../');
 
   const binPath = join(binDir, 'forc-binaries', 'forc');
+
   let versionMatches = false;
 
   if (existsSync(binPath)) {
     const binRawVersion = execSync(`${binPath} --version`).toString().trim();
     const binVersion = binRawVersion.match(/([.0-9]+)/)?.[0];
 
     versionMatches = binVersion === forcVersion;
-    info({ expected: forcVersion, received: binVersion });
+    info({
+      expected: forcVersion,
+      received: binVersion,
+      isGitBranch: isGitBranch(forcVersion),
+    });
   }
 
   if (versionMatches) {
     info(`Forc binary already installed, skipping.`);
   } else {
-    // Download
+    // If a git branch is specified in the VERSION file, build from that branch
+    if (isGitBranch(forcVersion)) {
+      const branchName = forcVersion.split(':')[1];
+      buildFromGitBranch(branchName);
+      return;
+    }
+
+    const stdioOpts = { stdio: 'inherit' };
+
+    // Otherwise, download
     const buf = await fetch(pkgUrl).then((r) => r.buffer());
+
+    if (/not found/i.test(buf.toString())) {
+      throw new Error(`Version '${forcVersion}' not found\n    at ${pkgUrl}`);
+    }
+
     writeFileSync(pkgPath, buf);
 
     // Extract
-    execSync(`tar xzf "${pkgPath}" -C "${binDir}"`);
+    execSync(`tar xzf "${pkgPath}" -C "${binDir}"`, stdioOpts);
 
     // Cleanup
     rmSync(pkgPath);

packages/forc/lib/shared.js

@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
-import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync } from 'fs';
+import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync, existsSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const __dirname = dirname(fileURLToPath(import.meta.url));
 
-export const binPath = join(__dirname, '../forc-binaries/forc');
+export const forcBinDirPath = join(__dirname, '..', 'forc-binaries');
+export const binPath = join(forcBinDirPath, 'forc');
 
 const platforms = {
   darwin: {
@@ -50,18 +51,29 @@ export const isGitBranch = (versionFileContents) => versionFileContents.indexOf(
 const swayRepoUrl = 'https://github.com/fuellabs/sway.git';
 
 export const buildFromGitBranch = (branchName) => {
-  rmSync('sway-repo', { recursive: true, force: true });
-  rmSync('forc-binaries', { recursive: true, force: true });
-  execSync(`git clone --branch ${branchName} ${swayRepoUrl} sway-repo`);
-  execSync(`cd sway-repo && cargo build`);
-  mkdirSync('forc-binaries');
-  cpSync('sway-repo/target/debug/forc', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-deploy', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-doc', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-fmt', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-lsp', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-run', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-submit', 'forc-binaries');
-  cpSync('sway-repo/target/debug/forc-tx', 'forc-binaries');
-  rmSync('sway-repo', { recursive: true, force: true });
+  const swayRepoDir = join(__dirname, '..', 'sway-repo');
+  const swayRepoDebugDir = join(swayRepoDir, 'target', 'debug');
+  const stdioOpts = { stdio: 'inherit' };
+
+  if (existsSync(swayRepoDir)) {
+    execSync(`cd ${swayRepoDir} && git fetch origin && git checkout ${branchName}`, stdioOpts);
+    execSync(`cd ${swayRepoDir} && cargo build`, stdioOpts);
+  } else {
+    execSync(`git clone --branch ${branchName} ${swayRepoUrl} ${swayRepoDir}`, stdioOpts);
+    execSync(`cd ${swayRepoDir} && cargo build`, stdioOpts);
+  }
+
+  const [from, to] = [swayRepoDebugDir, forcBinDirPath];
+
+  rmSync(to, { recursive: true, force: true });
+  mkdirSync(to, { recursive: true });
+
+  cpSync(join(from, 'forc'), join(to, 'forc'));
+  cpSync(join(from, 'forc-deploy'), join(to, 'forc-deploy'));
+  cpSync(join(from, 'forc-doc'), join(to, 'forc-doc'));
+  cpSync(join(from, 'forc-fmt'), join(to, 'forc-fmt'));
+  cpSync(join(from, 'forc-lsp'), join(to, 'forc-lsp'));
+  cpSync(join(from, 'forc-run'), join(to, 'forc-run'));
+  cpSync(join(from, 'forc-submit'), join(to, 'forc-submit'));
+  cpSync(join(from, 'forc-tx'), join(to, 'forc-tx'));
 };

packages/fuel-core/lib/install.js

@@ -21,13 +21,6 @@ import {
   const pkgPlatform = getPkgPlatform();
   const fuelCoreVersion = await getCurrentVersion();
 
-  // If a git branch is specified in the VERSION file, build from that branch
-  if (isGitBranch(fuelCoreVersion)) {
-    const branchName = fuelCoreVersion.split(':')[1];
-    buildFromGitBranch(branchName);
-    return;
-  }
-
   const fileName = `fuel-core-${fuelCoreVersion}-${pkgPlatform}`;
   const pkgName = `${fileName}.tar.gz`;
   const pkgUrl = `https://github.com/FuelLabs/fuel-core/releases/download/v${fuelCoreVersion}/${pkgName}`;
@@ -44,25 +37,33 @@ import {
     const binVersion = binRawVersion.match(/([.0-9]+)/)?.[0];
 
     versionMatches = binVersion === fuelCoreVersion;
-    info({ expected: fuelCoreVersion, received: binVersion });
+    info({
+      expected: fuelCoreVersion,
+      received: binVersion,
+      isGitBranch: isGitBranch(fuelCoreVersion),
+    });
   }
 
   if (versionMatches) {
     info(`fuel-core binary already installed, skipping.`);
   } else {
-    // Empty the `fuel-core-binaries` directory if it exists
-    if (existsSync(binDir)) {
-      rmSync(`${binDir}/*`, {
-        recursive: true,
-        force: true,
-      });
-    } else {
-      // Create the `fuel-core-binaries` directory if it doesn't exist
-      mkdirSync(binDir);
+    // If a git branch is specified in the VERSION file, build from that branch
+    if (isGitBranch(fuelCoreVersion)) {
+      const branchName = fuelCoreVersion.split(':')[1];
+      buildFromGitBranch(branchName);
+      return;
     }
 
+    // Empty the `fuel-core-binaries` directory if it exists
+    rmSync(binDir, { recursive: true, force: true });
+
     // Download
     const buf = await fetch(pkgUrl).then((r) => r.buffer());
+
+    if (/not found/i.test(buf.toString())) {
+      throw new Error(`Version '${fuelCoreVersion}' not found\n    at ${pkgUrl}`);
+    }
+
     writeFileSync(pkgPath, buf);
 
     // Extract

packages/fuel-core/lib/shared.js

@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
-import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync } from 'fs';
+import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync, existsSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const __dirname = dirname(fileURLToPath(import.meta.url));
 
-export const binPath = join(__dirname, '../fuel-core-binaries/fuel-core');
+export const fuelCoreBinDirPath = join(__dirname, '..', 'fuel-core-binaries');
+export const binPath = join(fuelCoreBinDirPath, 'fuel-core');
 
 const platforms = {
   darwin: {
@@ -49,11 +50,23 @@ export const isGitBranch = (versionFileContents) => versionFileContents.indexOf(
 const fuelCoreRepoUrl = 'https://github.com/fuellabs/fuel-core.git';
 
 export const buildFromGitBranch = (branchName) => {
-  rmSync('fuel-core-repo', { recursive: true, force: true });
-  rmSync('fuel-core-binaries', { recursive: true, force: true });
-  execSync(`git clone --branch ${branchName} ${fuelCoreRepoUrl} fuel-core-repo`, { silent: true });
-  execSync(`cd fuel-core-repo && cargo build`, { silent: true });
-  mkdirSync('fuel-core-binaries');
-  cpSync('fuel-core-repo/target/debug/fuel-core', 'fuel-core-binaries/fuel-core');
-  rmSync('fuel-core-repo', { recursive: true, force: true });
+  const fuelCoreRepoDir = join(__dirname, '..', 'fuel-core-repo');
+  const fuelCoreRepoDebugDir = join(fuelCoreRepoDir, 'target', 'debug');
+  const stdioOpts = { stdio: 'inherit' };
+
+  if (existsSync(fuelCoreRepoDir)) {
+    execSync(`cd ${fuelCoreRepoDir} && git pull && git checkout ${branchName}`, stdioOpts);
+    execSync(`cd ${fuelCoreRepoDir} && cargo build`, stdioOpts);
+  } else {
+    execSync(`git clone --branch ${branchName} ${fuelCoreRepoUrl} ${fuelCoreRepoDir}`, stdioOpts);
+    execSync(`cd ${fuelCoreRepoDir} && cargo build`, stdioOpts);
+  }
+
+  const [from, to] = [fuelCoreRepoDebugDir, fuelCoreBinDirPath];
+
+  rmSync(to, { recursive: true, force: true });
+  mkdirSync(to, { recursive: true });
+
+  mkdirSync(join(from, 'fuel-core'), join(to, 'fuel-core'));
+  cpSync(join(from, 'fuel-core'), join(to, 'fuel-core'));
 };

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

@@ -45,9 +45,7 @@ impl AdvancedLogging for Contract {
             ammo: 10,
             game_id: 10_11_12u64,
             state: GameState::Playing(1),
-            contract_Id: ContractId::from(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-            ),
+            contract_Id: ContractId::from(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
             difficulty: Difficulty::Medium(true),
         };
 
@@ -95,9 +93,7 @@ impl AdvancedLogging for Contract {
             ammo: 10,
             game_id: 10_11_12u64,
             state: GameState::Playing(1),
-            contract_Id: ContractId::from(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-            ),
+            contract_Id: ContractId::from(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
             difficulty: Difficulty::Medium(true),
         };
         require(a == b, game_ref);

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

@@ -78,7 +78,7 @@ impl TestContract for Contract {
         value + 1
     }
     fn call_external_foo(param: u64, contract_id: b256) -> u64 {
-        let external_contract = abi(TestContract, contract_id().into());
+        let external_contract = abi(TestContract, contract_id);
         let response = external_contract.foo(param);
         response + 1
     }

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

@@ -90,10 +90,6 @@ impl ConfigurableContract for Contract {
     }
 
     fn echo_configurables() -> (u8, u16, u32, u64, bool, b256, Colors, [[u32; 2]; 2], str[4], (u8, bool, str[2]), Struct1) {
-        (
-            U8,
-            U16, U32, U64, BOOL, B256, ENUM, ARRAY, STR_4, TUPLE,
-            STRUCT_1,
-        )
+        (U8, U16, U32, U64, BOOL, B256, ENUM, ARRAY, STR_4, TUPLE, STRUCT_1)
     }
 }

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

@@ -9,7 +9,7 @@ use std::{
         msg_asset_id,
     },
     context::msg_amount,
-    token::{
+    asset::{
         mint_to_address,
         transfer_to_address,
     },

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

@@ -2,10 +2,10 @@ contract;
 
 use std::{
     address::Address,
+    asset::*,
     context::balance_of,
     context::msg_amount,
     contract_id::ContractId,
-    token::*,
 };
 
 use std::constants::ZERO_B256;