@fuel-ts/account 0.100.2 → 0.100.3

package/dist/index.global.js

@@ -17891,7 +17891,7 @@
     return {
       FUEL_CORE: "0.41.9",
       FORC: "0.67.0",
-      FUELS: "0.100.2"
+      FUELS: "0.100.3"
     };
   }
   __name(getBuiltinVersions, "getBuiltinVersions");
@@ -27013,26 +27013,6 @@ spurious results.`);
   gql["default"] = gql;
   var lib_default2 = gql;
 
-  // src/connectors/utils/promises.ts
-  function deferPromise() {
-    const defer = {};
-    defer.promise = new Promise((resolve, reject) => {
-      defer.reject = reject;
-      defer.resolve = resolve;
-    });
-    return defer;
-  }
-  __name(deferPromise, "deferPromise");
-  async function withTimeout(promise, timeout = 1050) {
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(new FuelError(FuelError.CODES.TIMEOUT_EXCEEDED, "Promise timed out"));
-      }, timeout);
-    });
-    return Promise.race([timeoutPromise, promise]);
-  }
-  __name(withTimeout, "withTimeout");
-
   // src/providers/__generated__/operations.ts
   var SubmittedStatusFragmentDoc = lib_default2`
     fragment SubmittedStatusFragment on SubmittedStatus {
@@ -29079,11 +29059,12 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
     });
   }, "assembleRevertError");
   var extractTxError = /* @__PURE__ */ __name((params) => {
-    const { receipts, statusReason, logs } = params;
+    const { receipts, statusReason, logs, groupedLogs } = params;
     const isPanic = receipts.some(({ type: type3 }) => type3 === ReceiptType.Panic);
     const isRevert = receipts.some(({ type: type3 }) => type3 === ReceiptType.Revert);
     const metadata = {
       logs,
+      groupedLogs,
       receipts,
       panic: isPanic,
       revert: isRevert,
@@ -31399,8 +31380,9 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   }
   __name(assembleTransactionSummary, "assembleTransactionSummary");
 
-  // src/providers/transaction-response/getDecodedLogs.ts
-  function getDecodedLogs(receipts, mainAbi, externalAbis = {}) {
+  // src/providers/transaction-response/getAllDecodedLogs.ts
+  function getAllDecodedLogs(opts) {
+    const { receipts, mainAbi, externalAbis = {} } = opts;
     let mainContract = "";
     if (mainAbi.programType === "contract") {
       const firstCallReceipt = receipts.find(
@@ -31408,21 +31390,25 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
       );
       mainContract = firstCallReceipt.to;
     }
-    return receipts.reduce((logs, receipt) => {
-      if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
-        const isLogFromMainAbi = receipt.id === ZeroBytes32 || mainContract === receipt.id;
-        const isDecodable = isLogFromMainAbi || externalAbis[receipt.id];
-        if (isDecodable) {
-          const interfaceToUse = isLogFromMainAbi ? new Interface(mainAbi) : new Interface(externalAbis[receipt.id]);
-          const data = receipt.type === ReceiptType.Log ? new BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
-          const [decodedLog] = interfaceToUse.decodeLog(data, receipt.rb.toString());
-          logs.push(decodedLog);
+    return receipts.reduce(
+      ({ logs, groupedLogs }, receipt) => {
+        if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
+          const isLogFromMainAbi = receipt.id === ZeroBytes32 || mainContract === receipt.id;
+          const isDecodable = isLogFromMainAbi || externalAbis[receipt.id];
+          if (isDecodable) {
+            const interfaceToUse = isLogFromMainAbi ? new Interface(mainAbi) : new Interface(externalAbis[receipt.id]);
+            const data = receipt.type === ReceiptType.Log ? new BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
+            const [decodedLog] = interfaceToUse.decodeLog(data, receipt.rb.toString());
+            logs.push(decodedLog);
+            groupedLogs[receipt.id] = [...groupedLogs[receipt.id] || [], decodedLog];
+          }
         }
-      }
-      return logs;
-    }, []);
+        return { logs, groupedLogs };
+      },
+      { logs: [], groupedLogs: {} }
+    );
   }
-  __name(getDecodedLogs, "getDecodedLogs");
+  __name(getAllDecodedLogs, "getAllDecodedLogs");
 
   // src/providers/transaction-response/transaction-response.ts
   function mapGqlOutputsToTxOutputs(outputs) {
@@ -31654,14 +31640,15 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
       const transactionResult = {
         ...transactionSummary
       };
-      let logs = [];
+      let { logs, groupedLogs } = { logs: [], groupedLogs: {} };
       if (this.abis) {
-        logs = getDecodedLogs(
-          transactionSummary.receipts,
-          this.abis.main,
-          this.abis.otherContractsAbis
-        );
+        ({ logs, groupedLogs } = getAllDecodedLogs({
+          receipts: transactionSummary.receipts,
+          mainAbi: this.abis.main,
+          externalAbis: this.abis.otherContractsAbis
+        }));
         transactionResult.logs = logs;
+        transactionResult.groupedLogs = groupedLogs;
       }
       const { receipts } = transactionResult;
       const status = this.status ?? this.gqlTransaction?.status;
@@ -31670,7 +31657,8 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
         throw extractTxError({
           receipts,
           statusReason: reason,
-          logs
+          logs,
+          groupedLogs
         });
       }
       return transactionResult;
@@ -31698,6 +31686,31 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
     }
   };
 
