@metamask-previews/bridge-status-controller 76.4.0-preview-686aaf7 → 76.4.0-preview-d687d3ab2

package/CHANGELOG.md

@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Update batch-strategy and batch-sell-strategy history persistence ([#10814](https://github.com/MetaMask/core/pull/10814))
+  - add a history item before submitting transactions. This enables the `TransactionController:transactionStatusUpdated` listener to match the txMeta with history and determine whether to publish the Failed event
+  - include latest `TransactionStatus` when rekey-ing or adding to history
+- Update evm-strategy history persistence ([#10814](https://github.com/MetaMask/core/pull/10814))
+  - if an approval is required, key initial historyItem by `actionId`
+  - rekey to the trade's `actionId` if the approval succeeds
+  - rekey to the trade's `id` on confirmation
+
+### Fixed
+
+- Emit only one `Unified SwapBridge Failed` event when `addTransaction` or `addTransactionBatch` fails ([#10814](https://github.com/MetaMask/core/pull/10814))
+  - Pre-submit history: evm keyed by actionId, batch + batch-sell keyed by batchId
+  - After tx exists: listener publishes Failed; submitTx returns the txMeta
+  - Before tx exists: submitTx catch publishes Failed
 - Bump `@metamask/accounts-controller` from `^40.0.0` to `^40.1.0` ([#10851](https://github.com/MetaMask/core/pull/10851))
 - Bump `@metamask/keyring-controller` from `^28.1.0` to `^28.2.0` ([#10851](https://github.com/MetaMask/core/pull/10851))
 - Bump `@metamask/base-controller` from `^10.0.0` to `^10.1.0` ([#10864](https://github.com/MetaMask/core/pull/10864))

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

@@ -18,7 +18,7 @@ import { getInitialHistoryItem, getMatchingHistoryEntryForTxMeta, rekeyHistoryIt
 import { getFinalizedTxProperties, getPriceImpactFromQuote, getRequestMetadataFromHistory, getRequestParamFromHistory, getTradeDataFromHistory, getEVMTxPropertiesFromTransactionMeta, getTxStatusesFromHistory, getPreConfirmationPropertiesFromQuote, getHashPresenceProperties, getBroadcastFailureProperties, getFailurePropertiesFromHistory, promoteFailurePhase, } from './utils/metrics.js';
 import { getSelectedChainId } from './utils/network.js';
 import { getSwapOperationCompletedTraceParams, getTraceParams, } from './utils/trace.js';
-import { getTransactionMetaById, getTransactions, checkIsDelegatedAccount, isCrossChainTx, updateTransactionsInBatch, hasNestedSwapTransactions, } 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
@@ -145,7 +145,9 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 historyKey: entryToUse?.[0],
                 historyItem: entryToUse?.[1],
                 txMeta: transactionMeta,
-                isApprovalTxMeta: entryToUse?.[1]?.approvalTxId === transactionMeta.id,
+                // 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
@@ -187,36 +189,45 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
     #isIntentHistoryItem = (historyKey) => historyKey
         ? Boolean(this.state.txHistory[historyKey]?.quote.intent)
         : false;
-    #onTransactionFailed = ({ txMeta, historyKey, isApprovalTxMeta, }) => {
-        const isHistoryItemAlreadyFailed = historyKey
-            ? this.state.txHistory[historyKey]?.status.status === StatusTypes.FAILED
-            : false;
-        const isIntent = this.#isIntentHistoryItem(historyKey);
+    #onTransactionFailed = ({ txMeta, historyKey, isApprovalTxMeta, eventProperties, }) => {
+        const isHistoryItemAlreadyFailed = historyKey &&
+            this.state.txHistory[historyKey]?.status.status === StatusTypes.FAILED;
+        if (isHistoryItemAlreadyFailed) {
+            return;
+        }
         this.#updateHistoryItem({
             historyKey,
             status: StatusTypes.FAILED,
-            txHash: isApprovalTxMeta ? undefined : txMeta.hash,
+            // Only update txHash if it's not an approval tx failure
+            txHash: isApprovalTxMeta ? undefined : txMeta?.hash,
             completionTime: Date.now(),
         });
-        if (txMeta.status === TransactionStatus.rejected) {
+        if (txMeta?.status === TransactionStatus.rejected) {
             return;
         }
-        if (isHistoryItemAlreadyFailed) {
+        // Pre-confirmation failues
+        if (eventProperties || !txMeta) {
+            this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Failed, historyKey, eventProperties);
             return;
         }
-        if (!isIntent) {
-            this.#traceSwapOperationCompleted(historyKey, 'error', 'source').catch(() => undefined);
+        this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Failed, historyKey, getEVMTxPropertiesFromTransactionMeta(txMeta));
+        const isIntent = this.#isIntentHistoryItem(historyKey);
+        if (isIntent) {
+            return;
+        }
+        this.#traceSwapOperationCompleted(historyKey, 'error', 'source').catch(() => undefined);
+        // Ignore approval failures, subsequent trade failures will be reported.
+        if (isApprovalTxMeta) {
+            return;
         }
         // Report finalized failure for swap/bridge transactions.
         // Note: TransactionStatus.rejected means the user cancelled signing, so the tx was never broadcast.
         // `hasNestedSwapTransactions` also covers batch/7702 swaps whose type may
         // still read as `batch` rather than `swap`.
-        if (!isIntent &&
-            ((txMeta.type && isCrossChainTx(txMeta.type)) ||
-                hasNestedSwapTransactions(txMeta))) {
+        if ((txMeta.type && isCrossChainTx(txMeta.type)) ||
+            hasNestedSwapTransactions(txMeta)) {
             this.#quoteStatusManager.reportFinalised(txMeta.id, false, txMeta.chainId, txMeta.hash);
         }
-        this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Failed, historyKey, getEVMTxPropertiesFromTransactionMeta(txMeta));
     };
     // Only EVM txs
     #onTransactionConfirmed = ({ txMeta, historyKey, isApprovalTxMeta, }) => {
@@ -520,10 +531,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
      * @param txMeta - The transaction meta from the successful submission
      * @param txMeta.id - The transaction meta id to use as the new key
      * @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, txMeta) => {
+    #rekeyHistoryItem = (oldKey, newKey, txMeta, historyItemOverrides) => {
         this.update((state) => {
-            rekeyHistoryItemInState(state, oldKey, newKey, txMeta);
+            rekeyHistoryItemInState(state, oldKey, newKey, txMeta, historyItemOverrides);
         });
     };
     #startPollingForTxId = (txId) => {
@@ -825,17 +837,19 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
      */
     #executeSubmitStrategy = async (params, sharedHistoryItemProperties) => {
         let tradeTxMeta;
+        let latestHistoryItemKey;
         const steps = executeSubmitStrategy(params);
         // Each submission strategy determines when to execute step, which means these actions can happen in any order
-        for await (const { type, payload } of steps) {
-            try {
+        try {
+            for await (const { type, payload } of steps) {
                 switch (type) {
                     case SubmitStep.RekeyHistoryItem:
-                        this.#rekeyHistoryItem(payload.oldHistoryKey, payload.newHistoryKey, payload.tradeMeta);
+                        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
                         // (submitted) event.
-                        if (payload.tradeMeta.hash) {
+                        if (payload.tradeMeta?.hash && payload.tradeMeta.id) {
                             this.#reportSubmittedOnce(payload.newHistoryKey, payload.tradeMeta.hash, payload.tradeMeta.id);
                         }
                         break;
@@ -859,6 +873,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                                 payload.quoteResponse.quote.slippage ??
                                 0,
                         });
+                        latestHistoryItemKey = payload.historyKey;
                         this.#reportSubmittedForNonEvmTx(payload.historyKey, payload.bridgeTxMeta);
                         break;
                     case SubmitStep.StartPolling:
@@ -877,11 +892,16 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     /* c8 ignore end */
                 }
             }
-            catch (error) {
-                console.error('Failed to add to bridge history and start polling.', error);
-            }
         }
-        return tradeTxMeta;
+        catch (error) {
+            console.error('Failed to persist transaction to history and start polling.', error);
+            return {
+                txMeta: tradeTxMeta,
+                error: error,
+                txHistoryKey: latestHistoryItemKey,
+            };
+        }
+        return { txMeta: tradeTxMeta, txHistoryKey: latestHistoryItemKey };
     };
     /**
      * Submits a cross-chain swap transaction
@@ -935,10 +955,12 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          */
         const requireApproval = this.#clientId === BridgeClientId.MOBILE && accountHardwareType !== null;
         const isBridgeTx = isCrossChain(quote.srcChainId, quote.destChainId);
+        // Appended to batch-sell events
         const batchId = quoteResponses.some(({ featureId: quoteFeatureId }) => quoteFeatureId === FeatureId.BATCH_SELL)
             ? generateBatchId()
             : undefined;
         const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, isStxEnabled, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades, batchId, quotesReceivedContext);
+        let historyKey;
         try {
             // Emit Submitted event after submit button is clicked
             this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Submitted, undefined, {
@@ -973,22 +995,38 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 traceFn: this.#trace,
                 batchId,
             };
-            return await this.#trace(getTraceParams(quoteResponse, isStxEnabled), async () => await this.#executeSubmitStrategy(strategyParams, {
-                startTime,
-                location,
-                abTests,
-                activeAbTests,
-                tokenSecurityTypeDestination,
-                inputPrimaryDenomination,
-                customSlippage: quotesReceivedContext?.custom_slippage,
-                slippagePercentage: quotesReceivedContext?.slippage_limit,
-            }));
+            return await this.#trace(getTraceParams(quoteResponse, isStxEnabled), async () => {
+                const res = await this.#executeSubmitStrategy(strategyParams, {
+                    startTime,
+                    location,
+                    abTests,
+                    activeAbTests,
+                    tokenSecurityTypeDestination,
+                    inputPrimaryDenomination,
+                    customSlippage: quotesReceivedContext?.custom_slippage,
+                    slippagePercentage: quotesReceivedContext?.slippage_limit,
+                });
+                historyKey = res.txHistoryKey;
+                if (res.txMeta) {
+                    return res.txMeta;
+                }
+                if (res.error) {
+                    throw res.error;
+                }
+                throw new Error('Failed to submit transaction');
+            });
         }
         catch (error) {
-            this.#trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.Failed, undefined, {
-                error_message: error?.message,
-                ...preConfirmationProperties,
-                ...getBroadcastFailureProperties(error),
+            this.#onTransactionFailed({
+                isApprovalTxMeta: false,
+                txMeta: undefined,
+                // Include latest history key to mark it Failed
+                historyKey,
+                eventProperties: {
+                    error_message: error?.message,
+                    ...preConfirmationProperties,
+                    ...getBroadcastFailureProperties(error),
+                },
             });
             throw error;
         }