@sundaeswap/wallet-lite 0.0.102 → 0.0.104

package/dist/cjs/classes/WalletObserver.class.js

@@ -81,6 +81,8 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
     _defineProperty(_this, "_options", void 0);
     // Caching
     _defineProperty(_this, "_cachedMetadata", new Map());
+    // AbortController for cancelling in-flight metadata fetches when metadataResolver changes
+    _defineProperty(_this, "_metadataAbortController", null);
     /**
      * Synchronizes the wallet. This method handles syncing the class
      * against the currently selected active wallet. If the wallet has
@@ -286,11 +288,26 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
     });
     /**
      * Updates the wallet observer options. Merges the new options with the existing ones.
+     * If metadataResolver changes, cancels any in-flight metadata fetch, clears the cache,
+     * and triggers a new sync if there is an active connection.
      *
      * @param {Partial<TWalletObserverOptions<AssetMetadata>>} options - The new options to merge.
      */
     _defineProperty(_this, "updateOptions", function (options) {
+      var metadataResolverChanged = options.metadataResolver && options.metadataResolver !== _this._options.metadataResolver;
       _this._options = (0, _merge["default"])(_this._options, options);
+
+      // If metadataResolver changed, abort in-flight fetch, clear cache, and re-sync
+      if (metadataResolverChanged) {
+        var _this$_metadataAbortC;
+        (_this$_metadataAbortC = _this._metadataAbortController) === null || _this$_metadataAbortC === void 0 || _this$_metadataAbortC.abort();
+        _this._cachedMetadata = new Map();
+
+        // Trigger a new sync if there's an active connection
+        if (_this.hasActiveConnection() && !_this._performingSync) {
+          _this.sync();
+        }
+      }
     });
     /**
      * Attempts to connect a wallet using the global window
@@ -427,6 +444,35 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
     _defineProperty(_this, "getCachedAssetMetadata", function () {
       return _this._cachedMetadata;
     });
+    /**
+     * Clears the cached metadata and triggers a fresh sync to re-fetch metadata.
+     * Useful when the client wants to manually refresh metadata without changing the resolver.
+     *
+     * @returns {Promise<void>}
+     */
+    _defineProperty(_this, "resyncMetadata", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _this$_metadataAbortC2;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            // Abort any in-flight fetch
+            (_this$_metadataAbortC2 = _this._metadataAbortController) === null || _this$_metadataAbortC2 === void 0 || _this$_metadataAbortC2.abort();
+            // Clear the cache
+            _this._cachedMetadata = new Map();
+
+            // Trigger a new sync if there's an active connection
+            if (!_this.hasActiveConnection()) {
+              _context5.next = 5;
+              break;
+            }
+            _context5.next = 5;
+            return _this.sync();
+          case 5:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    })));
     /**
      * Helper function to restore the class instance to its initial state.
      *
@@ -443,93 +489,93 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      *
      * @returns {Promise<string | Error>} The change address, or an error.
      */
-    _defineProperty(_this, "getChangeAddress", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    _defineProperty(_this, "getChangeAddress", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       var start, _yield$Promise$all3, _yield$Promise$all4, Cardano, typedHex, cbor, data, end;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (_this.api) {
-              _context5.next = 2;
+              _context6.next = 2;
               break;
             }
             throw new Error("Attempted to query change address without an API instance.");
           case 2:
             start = performance.now();
-            _context5.next = 5;
+            _context6.next = 5;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 5:
-            _yield$Promise$all3 = _context5.sent;
+            _yield$Promise$all3 = _context6.sent;
             _yield$Promise$all4 = _slicedToArray(_yield$Promise$all3, 2);
             Cardano = _yield$Promise$all4[0].Cardano;
             typedHex = _yield$Promise$all4[1];
-            _context5.prev = 9;
-            _context5.next = 12;
+            _context6.prev = 9;
+            _context6.next = 12;
             return _this.api.getChangeAddress();
           case 12:
-            cbor = _context5.sent;
-            _context5.next = 18;
+            cbor = _context6.sent;
+            _context6.next = 18;
             break;
           case 15:
-            _context5.prev = 15;
-            _context5.t0 = _context5["catch"](9);
-            return _context5.abrupt("return", _context5.t0);
+            _context6.prev = 15;
+            _context6.t0 = _context6["catch"](9);
+            return _context6.abrupt("return", _context6.t0);
           case 18:
             data = Cardano.Address.fromBytes(typedHex(cbor)).toBech32();
             end = performance.now();
             if (_this._options.debug) {
               console.log("getChangeAddress: ".concat(end - start, "ms"));
             }
-            return _context5.abrupt("return", data);
+            return _context6.abrupt("return", data);
           case 22:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[9, 15]]);