+  // src/providers/transaction-response/getDecodedLogs.ts
+  function getDecodedLogs(receipts, mainAbi, externalAbis = {}) {
+    let mainContract = "";
+    if (mainAbi.programType === "contract") {
+      const firstCallReceipt = receipts.find(
+        (r) => r.type === ReceiptType.Call && r.id === ZeroBytes32
+      );
+      mainContract = firstCallReceipt.to;
+    }
+    return receipts.reduce((logs, receipt) => {
+      if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
+        const isLogFromMainAbi = receipt.id === ZeroBytes32 || mainContract === receipt.id;
+        const isDecodable = isLogFromMainAbi || externalAbis[receipt.id];
+        if (isDecodable) {
+          const interfaceToUse = isLogFromMainAbi ? new Interface(mainAbi) : new Interface(externalAbis[receipt.id]);
+          const data = receipt.type === ReceiptType.Log ? new BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
+          const [decodedLog] = interfaceToUse.decodeLog(data, receipt.rb.toString());
+          logs.push(decodedLog);
+        }
+      }
+      return logs;
+    }, []);
+  }
+  __name(getDecodedLogs, "getDecodedLogs");
+
   // src/providers/utils/auto-retry-fetch.ts
   function getWaitDelay(options, retryAttemptNum) {
     const duration = options.baseDelay ?? 150;
@@ -31969,39 +31982,52 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
      * @returns A promise that resolves to the Chain and NodeInfo.
      */
     async fetchChainAndNodeInfo(ignoreCache = false) {
-      let nodeInfo;
-      let chain;
-      try {
-        nodeInfo = _Provider.nodeInfoCache[this.urlWithoutAuth];
-        chain = _Provider.chainInfoCache[this.urlWithoutAuth];
-        const noCache = !nodeInfo || !chain;
-        if (ignoreCache || noCache) {
-          throw new Error(`Jumps to the catch block and re-fetch`);
-        }
-      } catch (_err) {
-        const inflightRequest = _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth];
-        if (inflightRequest) {
-          const now2 = await inflightRequest;
-          this.consensusParametersTimestamp = now2;
-          return this.fetchChainAndNodeInfo();
-        }
-        const { promise, resolve } = deferPromise();
-        _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth] = promise;
-        const data = await this.operations.getChainAndNodeInfo();
-        nodeInfo = deserializeNodeInfo(data.nodeInfo);
-        chain = deserializeChain(data.chain);
-        _Provider.setIncompatibleNodeVersionMessage(nodeInfo);
-        _Provider.chainInfoCache[this.urlWithoutAuth] = chain;
-        _Provider.nodeInfoCache[this.urlWithoutAuth] = nodeInfo;
-        const now = Date.now();
-        this.consensusParametersTimestamp = now;
-        resolve(now);
-        delete _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth];
+      const nodeInfo = _Provider.nodeInfoCache[this.urlWithoutAuth];
+      const chain = _Provider.chainInfoCache[this.urlWithoutAuth];
+      const hasCache = nodeInfo && chain;
+      if (hasCache && !ignoreCache) {
+        return { nodeInfo, chain };
+      }
+      const inflightRequest = _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth];
+      if (inflightRequest) {
+        return inflightRequest.then((data) => {
+          this.consensusParametersTimestamp = data.consensusParametersTimestamp;
+          return {
+            nodeInfo: _Provider.nodeInfoCache[this.urlWithoutAuth],
+            chain: _Provider.chainInfoCache[this.urlWithoutAuth]
+          };
+        });
       }
