Merge branch 'master' into starc007/feat/integrate-vitest-matchers-gl…

…obally

.changeset/mean-sheep-occur.md

@@ -0,0 +1,5 @@
+---
+"@fuel-ts/account": patch
+---
+
+chore: avoid re-estimate `gasPrice` at `estimateTxDependencies`

.changeset/moody-terms-shake.md

@@ -0,0 +1,4 @@
+---
+---
+
+chore: minimizing logs in test output

.changeset/old-maps-fold.md

@@ -0,0 +1,2 @@
+---
+---

apps/docs/README.md

@@ -8,6 +8,7 @@
 - [Table of contents](#table-of-contents)
   - [Building](#building)
   - [Testing](#testing)
+  - [Referencing snippets](#referencing-snippets)
 
 ## Building
 
@@ -42,3 +43,17 @@ If no environment is specified, it will run in the browser and node environments
 ```sh
 pnpm test
 ```
+
+## Referencing snippets
+
+To reference a snippet outside of the current directory, you need to use the following syntax (`<<< @/`):
+
+```md
+`<<< @/../../path/to/snippet.ts#snippet-name{language:line-numbers}
+```
+
+To reference a snippet in the current directory, you can use the following syntax (`<<< @./`):
+
+```md
+`<<< @./snippets/transaction-request/fetch-resources.ts#transaction-request-5{ts:line-numbers}
+```

apps/docs/src/guide/transactions/transaction-request.md

@@ -60,7 +60,7 @@ If needed, you can manually include specific coins or messages in the transactio
 
 Imagine that you have a Sway script that manually calls a contract:
 
-<<< @../../../../sway/script-call-contract/src/main.sw#transaction-request-7{rs:line-numbers}
+<<< @/../../docs/sway/script-call-contract/src/main.sw#transaction-request-7{rs:line-numbers}
 
 In those cases, you will need to add both an `InputContract` and `OutputContract` to the transaction request:
 

packages/abi-typegen/src/cli.test.ts

@@ -164,7 +164,7 @@ describe('cli.ts', () => {
   test('should handle errors when running cli action', () => {
     const runTypegenError = new Error('Pretty message');
 
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
     const { exit } = mockDeps({ runTypegenError });
 
     const inputs = ['*-no-abis-here.json'];

packages/abi-typegen/src/runTypegen.test.ts

@@ -153,7 +153,7 @@ describe('runTypegen.js', () => {
   });
 
   test('should log messages to stdout', async () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     // setup temp sway project
     const project = getTypegenForcProject(AbiTypegenProjectsEnum.SCRIPT);
@@ -272,7 +272,7 @@ describe('runTypegen.js', () => {
     cpSync(fromBin, toBin);
 
     // mocking
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     // executes program
     const fn = () =>

packages/account/src/account.ts

@@ -323,6 +323,7 @@ export class Account extends AbstractAccount {
 
     const { maxFee } = await this.provider.estimateTxGasAndFee({
       transactionRequest: requestToReestimate,
+      gasPrice,
     });
 
     request.maxFee = maxFee;

packages/account/src/providers/provider.test.ts

@@ -250,7 +250,7 @@ describe('Provider', () => {
     });
 
     // Spy on console.warn
-    const consoleWarnSpy = vi.spyOn(console, 'warn');
+    const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
     // Verify that only one transaction was returned (the known type)
     const transaction = await mockProvider.getTransaction('0x1234567890abcdef');
@@ -298,7 +298,7 @@ describe('Provider', () => {
     });
 
     // Spy on console.warn
-    const consoleWarnSpy = vi.spyOn(console, 'warn');
+    const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
     // Verify that only one transaction was returned (the known type)
     const { transactions } = await mockProvider.getTransactions();
@@ -448,7 +448,7 @@ describe('Provider', () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
 
-    const { cleanup, url } = await launchNode({ port: '0' });
+    const { cleanup, url } = await launchNode({ port: '0', loggingEnabled: false });
 
     const spyFetchChainAndNodeInfo = vi.spyOn(Provider.prototype, 'fetchChainAndNodeInfo');
 
@@ -1181,7 +1181,7 @@ describe('Provider', () => {
     const spy = vi.spyOn(fuelTsVersionsMod, 'checkFuelCoreVersionCompatibility');
     spy.mockImplementationOnce(() => mock);
 
-    const consoleWarnSpy = vi.spyOn(console, 'warn');
+    const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
@@ -1216,7 +1216,7 @@ Supported fuel-core version: ${mock.supportedVersion}.`
     const spy = vi.spyOn(fuelTsVersionsMod, 'checkFuelCoreVersionCompatibility');
     spy.mockImplementationOnce(() => mock);
 
-    const consoleWarnSpy = vi.spyOn(console, 'warn');
+    const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;

packages/account/src/providers/provider.ts

@@ -1011,6 +1011,7 @@ Supported fuel-core version: ${supportedVersion}.`
       } = await this.operations.dryRun({
         encodedTransactions: [hexlify(transactionRequest.toTransactionBytes())],
         utxoValidation: false,
+        gasPrice: '0',
       });
 
       receipts = rawReceipts.map(processGqlReceipt);
@@ -1032,6 +1033,7 @@ Supported fuel-core version: ${supportedVersion}.`
 
         const { maxFee } = await this.estimateTxGasAndFee({
           transactionRequest,
+          gasPrice: bn(0),
         });
 
         // eslint-disable-next-line no-param-reassign
@@ -1204,7 +1206,7 @@ Supported fuel-core version: ${supportedVersion}.`
     const { gasPriceFactor, maxGasPerTx } = this.getGasConfig();
 
     const minGas = transactionRequest.calculateMinGas(chainInfo);
-    if (!gasPrice) {
+    if (!isDefined(gasPrice)) {
       gasPrice = await this.estimateGasPrice(10);
     }
 

packages/account/src/test-utils/launchNode.test.ts

@@ -117,7 +117,7 @@ describe('launchNode', () => {
   });
 
   test('should throw on error and log error message', { timeout: 15000 }, async () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     const invalidCoin = {
       asset_id: 'whatever',
@@ -132,7 +132,7 @@ describe('launchNode', () => {
     const error = await expectToThrowFuelError(
       async () =>
         launchNode({
-          loggingEnabled: false,
+          loggingEnabled: true,
           snapshotConfig: {
             ...defaultSnapshotConfigs,
             stateConfig: {
@@ -238,7 +238,7 @@ describe('launchNode', () => {
 
   test('calling cleanup on externally killed node does not throw', async () => {
     const mkdirSyncSpy = vi.spyOn(fsMod, 'mkdirSync');
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     const { pid, cleanup } = await launchNode({ loggingEnabled: false });
     expect(mkdirSyncSpy).toHaveBeenCalledTimes(1);

packages/account/src/test-utils/launchNode.ts

@@ -278,6 +278,9 @@ export const launchNode = async ({
       }
     });
 
+    // Increase the max listeners to avoid a warning
+    process.setMaxListeners(100);
+
     // Process exit.
     process.on('exit', cleanup);
 

packages/create-fuels/src/utils/logger.test.ts

@@ -28,23 +28,23 @@ describe('logger', () => {
   });
 
   test('should log', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
     configureLogging({ isLoggingEnabled: true, isDebugEnabled: false });
     log('message');
     expect(logSpy).toHaveBeenCalledTimes(1);
     expect(logSpy).toHaveBeenCalledWith('message');
   });
 
   test('should not log', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     configureLogging({ isLoggingEnabled: false, isDebugEnabled: false });
     log('any message');
     expect(logSpy).not.toHaveBeenCalled();
   });
 
   test('should debug', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     configureLogging({ isLoggingEnabled: true, isDebugEnabled: true });
     debug('message');
@@ -53,22 +53,22 @@ describe('logger', () => {
   });
 
   test('should not log', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     configureLogging({ isLoggingEnabled: false, isDebugEnabled: false });
     loggerMod.debug('any debug message');
     expect(logSpy).toHaveBeenCalledTimes(0);
   });
 
   test('should warn', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
     warn('message1', 'message2');
     expect(logSpy).toHaveBeenCalledTimes(1);
     expect(logSpy).toHaveBeenCalledWith(chalk.yellow('message1 message2'));
   });
 
   test('should error', () => {
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
     error('message1', 'message2');
     expect(logSpy).toHaveBeenCalledTimes(1);
     expect(logSpy).toHaveBeenCalledWith(chalk.red('message1 message2'));

packages/fuel-gauge/src/fee.test.ts

@@ -3,6 +3,7 @@ import {
   InputMessageCoder,
   ScriptTransactionRequest,
   Wallet,
+  getMintedAssetId,
   getRandomB256,
   hexlify,
   isCoin,
@@ -40,6 +41,8 @@ describe('Fee', () => {
     }
   };
 
+  const SUB_ID = '0x4a778acfad1abc155a009dc976d2cf0db6197d3d360194d74b1fb92b96986b00';
+
   it('should ensure fee is properly calculated when minting and burning coins', async () => {
     using launched = await launchTestNode({
       contractsConfigs: [
@@ -431,5 +434,81 @@ describe('Fee', () => {
 
       expect(cost.dryRunStatus?.type).toBe('DryRunSuccessStatus');
     });
+
+    it('should not run estimateGasPrice in between estimateTxDependencies dry run attempts', async () => {
+      using launched = await launchTestNode({
+        contractsConfigs: [
+          {
+            factory: MultiTokenContractFactory,
+          },
+        ],
+      });
+
+      const {
+        contracts: [contract],
+        wallets: [wallet],
+        provider,
+      } = launched;
+
+      const assetId = getMintedAssetId(contract.id.toB256(), SUB_ID);
+
+      // Minting coins first
+      const mintCall = await contract.functions.mint_coins(SUB_ID, 10_000).call();
+      await mintCall.waitForResult();
+
+      const estimateGasPrice = vi.spyOn(provider, 'estimateGasPrice');
+      const dryRun = vi.spyOn(provider.operations, 'dryRun');
+
+      /**
+       * Sway transfer without adding `OutputVariable` which will result in
+       * 2 dry runs at the `Provider.estimateTxDependencies` method:
+       * - 1st dry run will fail due to missing `OutputVariable`
+       * - 2nd dry run will succeed
+       */
+      const transferCall = await contract.functions
+        .transfer_to_address({ bits: wallet.address.toB256() }, { bits: assetId }, 10_000)
+        .call();
+
+      await transferCall.waitForResult();
+
+      expect(estimateGasPrice).toHaveBeenCalledOnce();
+      expect(dryRun).toHaveBeenCalledTimes(2);
+    });
+
+    it('should ensure estimateGasPrice runs only once when funding a transaction.', async () => {
+      const amountPerCoin = 100;
+
+      using launched = await launchTestNode({
+        walletsConfig: {
+          amountPerCoin, // Funding with multiple UTXOs so the fee will change after funding the TX.
+          coinsPerAsset: 250,
+        },
+        contractsConfigs: [
+          {
+            factory: MultiTokenContractFactory,
+          },
+        ],
+      });
+
+      const {
+        wallets: [wallet],
+        provider,
+      } = launched;
+
+      const fund = vi.spyOn(wallet, 'fund');
+      const estimateGasPrice = vi.spyOn(provider, 'estimateGasPrice');
+
+      const tx = await wallet.transfer(
+        wallet.address,
+        amountPerCoin * 20,
+        provider.getBaseAssetId()
+      );
+      const { isStatusSuccess } = await tx.waitForResult();
+
+      expect(fund).toHaveBeenCalledOnce();
+      expect(estimateGasPrice).toHaveBeenCalledOnce();
+
+      expect(isStatusSuccess).toBeTruthy();
+    });
   });
 });

packages/fuels/src/cli/commands/build/buildSwayProgram.test.ts

@@ -56,7 +56,7 @@ describe('buildSwayPrograms', () => {
 
   test('logs to console when logging is enabled', async () => {
     const { spawn } = mockAll();
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
 
     configureLogging({ isLoggingEnabled: true, isDebugEnabled: false });
 
@@ -70,7 +70,7 @@ describe('buildSwayPrograms', () => {
 
   test('logs debug to console when debug is enabled', async () => {
     const { spawn } = mockAll();
-    const logSpy = vi.spyOn(console, 'log');
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
     configureLogging({ isLoggingEnabled: true, isDebugEnabled: true });
 
     await buildSwayProgram(fuelsConfig, '/any/workspace/path');