fix: provider cache

.changeset/mighty-impalas-hear.md

@@ -0,0 +1,5 @@
+---
+"@fuel-ts/account": patch
+---
+
+fix: provider cache

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

@@ -79,6 +79,10 @@ const createBasicAuth = (launchNodeUrl: string) => {
  * @group node
  */
 describe('Provider', () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   it('should ensure supports basic auth', async () => {
     using launched = await setupTestProviderAndWallets();
     const {
@@ -143,11 +147,11 @@ describe('Provider', () => {
 
   it('should ensure that custom requestMiddleware is not overwritten by basic auth', async () => {
     using launched = await setupTestProviderAndWallets();
-    const {
-      provider: { url },
-    } = launched;
+    const { provider } = launched;
+
+    Provider.clearChainAndNodeCaches();
 
-    const { urlWithAuth } = createBasicAuth(url);
+    const { urlWithAuth } = createBasicAuth(provider.url);
 
     const requestMiddleware = vi.fn().mockImplementation((options) => options);
 
@@ -1046,47 +1050,43 @@ describe('Provider', () => {
     expect(provider.getNode()).toBeDefined();
   });
 
-  it('should cache chain and node info', async () => {
-    Provider.clearChainAndNodeCaches();
-
+  it('should ensure getChain and getNode uses the cache and does not fetch new data', async () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
 
-    expect(provider.getChain()).toBeDefined();
-    expect(provider.getNode()).toBeDefined();
-  });
-
-  it('should ensure getChain and getNode uses the cache and does not fetch new data', async () => {
-    Provider.clearChainAndNodeCaches();
+    const { error } = await safeExec(() => {
+      provider.getChain();
+      provider.getNode();
+    });
 
-    const spyFetchChainAndNodeInfo = vi.spyOn(Provider.prototype, 'fetchChainAndNodeInfo');
-    const spyFetchChain = vi.spyOn(Provider.prototype, 'fetchChain');
-    const spyFetchNode = vi.spyOn(Provider.prototype, 'fetchNode');
+    expect(error).toBeUndefined();
+  });
 
+  it('should ensure creating new instances should not re-fetch chain and node info', async () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
 
-    expect(spyFetchChainAndNodeInfo).toHaveBeenCalledTimes(1);
+    const spyFetchChainAndNodeInfo = vi.spyOn(Provider.prototype, 'fetchChainAndNodeInfo');
+    const spyGetChainAndNodeInfo = vi.spyOn(provider.operations, 'getChainAndNodeInfo');
 
-    provider.getChain();
-    provider.getNode();
+    const INSTANCES_NUM = 5;
 
-    expect(spyFetchChainAndNodeInfo).toHaveBeenCalledTimes(1);
-    expect(spyFetchChain).toHaveBeenCalledTimes(0);
-    expect(spyFetchNode).toHaveBeenCalledTimes(0);
-  });
+    const promises = Array.from({ length: INSTANCES_NUM }, async () =>
+      Provider.create(provider.url)
+    );
+    await Promise.all(promises);
 
-  it('should ensure fetchChainAndNodeInfo always fetch new data', async () => {
-    Provider.clearChainAndNodeCaches();
+    expect(spyFetchChainAndNodeInfo).toHaveBeenCalledTimes(INSTANCES_NUM);
 
-    const spyFetchChainAndNodeInfo = vi.spyOn(Provider.prototype, 'fetchChainAndNodeInfo');
+    expect(spyGetChainAndNodeInfo).not.toHaveBeenCalled();
+  });
 
+  it('should ensure fetchChainAndNodeInfo uses cached data', async () => {
     using launched = await setupTestProviderAndWallets();
-
-    expect(spyFetchChainAndNodeInfo).toHaveBeenCalledTimes(1);
-
     const { provider } = launched;
 
+    Provider.clearChainAndNodeCaches();
+
     const spyOperation = vi.spyOn(provider.operations, 'getChainAndNodeInfo');
 
     await provider.fetchChainAndNodeInfo();
@@ -1691,6 +1691,7 @@ Supported fuel-core version: ${mock.supportedVersion}.`
   test('requestMiddleware modifies the request before being sent to the node [sync]', async () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
+    Provider.clearChainAndNodeCaches();
 
     const fetchSpy = vi.spyOn(global, 'fetch');
     await Provider.create(provider.url, {
@@ -1711,6 +1712,7 @@ Supported fuel-core version: ${mock.supportedVersion}.`
   test('requestMiddleware modifies the request before being sent to the node [async]', async () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
+    Provider.clearChainAndNodeCaches();
 
     const fetchSpy = vi.spyOn(global, 'fetch');
     await Provider.create(provider.url, {
@@ -1762,6 +1764,7 @@ Supported fuel-core version: ${mock.supportedVersion}.`
   test('custom fetch works with requestMiddleware', async () => {
     using launched = await setupTestProviderAndWallets();
     const { provider } = launched;
+    Provider.clearChainAndNodeCaches();
 
     let requestHeaders: HeadersInit | undefined;
     await Provider.create(provider.url, {

packages/account/src/providers/provider.ts

@@ -604,26 +604,32 @@ export default class Provider {
    * @returns A promise that resolves to the Chain and NodeInfo.
    */
   async fetchChainAndNodeInfo() {
-    const { nodeInfo, chain } = await this.operations.getChainAndNodeInfo();
+    let nodeInfo: NodeInfo;
+    let chain: ChainInfo;
 
-    const processedNodeInfo: NodeInfo = {
-      maxDepth: bn(nodeInfo.maxDepth),
-      maxTx: bn(nodeInfo.maxTx),
-      nodeVersion: nodeInfo.nodeVersion,
-      utxoValidation: nodeInfo.utxoValidation,
-      vmBacktrace: nodeInfo.vmBacktrace,
-    };
-
-    Provider.ensureClientVersionIsSupported(processedNodeInfo);
-
-    const processedChain = processGqlChain(chain);
+    try {
+      nodeInfo = this.getNode();
+      chain = this.getChain();
+    } catch (error) {
+      const data = await this.operations.getChainAndNodeInfo();
+
+      nodeInfo = {
+        maxDepth: bn(data.nodeInfo.maxDepth),
+        maxTx: bn(data.nodeInfo.maxTx),
+        nodeVersion: data.nodeInfo.nodeVersion,
+        utxoValidation: data.nodeInfo.utxoValidation,
+        vmBacktrace: data.nodeInfo.vmBacktrace,
+      };
 
-    Provider.chainInfoCache[this.urlWithoutAuth] = processedChain;
-    Provider.nodeInfoCache[this.urlWithoutAuth] = processedNodeInfo;
+      Provider.ensureClientVersionIsSupported(nodeInfo);
+      chain = processGqlChain(data.chain);
+      Provider.chainInfoCache[this.urlWithoutAuth] = chain;
+      Provider.nodeInfoCache[this.urlWithoutAuth] = nodeInfo;
+    }
 
     return {
-      chain: processedChain,
-      nodeInfo: processedNodeInfo,
+      chain,
+      nodeInfo,
     };
   }
 

packages/fuel-gauge/src/transaction-upgrade.test.ts

@@ -7,6 +7,8 @@ import {
   UpgradeTransactionRequest,
   Wallet,
   UploadTransactionRequest,
+  sleep,
+  Provider,
 } from 'fuels';
 import { launchTestNode } from 'fuels/test-utils';
 
@@ -40,12 +42,12 @@ const setupTestNode = async () => {
 
   const { provider, wallets, cleanup } = await launchTestNode({
     nodeOptions: {
-      args: ['--poa-instant', 'false', '--poa-interval-period', '1ms'],
+      args: ['--poa-instant', 'false', '--poa-interval-period', '1s'],
       loggingEnabled: false,
       snapshotConfig,
     },
   });
-  privileged.provider = provider;
+  privileged.provider = await Provider.create(provider.url);
 
   return { provider, privileged, wallets, cleanup, [Symbol.dispose]: cleanup };
 };
@@ -99,9 +101,11 @@ describe('Transaction upgrade consensus', () => {
     using launched = await setupTestNode();
     const { privileged, provider } = launched;
 
+    const mainProvider = await Provider.create(provider.url);
+
     const {
       chain: { consensusParameters: consensusBeforeUpgrade },
-    } = await provider.fetchChainAndNodeInfo();
+    } = await mainProvider.fetchChainAndNodeInfo();
 
     // Update the gas costs to free
     const { isStatusSuccess, isTypeUpgrade } = await upgradeConsensusParameters(
@@ -111,11 +115,14 @@ describe('Transaction upgrade consensus', () => {
     expect(isStatusSuccess).toBeTruthy();
     expect(isTypeUpgrade).toBeTruthy();
 
+    // Waiting for the next block to ensure upgraded value are reflected
+    await sleep(1000);
+    Provider.clearChainAndNodeCaches();
+
     // Fetch the upgraded gas costs, they should be different from before
     const {
       chain: { consensusParameters: consensusAfterUpgrade },
-    } = await provider.fetchChainAndNodeInfo();
-
+    } = await mainProvider.fetchChainAndNodeInfo();
     expect(consensusBeforeUpgrade.gasCosts).not.toEqual(consensusAfterUpgrade.gasCosts);
   });
 });