-      return {
-        chain,
-        nodeInfo
-      };
+      const getChainAndNodeInfoFromNetwork = this.operations.getChainAndNodeInfo().then((data) => ({
+        chain: deserializeChain(data.chain),
+        nodeInfo: deserializeNodeInfo(data.nodeInfo),
+        consensusParametersTimestamp: Date.now()
+      })).then((data) => {
+        _Provider.setIncompatibleNodeVersionMessage(data.nodeInfo);
+        _Provider.chainInfoCache[this.urlWithoutAuth] = data.chain;
+        _Provider.nodeInfoCache[this.urlWithoutAuth] = data.nodeInfo;
+        this.consensusParametersTimestamp = data.consensusParametersTimestamp;
+        return data;
+      }).catch((err) => {
+        const error2 = new FuelError(
+          FuelError.CODES.CONNECTION_REFUSED,
+          "Unable to fetch chain and node info from the network",
+          { url: this.urlWithoutAuth },
+          err
+        );
+        error2.cause = { code: "ECONNREFUSED" };
+        throw error2;
+      }).finally(() => {
+        delete _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth];
+      });
+      _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth] = getChainAndNodeInfoFromNetwork;
+      return _Provider.inflightFetchChainAndNodeInfoRequests[this.urlWithoutAuth].then((data) => {
+        this.consensusParametersTimestamp = data.consensusParametersTimestamp;
+        return {
+          nodeInfo: _Provider.nodeInfoCache[this.urlWithoutAuth],
+          chain: _Provider.chainInfoCache[this.urlWithoutAuth]
+        };
+      });
     }
     /**
      * @hidden
@@ -33285,15 +33311,17 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
     extractDryRunError(transactionRequest, receipts, dryRunStatus) {
       const status = dryRunStatus;
       let logs = [];
+      let groupedLogs = {};
       if (transactionRequest.abis) {
-        logs = getDecodedLogs(
+        ({ logs, groupedLogs } = getAllDecodedLogs({
           receipts,
-          transactionRequest.abis.main,
-          transactionRequest.abis.otherContractsAbis
-        );
+          mainAbi: transactionRequest.abis.main,
+          externalAbis: transactionRequest.abis.otherContractsAbis
+        }));
       }
       return extractTxError({
         logs,
+        groupedLogs,
         receipts,
         statusReason: status.reason
       });
@@ -40651,6 +40679,26 @@ ${PANIC_DOC_URL}#variant.${statusReason}`;
   }
   __name(dispatchFuelConnectorEvent, "dispatchFuelConnectorEvent");
 
+  // src/connectors/utils/promises.ts
+  function deferPromise() {
+    const defer = {};
+    defer.promise = new Promise((resolve, reject) => {
+      defer.reject = reject;
+      defer.resolve = resolve;
+    });
+    return defer;
+  }
+  __name(deferPromise, "deferPromise");
+  async function withTimeout(promise, timeout = 1050) {
+    const timeoutPromise = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        reject(new FuelError(FuelError.CODES.TIMEOUT_EXCEEDED, "Promise timed out"));
+      }, timeout);
+    });
+    return Promise.race([timeoutPromise, promise]);
+  }
+  __name(withTimeout, "withTimeout");
+
   // src/connectors/fuel.ts
   var HAS_CONNECTOR_TIMEOUT = 2e3;
   var PING_CACHE_TIME = 5e3;