@metamask-previews/bridge-controller 79.2.0-preview-c2ef75d18 → 79.2.0-preview-e81fe8853

package/dist/bridge-controller.mjs

@@ -16,7 +16,6 @@ import { Contract } from "@ethersproject/contracts";
 import { Web3Provider } from "@ethersproject/providers";
 import { abiERC20 } from "@metamask/metamask-eth-abis";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
-import { v4 as uuid } from "uuid";
 import { toQuoteResponseV2 } from "./coercers/quote-response-v1-to-v2.mjs";
 import { BRIDGE_CONTROLLER_NAME, BRIDGE_PROD_API_BASE_URL, DEFAULT_BRIDGE_CONTROLLER_STATE, METABRIDGE_ETHEREUM_ADDRESS, REFRESH_INTERVAL_MS } from "./constants/bridge.mjs";
 import { CHAIN_IDS } from "./constants/chains.mjs";
@@ -30,7 +29,7 @@ import { formatAddressToCaipReference, formatChainIdToCaip, formatChainIdToHex }
 import { getBridgeFeatureFlags, hasMinimumRequiredVersion } from "./utils/feature-flags.mjs";
 import { fetchAssetPrices, fetchBridgeQuotes, fetchBridgeQuoteStream, fetchBatchSellTrades } from "./utils/fetch.mjs";
 import { AbortReason, BatchSellMetricsEventName, MetaMetricsSwapsEventSource, MetricsActionType, UnifiedSwapBridgeEventName } from "./utils/metrics/constants.mjs";
-import { formatProviderLabel, getAccountHardwareType, getRequestParams, getSwapType, getSwapTypeFromQuote, isCustomSlippage, toInputChangedPropertyKey, toInputChangedPropertyValue } from "./utils/metrics/properties.mjs";
+import { formatProviderLabel, getAccountHardwareType, getRequestParams, getSwapTypeFromQuote, isCustomSlippage, toInputChangedPropertyKey, toInputChangedPropertyValue } from "./utils/metrics/properties.mjs";
 import { appendFeesToQuotes } from "./utils/quote-fees.mjs";
 import { getMinimumBalanceForRentExemptionInLamports } from "./utils/snaps.mjs";
 import { sortQuotes } from "./utils/sort-quotes.mjs";
@@ -127,18 +126,6 @@ const metadata = {
         usedInUi: true,
     },
 };
-const QUOTE_ABORT_REASONS = new Set(Object.values(AbortReason));
-const isExpectedQuoteAbort = (error, signal) => {
-    if (signal?.aborted) {
-        return true;
-    }
-    if (QUOTE_ABORT_REASONS.has(String(error))) {
-        return true;
-    }
-    const errorText = error instanceof Error ? `${error.name} ${error.message}` : String(error);
-    return (errorText.includes('AbortError') ||
-        errorText.includes('FetchRequestCanceledException'));
-};
 const MESSENGER_EXPOSED_METHODS = [
     'updateBridgeQuoteRequestParams',
     'fetchQuotes',
@@ -514,9 +501,6 @@ export class BridgeController extends StaticIntervalPollingController() {
             __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.abort(AbortReason.NewQuoteRequest);
             __classPrivateFieldGet(this, _BridgeController_batchSellTradesAbortController, "f")?.abort(AbortReason.NewQuoteRequest);
             __classPrivateFieldSet(this, _BridgeController_abortController, new AbortController(), "f");
-            const quoteTraceStartTime = Date.now();
-            const quoteTraceRequestId = uuid();
-            const quoteAbortSignal = __classPrivateFieldGet(this, _BridgeController_abortController, "f").signal;
             __classPrivateFieldGet(this, _BridgeController_fetchAssetExchangeRates, "f").call(this, quoteRequests).catch((error) => console.warn('Failed to fetch asset exchange rates', error));
             this.trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.QuotesRequested, context);
             const { sse, maxRefreshCount } = getBridgeFeatureFlags(this.messenger);
@@ -537,81 +521,43 @@ export class BridgeController extends StaticIntervalPollingController() {
                 }
             });
             const jwt = await __classPrivateFieldGet(this, _BridgeController_getJwt, "f").call(this);
