@metamask-previews/bridge-status-controller 78.0.2-preview-0f61514 → 78.0.2-preview-0095f3485

package/dist/bridge-status-controller.d.ts

@@ -6,7 +6,7 @@ import type { TransactionMeta } from '@metamask/transaction-controller';
 import { BRIDGE_STATUS_CONTROLLER_NAME } from './constants.js';
 import type { TraceName } from './constants.js';
 import { QuoteStatusGetError, QuoteStatusUpdateError } from './quote-status-manager/errors.js';
-import type { BridgeStatusControllerState, StartPollingForBridgeTxStatusArgs, FetchFunction, BridgeHistoryItem } from './types.js';
+import type { BridgeStatusControllerState, StartPollingForBridgeTxStatusArgsSerialized, FetchFunction, BridgeHistoryItem } from './types.js';
 import type { BridgeStatusControllerMessenger } from './types.js';
 import { BridgeClientId } from './types.js';
 /** The input to start polling for the {@link BridgeStatusController} */
@@ -80,7 +80,7 @@ export declare class BridgeStatusController extends BridgeStatusController_base<
      *
      * @param txHistoryMeta - The parameters for creating the history item
      */
-    startPollingForBridgeTxStatus: (txHistoryMeta: StartPollingForBridgeTxStatusArgs) => void;
+    startPollingForBridgeTxStatus: (txHistoryMeta: StartPollingForBridgeTxStatusArgsSerialized) => void;
     _executePoll: (pollingInput: BridgeStatusPollingInput) => Promise<void>;
     /**
      * Submits a cross-chain swap transaction

package/dist/bridge-status-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-status-controller.d.ts","sourceRoot":"","sources":["../src/bridge-status-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bridge-status-controller.d.ts","sourceRoot":"","sources":["../src/bridge-status-controller.ts"],"names":[],"mappings":"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"}

package/dist/bridge-status-controller.js

@@ -1,5 +1,5 @@
-import { FeatureId, FailurePhase, SwapBridgeErrorCode, } from '@metamask/bridge-controller';
-import { isNonEvmChainId, StatusTypes, getAccountHardwareType, UnifiedSwapBridgeEventName, isCrossChain, MetricsActionType, MetaMetricsSwapsEventSource, PollingStatus, formatChainIdToHex, getAccountByAddress, } from '@metamask/bridge-controller';
+import { FeatureId, toQuoteMetadataV1, toQuoteResponseV1, isQuoteResponseV2, FailurePhase, SwapBridgeErrorCode, } from '@metamask/bridge-controller';
+import { isNonEvmChainId, StatusTypes, getAccountHardwareType, UnifiedSwapBridgeEventName, isCrossChain, MetricsActionType, MetaMetricsSwapsEventSource, PollingStatus, formatChainIdToHex, } from '@metamask/bridge-controller';
 import { StaticIntervalPollingController } from '@metamask/polling-controller';
 import { TransactionStatus, TransactionType, generateBatchId, } from '@metamask/transaction-controller';
 import { numberToHex } from '@metamask/utils';
@@ -10,16 +10,15 @@ import { QuoteStatusManager } from './quote-status-manager/quotes-status-manager
 import executeSubmitStrategy from './strategy/index.js';
 import { SubmitStep } from './strategy/types.js';
 import { BridgeClientId } from './types.js';
+import { getAccountByAddress } from './utils/accounts.js';
 import { getJwt } from './utils/authentication.js';
 import { fetchBridgeTxStatus, fetchBridgeQuoteStatus, getStatusRequestWithSrcTxHash, shouldSkipFetchDueToFetchFailures, shouldWaitForFinalBridgeStatus, } from './utils/bridge-status.js';
 import { getBatchSellTrades, stopPollingForQuotes, trackMetricsEvent, } from './utils/bridge.js';
-import { getInitialHistoryItem, rekeyHistoryItemInState, shouldPollHistoryItem, resolveHistoryKeyForTxMeta, } from './utils/history.js';
+import { getInitialHistoryItem, getMatchingHistoryEntryForTxMeta, rekeyHistoryItemInState, shouldPollHistoryItem, getMatchingHistoryEntryForApprovalTxMeta, } from './utils/history.js';
 import { getFinalizedTxProperties, getPriceImpactFromQuote, getRequestMetadataFromHistory, getRequestParamFromHistory, getTradeDataFromHistory, getEVMTxPropertiesFromTransactionMeta, getTxStatusesFromHistory, getPreConfirmationPropertiesFromQuote, getHashPresenceProperties, getBroadcastFailureProperties, getFailurePropertiesFromHistory, promoteFailurePhase, } from './utils/metrics.js';
 import { getSelectedChainId } from './utils/network.js';
-import { normalizeQuoteResponses } from './utils/quotes.js';
-import { approvalUpdateHandler, tradeUpdateHandler, } from './utils/subscriptions.js';
 import { getSwapOperationCompletedTraceParams, getTraceParams, } from './utils/trace.js';
-import { getTransactionMetaById, getTransactions, checkIsDelegatedAccount, isCrossChainTx, updateTransactionsInBatch, hasNestedSwapTransactions, hasNestedBridgeTransactions, } from './utils/transaction.js';
+import { getTransactionMetaById, getTransactions, checkIsDelegatedAccount, isApprovalTx, isCrossChainTx, updateTransactionsInBatch, hasNestedSwapTransactions, } from './utils/transaction.js';
 const metadata = {
     // We want to persist the bridge status state so that we can show the proper data for the Activity list
     // basically match the behavior of TransactionController
@@ -100,38 +99,57 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
         // Set interval
         this.setIntervalLength(REFRESH_INTERVAL_MS);
-        this.messenger.subscribe('TransactionController:transactionStatusUpdated', (args) => {
-            let handler = tradeUpdateHandler;
-            const params = {
-                ...args,
-                onTransactionConfirmed: this.#onTransactionConfirmed,
-                onTransactionFailed: this.#onTransactionFailed,
-                onReportSubmittedOnce: this.#reportSubmittedOnce,
-            };
-            // Match handler by type first
-            switch (args.txMeta.type) {
-                case TransactionType.swapApproval:
-                case TransactionType.bridgeApproval:
-                    handler = approvalUpdateHandler;
+        this.messenger.subscribe('TransactionController:transactionStatusUpdated', ({ txMeta, historyKey, historyItem, isApprovalTxMeta }) => {
+            if (!txMeta) {
+                return;
+            }
+            const { type, status } = txMeta;
+            // Allow event publishing if the txMeta is a swap/bridge OR if the
+            // corresponding history item exists
+            const isSwapOrBridgeTransaction = type && isCrossChainTx(type);
+            if (!isSwapOrBridgeTransaction && !historyKey && !historyItem) {
+                return;
+            }
+            switch (status) {
+                case TransactionStatus.submitted:
+                    // EVM txs report SUBMITTED here (not via transactionSubmitted) so hash
+                    // replacements before confirmation still reach the Bridge API.
+                    if (txMeta.hash &&
+                        txMeta.type &&
+                        isCrossChainTx(txMeta.type) &&
+                        !isApprovalTxMeta &&
+                        historyKey) {
+                        this.#reportSubmittedOnce(historyKey, txMeta.hash, txMeta.id);
+                    }
+                    break;
+                case TransactionStatus.confirmed:
+                    this.#onTransactionConfirmed({
+                        txMeta,
+                        historyKey,
+                        isApprovalTxMeta,
+                    });
                     break;
-                case TransactionType.bridge:
-                case TransactionType.swap:
-                    handler = tradeUpdateHandler;
+                case TransactionStatus.failed:
+                case TransactionStatus.dropped:
+                case TransactionStatus.rejected:
+                    this.#onTransactionFailed({ txMeta, historyKey, isApprovalTxMeta });
                     break;
                 default:
-                    // Otherwise check for matching nested transactions
-                    if (hasNestedSwapTransactions(args.txMeta) ||
-                        hasNestedBridgeTransactions(args.txMeta)) {
-                        handler = tradeUpdateHandler;
-                    }
-                    else {
-                        // This handler only checks for failures, so it's safe to use
-                        // for unrecognized transactions
-                        handler = approvalUpdateHandler;
-                    }
+                    break;
             }
-            handler(params);
-        }, (payload) => resolveHistoryKeyForTxMeta(payload, this.state.txHistory));
+        }, ({ transactionMeta }) => {
+            const entry = getMatchingHistoryEntryForTxMeta(this.state.txHistory, transactionMeta);
+            const approvalEntry = getMatchingHistoryEntryForApprovalTxMeta(this.state.txHistory, transactionMeta);
+            const entryToUse = entry ?? approvalEntry;
+            return {
+                historyKey: entryToUse?.[0],
+                historyItem: entryToUse?.[1],
+                txMeta: transactionMeta,
+                // Means that the triggering event was for an approval tx
+                isApprovalTxMeta: entryToUse?.[1]?.approvalTxId === transactionMeta.id ||
+                    Boolean(transactionMeta.type && isApprovalTx(transactionMeta.type)),
+            };
+        });
         // Seed any missing quote-status entries from persisted history before
         // init(), so init()'s reconciliation loop can finalize quotes whose
         // deferred entry was never created (e.g. the client closed before
@@ -211,43 +229,47 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             this.#quoteStatusManager.reportFinalised(txMeta.id, false, txMeta.chainId, txMeta.hash);
         }
     };
-    /**
-     * Handles the confirmed status for EVM swap, bridge src, batch or deposit txs
-     * @param txMeta - The transaction meta
-     * @param historyKey - The history key
-     */
-    #onTransactionConfirmed = ({ txMeta, historyKey, }) => {
-        const { type, hash: txHash, id, chainId } = txMeta;
-        const isBridge = type === TransactionType.bridge || hasNestedBridgeTransactions(txMeta);
-        if (isBridge) {
-            this.#updateHistoryItem({
-                historyKey,
-                txHash,
-            });
-            this.#startPollingForTxId(historyKey);
+    // Only EVM txs
+    #onTransactionConfirmed = ({ txMeta, historyKey, isApprovalTxMeta, }) => {
+        // Return early if the confirmed txMeta is for an approval since we
+        // still need to wait for the trade to be confirmed
+        if (isApprovalTxMeta) {
             return;
         }