+      }, _callee6, null, [[9, 15]]);
     })));
     /**
      * Retrieves the balance of the wallet, including metadata for each asset.
      *
      * @returns {Promise<WalletBalanceMap<AssetMetadata>>} - A promise that resolves to a map of asset amounts keyed by asset IDs.
      */
-    _defineProperty(_this, "getBalanceMap", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    _defineProperty(_this, "getBalanceMap", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       var _data$multiasset$keys, _data$multiasset, _data$multiasset$entr, _data$multiasset2;
       var start, _yield$Promise$all5, _yield$Promise$all6, Serialization, typedHex, cbor, data, multiassetKeys, metadata, balanceMap, multiassetEntries, _iterator, _step, _step$value, id, amount, end;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (_this.api) {
-              _context6.next = 2;
+              _context7.next = 2;
               break;
             }
             throw new Error("Attempted to query balance without an API instance.");
           case 2:
             start = performance.now();
             _this.dispatch(_events.EWalletObserverEvents.GET_BALANCE_MAP_START);
-            _context6.next = 6;
+            _context7.next = 6;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 6:
-            _yield$Promise$all5 = _context6.sent;
+            _yield$Promise$all5 = _context7.sent;
             _yield$Promise$all6 = _slicedToArray(_yield$Promise$all5, 2);
             Serialization = _yield$Promise$all6[0].Serialization;
             typedHex = _yield$Promise$all6[1];
-            _context6.prev = 10;
-            _context6.next = 13;
+            _context7.prev = 10;
+            _context7.next = 13;
             return _this.api.getBalance();
           case 13:
-            cbor = _context6.sent;
-            _context6.next = 19;
+            cbor = _context7.sent;
+            _context7.next = 19;
             break;
           case 16:
-            _context6.prev = 16;
-            _context6.t0 = _context6["catch"](10);
-            return _context6.abrupt("return", _context6.t0);
+            _context7.prev = 16;
+            _context7.t0 = _context7["catch"](10);
+            return _context7.abrupt("return", _context7.t0);
           case 19:
             data = Serialization.Value.fromCbor(typedHex(cbor));
             multiassetKeys = (_data$multiasset$keys = (_data$multiasset = data.multiasset()) === null || _data$multiasset === void 0 ? void 0 : _data$multiasset.keys()) !== null && _data$multiasset$keys !== void 0 ? _data$multiasset$keys : [];
-            _context6.next = 23;
+            _context7.next = 23;
             return _this.__metadataResolverWithCache([_constants.ADA_ASSET_ID].concat(_toConsumableArray(multiassetKeys)));
           case 23:
-            metadata = _context6.sent;
+            metadata = _context7.sent;
             balanceMap = new _WalletBalanceMapClass.WalletBalanceMap(_this);
             balanceMap.set(_constants.ADA_ASSET_ID, new _asset.AssetAmount(data.coin(), metadata.get(_constants.ADA_ASSET_ID)));
             multiassetEntries = (_data$multiasset$entr = (_data$multiasset2 = data.multiasset()) === null || _data$multiasset2 === void 0 ? void 0 : _data$multiasset2.entries()) !== null && _data$multiasset$entr !== void 0 ? _data$multiasset$entr : [];
@@ -553,89 +599,89 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             if (_this._options.debug) {
               console.log("getBalanceMap: ".concat(end - start, "ms"));
             }
-            return _context6.abrupt("return", balanceMap);
+            return _context7.abrupt("return", balanceMap);
           case 32:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, null, [[10, 16]]);
+      }, _callee7, null, [[10, 16]]);
     })));
     /**
      * Gets the current network connection.
      *
      * @returns {Promise<number | Error>} The network ID or an Error from the wallet.
      */