-            const [firstQuoteRequest] = quoteRequests;
-            let traceResult = 'error';
-            let traceName = TraceName.BatchSellQuotesFetched;
-            if (!isBatchSellRequest) {
-                traceName = isCrossChain(firstQuoteRequest.srcChainId, firstQuoteRequest.destChainId)
+            try {
+                const [firstQuoteRequest] = quoteRequests;
+                const unifiedSwapTraceName = isCrossChain(firstQuoteRequest.srcChainId, firstQuoteRequest.destChainId)
                     ? TraceName.BridgeQuotesFetched
                     : TraceName.SwapQuotesFetched;
-            }
-            const tracedProviders = new Set();
-            const traceWithoutImpact = async (request) => {
-                try {
-                    await __classPrivateFieldGet(this, _BridgeController_trace, "f").call(this, request, () => undefined);
-                }
-                catch {
-                    // Telemetry failures must not affect quote fetching or state updates.
-                }
-            };
-            const traceProviderFirstResult = async (providerData) => {
-                const provider = formatProviderLabel(providerData);
-                if (isBatchSellRequest || tracedProviders.has(provider)) {
-                    return;
-                }
-                tracedProviders.add(provider);
-                await traceWithoutImpact({
-                    name: TraceName.QuoteProviderFirstResult,
-                    startTime: quoteTraceStartTime,
+                await __classPrivateFieldGet(this, _BridgeController_trace, "f").call(this, {
+                    name: isBatchSellRequest
+                        ? TraceName.BatchSellQuotesFetched
+                        : unifiedSwapTraceName,
                     data: {
-                        provider,
-                        request_id: quoteTraceRequestId,
-                        swap_type: getSwapType(firstQuoteRequest.srcChainId, firstQuoteRequest.destChainId),
                         srcChainId: formatChainIdToCaip(firstQuoteRequest.srcChainId),
                         destChainId: formatChainIdToCaip(firstQuoteRequest.destChainId),
-                        result: 'success',
                     },
-                });
-            };
-            try {
-                const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, firstQuoteRequest.walletAddress);
-                // This call is not awaited to prevent blocking quote fetching if the snap takes too long to respond
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                __classPrivateFieldGet(this, _BridgeController_setMinimumBalanceForRentExemptionInLamports, "f").call(this, firstQuoteRequest.srcChainId, selectedAccount?.metadata?.snap?.id);
-                // Use SSE if enabled and return early
-                if (shouldStream || isBatchSellRequest) {
-                    const quoteCount = await __classPrivateFieldGet(this, _BridgeController_handleQuoteStreaming, "f").call(this, {
-                        quoteRequests,
-                        featureId: context.feature_id,
-                        jwt,
-                        selectedAccount,
-                        signal: quoteAbortSignal,
-                        traceProviderFirstResult,
-                    });
-                    if (quoteAbortSignal.aborted) {
-                        traceResult = 'cancelled';
+                }, async () => {
+                    const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, firstQuoteRequest.walletAddress);
+                    // This call is not awaited to prevent blocking quote fetching if the snap takes too long to respond
+                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                    __classPrivateFieldGet(this, _BridgeController_setMinimumBalanceForRentExemptionInLamports, "f").call(this, firstQuoteRequest.srcChainId, selectedAccount?.metadata?.snap?.id);
+                    // Use SSE if enabled and return early
+                    if (shouldStream || isBatchSellRequest) {
+                        await __classPrivateFieldGet(this, _BridgeController_handleQuoteStreaming, "f").call(this, quoteRequests, context.feature_id, jwt, selectedAccount);
                         return;
                     }
-                    traceResult = quoteCount > 0 ? 'success' : 'no_quotes';
-                }
-                else {
                     // Otherwise use regular fetch
-                    const quotes = await this.fetchQuotes(firstQuoteRequest, context.feature_id, quoteAbortSignal);
-                    for (const quote of quotes) {
-                        await traceProviderFirstResult(quote.quote);
-                    }
+                    const quotes = await this.fetchQuotes(firstQuoteRequest, context.feature_id, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal);
                     this.update((state) => {
                         // Set the initial load time if this is the first fetch
                         if (state.quotesRefreshCount ===
                             DEFAULT_BRIDGE_CONTROLLER_STATE.quotesRefreshCount &&
                             __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f")) {
-                            state.quotesInitialLoadTime = Date.now() - __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f");
+                            state.quotesInitialLoadTime =
+                                Date.now() - __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f");
                         }
                         state.quotes = quotes.map(toQuoteResponseV2);
                         state.quotesLoadingStatus = RequestStatus.FETCHED;
                     });
-                    traceResult = quotes.length > 0 ? 'success' : 'no_quotes';
-                }
+                });
             }
             catch (error) {
                 // Reset the quotes list if the fetch fails to avoid showing stale quotes
@@ -619,8 +565,14 @@ export class BridgeController extends StaticIntervalPollingController() {
                     state.quotes = DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
                 });
                 // Ignore abort errors