-        const isSwap = type === TransactionType.swap || hasNestedSwapTransactions(txMeta);
-        const isIntent = this.#isIntentHistoryItem(historyKey);
-        if (isSwap && !isIntent) {
-            // Smart/batch transactions can be assigned their hash only once
-            // confirmed, so the submitted status handler never had one to report.
-            // Report it here (before reportFinalised) so the deferred-queue entry
-            // exists.
-            const historyItem = this.state.txHistory[historyKey];
-            if (txHash && !isNonEvmChainId(historyItem.quote.srcChainId)) {
-                this.#reportSubmittedOnce(historyKey, txHash, id);
-            }
-            this.#quoteStatusManager.reportFinalised(id, true, chainId, txHash);
-            this.#traceSwapOperationCompleted(historyKey, 'success', 'source').catch(() => undefined);
-        }
         this.#updateHistoryItem({
             historyKey,
-            status: StatusTypes.COMPLETE,
             txHash: txMeta.hash,
-            completionTime: Date.now(),
         });
-        this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Completed, historyKey);
+        const isIntent = this.#isIntentHistoryItem(historyKey);
+        const isSwap = txMeta.type === TransactionType.swap || hasNestedSwapTransactions(txMeta);
+        if (isSwap) {
+            this.#updateHistoryItem({
+                historyKey,
+                status: StatusTypes.COMPLETE,
+                completionTime: Date.now(),
+            });
+            if (!isIntent) {
+                // Smart/batch transactions can be assigned their hash only once
+                // confirmed, so the submitted status handler never had one to report.
+                // Report it here (before reportFinalised) so the deferred-queue entry
+                // exists.
+                const historyItem = historyKey
+                    ? this.state.txHistory[historyKey]
+                    : undefined;
+                if (historyKey &&
+                    historyItem &&
+                    txMeta.hash &&
+                    !isNonEvmChainId(historyItem.quote.srcChainId)) {
+                    this.#reportSubmittedOnce(historyKey, txMeta.hash, txMeta.id);
+                }
+                this.#quoteStatusManager.reportFinalised(txMeta.id, true, txMeta.chainId, txMeta.hash);
+                this.#traceSwapOperationCompleted(historyKey, 'success', 'source').catch(() => undefined);
+            }
+            this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Completed, historyKey);
+        }
+        else if (historyKey) {
+            this.#startPollingForTxId(historyKey);
+        }
     };
     /**
      * Reports the SUBMITTED quote status for non-EVM transactions.
@@ -511,9 +533,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
      * @param txMeta.hash - The transaction hash to set on the history item
      * @param historyItemOverrides - The history item overrides to set on the history item
      */