-    _defineProperty(_this, "getNetwork", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    _defineProperty(_this, "getNetwork", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var start, val, end;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (_this.api) {
-              _context7.next = 2;
+              _context8.next = 2;
               break;
             }
             throw new Error("Attempted to query network without an API instance.");
           case 2:
             start = performance.now();
-            _context7.prev = 3;
-            _context7.next = 6;
+            _context8.prev = 3;
+            _context8.next = 6;
             return _this.api.getNetworkId();
           case 6:
-            val = _context7.sent;
-            _context7.next = 12;
+            val = _context8.sent;
+            _context8.next = 12;
             break;
           case 9:
-            _context7.prev = 9;
-            _context7.t0 = _context7["catch"](3);
-            return _context7.abrupt("return", _context7.t0);
+            _context8.prev = 9;
+            _context8.t0 = _context8["catch"](3);
+            return _context8.abrupt("return", _context8.t0);
           case 12:
             _this.network = val;
             end = performance.now();
             if (_this._options.debug) {
               console.log("getNetwork: ".concat(end - start, "ms"));
             }
-            return _context7.abrupt("return", val);
+            return _context8.abrupt("return", val);
           case 16:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7, null, [[3, 9]]);
+      }, _callee8, null, [[3, 9]]);
     })));
     /**
      * Gets a list of used addresses, encoded as Bech32.
      *
      * @returns {Promise<string[]>} The list of addresses.
      */
-    _defineProperty(_this, "getUsedAddresses", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    _defineProperty(_this, "getUsedAddresses", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var start, _yield$Promise$all7, _yield$Promise$all8, Cardano, typedHex, cbor, data, end;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             if (_this.api) {
-              _context8.next = 2;
+              _context9.next = 2;
               break;
             }
             throw new Error("Attempted to query used addresses without an API instance.");
           case 2:
             start = performance.now();
-            _context8.next = 5;
+            _context9.next = 5;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 5:
-            _yield$Promise$all7 = _context8.sent;
+            _yield$Promise$all7 = _context9.sent;
             _yield$Promise$all8 = _slicedToArray(_yield$Promise$all7, 2);
             Cardano = _yield$Promise$all8[0].Cardano;
             typedHex = _yield$Promise$all8[1];
-            _context8.prev = 9;
-            _context8.next = 12;
+            _context9.prev = 9;
+            _context9.next = 12;
             return _this.api.getUsedAddresses();
           case 12:
-            cbor = _context8.sent;
-            _context8.next = 18;
+            cbor = _context9.sent;
+            _context9.next = 18;
             break;
           case 15:
-            _context8.prev = 15;
-            _context8.t0 = _context8["catch"](9);
-            return _context8.abrupt("return", _context8.t0);
+            _context9.prev = 15;
+            _context9.t0 = _context9["catch"](9);
+            return _context9.abrupt("return", _context9.t0);
           case 18:
             data = cbor.map(function (val) {
               return Cardano.Address.fromBytes(typedHex(val)).toBech32();
@@ -644,48 +690,48 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             if (_this._options.debug) {
               console.log("getUsedAddresses: ".concat(end - start, "ms"));
             }
-            return _context8.abrupt("return", data);
+            return _context9.abrupt("return", data);
           case 22:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8, null, [[9, 15]]);
+      }, _callee9, null, [[9, 15]]);
     })));
     /**
      * Gets a list of unused addresses, encoded as Bech32.
      *
      * @returns {Promise<string[] | Error>} The list of addresses or an Error returned by the wallet.
      */
-    _defineProperty(_this, "getUnusedAddresses", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+    _defineProperty(_this, "getUnusedAddresses", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
       var start, _yield$Promise$all9, _yield$Promise$all10, Cardano, typedHex, cbor, data, end;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             if (_this.api) {
-              _context9.next = 2;
+              _context10.next = 2;
               break;
             }
             throw new Error("Attempted to query unused addresses without an API instance.");
           case 2:
             start = performance.now();
-            _context9.next = 5;
+            _context10.next = 5;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 5:
-            _yield$Promise$all9 = _context9.sent;
+            _yield$Promise$all9 = _context10.sent;
             _yield$Promise$all10 = _slicedToArray(_yield$Promise$all9, 2);
             Cardano = _yield$Promise$all10[0].Cardano;
             typedHex = _yield$Promise$all10[1];
-            _context9.prev = 9;
-            _context9.next = 12;
+            _context10.prev = 9;
+            _context10.next = 12;
             return _this.api.getUnusedAddresses();
           case 12:
-            cbor = _context9.sent;
-            _context9.next = 18;
+            cbor = _context10.sent;
+            _context10.next = 18;
             break;
           case 15:
-            _context9.prev = 15;
-            _context9.t0 = _context9["catch"](9);
-            return _context9.abrupt("return", _context9.t0);
+            _context10.prev = 15;
+            _context10.t0 = _context10["catch"](9);
+            return _context10.abrupt("return", _context10.t0);
           case 18:
             data = cbor.map(function (val) {
               return Cardano.Address.fromBytes(typedHex(val)).toBech32();
@@ -694,49 +740,49 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             if (_this._options.debug) {
               console.log("getUnusedAddresses: ".concat(end - start, "ms"));
             }
-            return _context9.abrupt("return", data);
+            return _context10.abrupt("return", data);
           case 22:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9, null, [[9, 15]]);
+      }, _callee10, null, [[9, 15]]);
     })));
     /**
      * Gets a list of wallet UTXOs.
      *
      * @returns {Promise<TransactionUnspentOutput[]>} The list of TransactionUnspentOutputs.
      */