-                if (isExpectedQuoteAbort(error, quoteAbortSignal)) {
-                    traceResult = 'cancelled';
+                if (error.toString().includes('AbortError') ||
+                    error.toString().includes('FetchRequestCanceledException') ||
+                    [
+                        AbortReason.ResetState,
+                        AbortReason.NewQuoteRequest,
+                        AbortReason.QuoteRequestUpdated,
+                        AbortReason.TransactionSubmitted,
+                    ].includes(error)) {
                     // Exit the function early to prevent other state updates
                     return;
                 }
@@ -645,22 +597,6 @@ export class BridgeController extends StaticIntervalPollingController() {
                 this.trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.QuotesError, context);
                 console.log(`Failed to ${shouldStream ? 'stream' : 'fetch'} bridge quotes`, error);
             }
-            finally {
-                await traceWithoutImpact({
-                    name: traceName,
-                    startTime: quoteTraceStartTime,
-                    data: {
-                        srcChainId: formatChainIdToCaip(firstQuoteRequest.srcChainId),
-                        destChainId: formatChainIdToCaip(firstQuoteRequest.destChainId),
-                        ...(!isBatchSellRequest && {
-                            request_id: quoteTraceRequestId,
-                            swap_type: getSwapType(firstQuoteRequest.srcChainId, firstQuoteRequest.destChainId),
-                            feature_id: context.feature_id,
-                            result: traceResult,
-                        }),
-                    },
-                });
-            }
             // Update refresh count after fetching, validation and fee calculation have completed
             this.update((state) => {
                 state.quotesRefreshCount += 1;
@@ -675,7 +611,7 @@ export class BridgeController extends StaticIntervalPollingController() {
                 this.stopAllPolling();
             }
         });
-        _BridgeController_handleQuoteStreaming.set(this, async ({ quoteRequests, featureId, jwt, selectedAccount, signal, traceProviderFirstResult, }) => {
+        _BridgeController_handleQuoteStreaming.set(this, async (quoteRequests, featureId, jwt, selectedAccount) => {
             /**
              * Tracks the number of valid quotes received from the current stream, which is used
              * to determine when to clear the quotes list and set the initial load time
@@ -686,10 +622,9 @@ export class BridgeController extends StaticIntervalPollingController() {
              * before setting quotesLoadingStatus to FETCHED
              */
             const pendingFeeAppendPromises = new Set();
-            await fetchBridgeQuoteStream(__classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), quoteRequests, signal, featureId, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), jwt, __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? BRIDGE_PROD_API_BASE_URL, {
+            await fetchBridgeQuoteStream(__classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), quoteRequests, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal, featureId, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), jwt, __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? BRIDGE_PROD_API_BASE_URL, {
                 onQuoteValidationFailure: (validationFailures) => __classPrivateFieldGet(this, _BridgeController_trackQuoteValidationFailures, "f").call(this, validationFailures, featureId),
                 onValidQuoteReceived: async (quote) => {
-                    await traceProviderFirstResult(quote.quote);
                     const feeAppendPromise = (async () => {
                         const quotesWithFees = await appendFeesToQuotes(quote.chainId, [quote], this.messenger, __classPrivateFieldGet(this, _BridgeController_getLayer1GasFee, "f"), selectedAccount);
                         if (quotesWithFees.length > 0) {
@@ -753,7 +688,6 @@ export class BridgeController extends StaticIntervalPollingController() {
                     });
                 },
             }, __classPrivateFieldGet(this, _BridgeController_clientVersion, "f"));
-            return validQuotesCounter;
         });
         _BridgeController_setMinimumBalanceForRentExemptionInLamports.set(this, async (srcChainId, snapId) => {
             if (!isSolanaChainId(srcChainId) || !snapId) {