-    #rekeyHistoryItem = (oldKey, newKey, historyItemOverrides) => {
+    #rekeyHistoryItem = (oldKey, newKey, txMeta, historyItemOverrides) => {
         this.update((state) => {
-            rekeyHistoryItemInState(state, oldKey, newKey, historyItemOverrides);
+            rekeyHistoryItemInState(state, oldKey, newKey, txMeta, historyItemOverrides);
         });
     };
     #startPollingForTxId = (txId) => {
@@ -709,8 +731,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     ? 'destination'
                     : 'source').catch(() => undefined);
                 if (status.status === StatusTypes.COMPLETE) {
-                    this.messenger.publish('BridgeStatusController:destinationTransactionCompleted', historyItem.quote.destAsset.assetId);
                     this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
+                    this.messenger.publish('BridgeStatusController:destinationTransactionCompleted', historyItem.quote.destAsset.assetId);
                 }
                 if (status.status === StatusTypes.FAILED) {
                     this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
@@ -822,7 +844,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             for await (const { type, payload } of steps) {
                 switch (type) {
                     case SubmitStep.RekeyHistoryItem:
-                        this.#rekeyHistoryItem(payload.oldHistoryKey, payload.newHistoryKey, payload.historyItemOverrides);
+                        this.#rekeyHistoryItem(payload.oldHistoryKey, payload.newHistoryKey, payload.tradeMeta, payload.historyItemOverrides);
                         latestHistoryItemKey = payload.newHistoryKey;
                         // Report SUBMITTED as soon as the trade hash is known at submission
                         // time, instead of waiting for the delayed transactionStatusUpdated
@@ -899,8 +921,18 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
      * @returns The transaction meta
      * @throws An error if transaction submission fails before it gets published
      */
-    submitTx = async ({ accountAddress, quoteResponses: quoteResponsesV1orV2, isStxEnabled, quotesReceivedContext, location = MetaMetricsSwapsEventSource.Unknown, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades = null, inputPrimaryDenomination, migrationPhase, }) => {
-        const quoteResponses = normalizeQuoteResponses(quoteResponsesV1orV2, migrationPhase);
+    submitTx = async ({ accountAddress, quoteResponses: quoteResponsesV1orV2, isStxEnabled, quotesReceivedContext, location = MetaMetricsSwapsEventSource.Unknown, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades, inputPrimaryDenomination, migrationPhase, }) => {
+        // Convert quote responses to V1 format and preserve metadata for consistency
+        const quoteResponses = quoteResponsesV1orV2.map((quote) => {
+            if (!isQuoteResponseV2(quote)) {
+                return quote;
+            }
+            const quoteMetadataV1 = toQuoteMetadataV1(quote, migrationPhase);
+            // This coercion omits legacy metadata from the resulting V1 quote
+            const quoteResponseV1 = toQuoteResponseV1(quote);
+            // Merge legacy-shaped metadata to V1-shaped quote response
+            return { ...quoteResponseV1, ...quoteMetadataV1 };
+        });
         const quoteResponse = quoteResponses[0];
         const { quote } = quoteResponse;
         const startTime = Date.now();