-    _defineProperty(_this, "getUtxos", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+    _defineProperty(_this, "getUtxos", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
       var _cbor;
       var start, _yield$Promise$all11, _yield$Promise$all12, Serialization, typedHex, cbor, data, end;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             if (_this.api) {
-              _context10.next = 2;
+              _context11.next = 2;
               break;
             }
             throw new Error("Attempted to query UTXOs without an API instance.");
           case 2:
             start = performance.now();
-            _context10.next = 5;
+            _context11.next = 5;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 5:
-            _yield$Promise$all11 = _context10.sent;
+            _yield$Promise$all11 = _context11.sent;
             _yield$Promise$all12 = _slicedToArray(_yield$Promise$all11, 2);
             Serialization = _yield$Promise$all12[0].Serialization;
             typedHex = _yield$Promise$all12[1];
-            _context10.prev = 9;
-            _context10.next = 12;
+            _context11.prev = 9;
+            _context11.next = 12;
             return _this.api.getUtxos();
           case 12:
-            cbor = _context10.sent;
-            _context10.next = 18;
+            cbor = _context11.sent;
+            _context11.next = 18;
             break;
           case 15:
-            _context10.prev = 15;
-            _context10.t0 = _context10["catch"](9);
-            return _context10.abrupt("return", _context10.t0);
+            _context11.prev = 15;
+            _context11.t0 = _context11["catch"](9);
+            return _context11.abrupt("return", _context11.t0);
           case 18:
             data = (_cbor = cbor) === null || _cbor === void 0 ? void 0 : _cbor.map(function (val) {
               var txOutput = Serialization.TransactionUnspentOutput.fromCbor(typedHex(val));
@@ -750,93 +796,93 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             if (_this._options.debug) {
               console.log("getUtxos: ".concat(end - start, "ms"));
             }
-            return _context10.abrupt("return", data);
+            return _context11.abrupt("return", data);
           case 22:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10, null, [[9, 15]]);
+      }, _callee11, null, [[9, 15]]);
     })));
     /**
      * Gets the fee address set by the wallet, if available.
      *
      * @returns {Promise<string | Error | undefined>} The fee address or an Error.
      */
-    _defineProperty(_this, "getFeeAddress", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+    _defineProperty(_this, "getFeeAddress", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
       var start, _window$cardano3, address, end;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
             if (_this.api) {
-              _context11.next = 2;
+              _context12.next = 2;
               break;
             }
             throw new Error("Attempted to query fee address without an API instance.");
           case 2:
             start = performance.now();
-            _context11.prev = 3;
+            _context12.prev = 3;
             address = (_window$cardano3 = window.cardano) === null || _window$cardano3 === void 0 || (_window$cardano3 = _window$cardano3[_this.activeWallet]) === null || _window$cardano3 === void 0 || (_window$cardano3 = _window$cardano3.experimental) === null || _window$cardano3 === void 0 ? void 0 : _window$cardano3.feeAddress;
             end = performance.now();
             if (_this._options.debug) {
               console.log("getFeeAddress: ".concat(end - start, "ms"));
             }
-            return _context11.abrupt("return", address);
+            return _context12.abrupt("return", address);
           case 10:
-            _context11.prev = 10;
-            _context11.t0 = _context11["catch"](3);
-            return _context11.abrupt("return", _context11.t0);
+            _context12.prev = 10;
+            _context12.t0 = _context12["catch"](3);
+            return _context12.abrupt("return", _context12.t0);
           case 13:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11, null, [[3, 10]]);
+      }, _callee12, null, [[3, 10]]);
     })));
     /**
      * Gets a list of wallet UTXOs suitable for collateral.
      *
      * @returns {Promise<TransactionUnspentOutput[] | Error | undefined>} The list of TransactionUnspentOutputs, if there are any, or an Error.
      */
-    _defineProperty(_this, "getCollateral", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+    _defineProperty(_this, "getCollateral", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
       var _cbor2;
       var start, _yield$Promise$all13, _yield$Promise$all14, Serialization, typedHex, cbor, _this$api, _this$api2, funcCall, data, end;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             if (_this.api) {
-              _context12.next = 2;
+              _context13.next = 2;
               break;
             }
             throw new Error("Attempted to query UTXOs without an API instance.");
           case 2:
             start = performance.now();
-            _context12.next = 5;
+            _context13.next = 5;
             return Promise.all([(0, _getLibs.getCardanoCore)(), (0, _getLibs.getCardanoUtil)()]);
           case 5:
-            _yield$Promise$all13 = _context12.sent;
+            _yield$Promise$all13 = _context13.sent;
             _yield$Promise$all14 = _slicedToArray(_yield$Promise$all13, 2);
             Serialization = _yield$Promise$all14[0].Serialization;
             typedHex = _yield$Promise$all14[1];
-            _context12.prev = 9;
+            _context13.prev = 9;
             funcCall = ((_this$api = _this.api) === null || _this$api === void 0 ? void 0 : _this$api.getCollateral) || ((_this$api2 = _this.api) === null || _this$api2 === void 0 ? void 0 : _this$api2.experimental.getCollateral);
             if (!(typeof funcCall !== "function")) {
-              _context12.next = 15;
+              _context13.next = 15;
               break;
             }
             cbor = [];
-            _context12.next = 18;
+            _context13.next = 18;
             break;
           case 15:
-            _context12.next = 17;
+            _context13.next = 17;
             return funcCall();
           case 17:
-            cbor = _context12.sent;
+            cbor = _context13.sent;
           case 18:
-            _context12.next = 23;
+            _context13.next = 23;
             break;
           case 20:
-            _context12.prev = 20;
-            _context12.t0 = _context12["catch"](9);
-            return _context12.abrupt("return", _context12.t0);
+            _context13.prev = 20;
+            _context13.t0 = _context13["catch"](9);
+            return _context13.abrupt("return", _context13.t0);
           case 23:
             data = (_cbor2 = cbor) === null || _cbor2 === void 0 ? void 0 : _cbor2.map(function (val) {
               var txOutput = Serialization.TransactionUnspentOutput.fromCbor(typedHex(val));
@@ -850,29 +896,31 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
             if (_this._options.debug) {
               console.log("getCollateral: ".concat(end - start, "ms"));
             }
-            return _context12.abrupt("return", data);
+            return _context13.abrupt("return", data);
           case 27:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12, null, [[9, 20]]);
+      }, _callee13, null, [[9, 20]]);
     })));
     /**
      * Resolves metadata for the given asset IDs, using a cached version if available.
+     * Aborts any in-flight fetch when called, ensuring only the latest request completes.
      *
      * @private
      * @param {string[]} assetIds - The IDs of the assets to resolve metadata for.
      * @returns {Promise<Map<string, AssetMetadata>>} - A promise that resolves to a map of asset metadata.
      */
     _defineProperty(_this, "__metadataResolverWithCache", /*#__PURE__*/function () {
-      var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(assetIds) {
-        var start, cachedKeys, inputKeys, _end, attempts, newMetadata, end;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(assetIds) {
+        var _this$_metadataAbortC3;
+        var start, cachedKeys, inputKeys, _end, currentController, attempts, newMetadata, end;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               start = performance.now();
               if (!_this._cachedMetadata) {
-                _context13.next = 8;
+                _context14.next = 8;
                 break;
               }
               cachedKeys = new Set(_this._cachedMetadata.keys());
@@ -880,67 +928,83 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
               if (!(cachedKeys.size === inputKeys.size && _toConsumableArray(cachedKeys).every(function (key) {
                 return inputKeys.has(key);
               }))) {
-                _context13.next = 8;
+                _context14.next = 8;
                 break;
               }
               _end = performance.now();
               if (_this._options.debug) {
                 console.log("metadataResolver (cached): ".concat(_end - start, "ms"));
               }
-              return _context13.abrupt("return", _this._cachedMetadata);
+              return _context14.abrupt("return", _this._cachedMetadata);
             case 8:
+              // Abort any in-flight metadata fetch
+              (_this$_metadataAbortC3 = _this._metadataAbortController) === null || _this$_metadataAbortC3 === void 0 || _this$_metadataAbortC3.abort();
+              _this._metadataAbortController = new AbortController();
+              currentController = _this._metadataAbortController;
               attempts = 0;
-            case 9:
+            case 12:
               if (!(attempts <= 3 && !newMetadata)) {
-                _context13.next = 21;
+                _context14.next = 24;
                 break;
               }
-              _context13.prev = 10;
-              _context13.next = 13;
+              _context14.prev = 13;
+              _context14.next = 16;
               return _this._options.metadataResolver({
                 assetIds: assetIds.map(_assets.normalizeAssetIdWithDot),
                 normalizeAssetId: _assets.normalizeAssetIdWithDot,
                 isAdaAsset: _assets.isAdaAsset
               });
-            case 13:
-              newMetadata = _context13.sent;
-              _context13.next = 19;
-              break;
             case 16:
-              _context13.prev = 16;
-              _context13.t0 = _context13["catch"](10);
-              attempts++;
+              newMetadata = _context14.sent;
+              _context14.next = 22;
+              break;
             case 19:
-              _context13.next = 9;
+              _context14.prev = 19;
+              _context14.t0 = _context14["catch"](13);
+              attempts++;
+            case 22:
+              _context14.next = 12;
               break;
-            case 21:
+            case 24:
+              if (!currentController.signal.aborted) {
+                _context14.next = 26;
+                break;
+              }
+              return _context14.abrupt("return", _this._cachedMetadata);
+            case 26:
               if (newMetadata) {
-                _context13.next = 25;
+                _context14.next = 30;
                 break;
               }
-              _context13.next = 24;
+              _context14.next = 29;
               return _this.fallbackMetadataResolver({
                 assetIds: assetIds.map(_assets.normalizeAssetIdWithDot),
                 normalizeAssetId: _assets.normalizeAssetIdWithDot,
                 isAdaAsset: _assets.isAdaAsset
               });
-            case 24:
-              newMetadata = _context13.sent;
-            case 25:
+            case 29:
+              newMetadata = _context14.sent;
+            case 30:
+              if (!currentController.signal.aborted) {
+                _context14.next = 32;
+                break;
+              }
+              return _context14.abrupt("return", _this._cachedMetadata);
+            case 32:
               _this._cachedMetadata = newMetadata;
               end = performance.now();
               if (_this._options.debug) {
                 console.log("metadataResolver: ".concat(end - start, "ms"));
               }
-              return _context13.abrupt("return", newMetadata);
-            case 29:
+              return _context14.abrupt("return", newMetadata);
+            case 36:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, null, [[10, 16]]);
+        }, _callee14, null, [[13, 19]]);
       }));
       return function (_x3) {
-        return _ref13.apply(this, arguments);
+        return _ref14.apply(this, arguments);
       };
     }());
     /**
@@ -949,12 +1013,12 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      * @type {TMetadataResolverFunc<AssetMetadata>}
      */
     _defineProperty(_this, "fallbackMetadataResolver", /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(_ref14) {
+      var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(_ref15) {
         var assetIds, map;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              assetIds = _ref14.assetIds;
+              assetIds = _ref15.assetIds;
               map = new Map();
               assetIds.forEach(function (id) {
                 return map.set((0, _assets.normalizeAssetIdWithDot)(id), {
@@ -962,15 +1026,15 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
                   decimals: 6
                 });
               });
-              return _context14.abrupt("return", map);
+              return _context15.abrupt("return", map);
             case 4:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14);
+        }, _callee15);
       }));
       return function (_x4) {
-        return _ref15.apply(this, arguments);
+        return _ref16.apply(this, arguments);
       };
     }());
     _this._options = (0, _merge["default"])({
@@ -1040,25 +1104,25 @@ var WalletObserver = exports.WalletObserver = /*#__PURE__*/function (_WalletObse
      * @returns {Promise<WalletObserverUtils>} Resolves to a WalletObserverUtils class.
      */
     function () {
-      var _getUtils = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _getUtils = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               if (this.utils) {
-                _context15.next = 4;
+                _context16.next = 4;
                 break;
               }
-              _context15.next = 3;
+              _context16.next = 3;
               return _WalletObserverUtilsClass.WalletObserverUtils["new"](this.network);
             case 3:
-              this.utils = _context15.sent;
+              this.utils = _context16.sent;
             case 4:
-              return _context15.abrupt("return", this.utils);
+              return _context16.abrupt("return", this.utils);
             case 5:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
       function getUtils() {
         return _getUtils.apply(this, arguments);