fix: use signature as txhistory key for Solana bridge transactions (#6424)

## Explanation

This change fixes a bug in Solana post-submission logic in which the
txHistory key is set to a random uuid instead of the tx hash. This
causes txHistory lookups by txHash (for Solana transactions) to fail on
the clients

This is not a breaking change, but requires a migration on the clients
to set the txHistory key to the `historyItem.status?.srcChain?.txHash`
value for Solana transactions. This fixes txHistory items created prior
to this version of the bridge-status-controller

Migration script for extension:
https://github.com/MetaMask/metamask-extension/pull/35539/files#diff-3cd53aba68cf73714b1dbe70345a0b896589f13d8c3cc370d04393a5c6b4f0d8

This PR also fixes properties for the swap Completed events so that they
read data from the txHistory, if it exists

<!--
Thanks for your contribution! Take a moment to answer these questions so
that reviewers have the information they need to properly understand
your changes:

* What is the current state of things and why does it need to change?
* What is the solution your changes offer and how does it work?
* Are there any changes whose purpose might not obvious to those
unfamiliar with the domain?
* If your primary goal was to update one package but you found you had
to update another one along the way, why did you do so?
* If you had to upgrade a dependency, why did you do so?
-->

## References

<!--
Are there any issues that this pull request is tied to?
Are there other links that reviewers should consult to understand these
changes better?
Are there client or consumer pull requests to adopt any breaking
changes?

For example:

* Fixes #12345
* Related to #67890
-->

Fixes https://consensyssoftware.atlassian.net/browse/SWAPS-2595

## Checklist

- [ ] I've updated the test suite for new or updated code as appropriate
- [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [ ] I've communicated my changes to consumers by [updating changelogs
for packages I've
changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs),
highlighting breaking changes as necessary
- [ ] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes

Author: micaelae

packages/bridge-status-controller/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Set the Solana tx signature as the `txHistory` key to support lookups by hash ([#6424](https://github.com/MetaMask/core/pull/6424))
+- Read Completed swap properties from `txHistory` for consistency with bridge transactions ([#6424](https://github.com/MetaMask/core/pull/6424))
+
 ## [40.2.0]
 
 ### Added

packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap

@@ -3110,7 +3110,7 @@ Object {
   "destinationTokenDecimals": 18,
   "destinationTokenSymbol": "ETH",
   "hash": "signature",
-  "id": "test-uuid-1234",
+  "id": "signature",
   "isBridgeTx": true,
   "isSolana": true,
   "networkClientId": "test-snap",
@@ -3132,7 +3132,7 @@ Object {
 
 exports[`BridgeStatusController submitTx: Solana bridge should successfully submit a transaction 3`] = `
 Object {
-  "bridgeTxMetaId": "test-uuid-1234",
+  "bridgeTxMetaId": "signature",
 }
 `;
 
@@ -3233,7 +3233,7 @@ Object {
     "status": "PENDING",
   },
   "targetContractAddress": undefined,
-  "txMetaId": "test-uuid-1234",
+  "txMetaId": "signature",
 }
 `;
 
@@ -3439,7 +3439,7 @@ Object {
   "destinationTokenDecimals": 18,
   "destinationTokenSymbol": "USDC",
   "hash": "signature",
-  "id": "test-uuid-1234",
+  "id": "signature",
   "isBridgeTx": false,
   "isSolana": true,
   "networkClientId": "test-snap",
@@ -3554,7 +3554,7 @@ Object {
     "status": "PENDING",
   },
   "targetContractAddress": undefined,
-  "txMetaId": "test-uuid-1234",
+  "txMetaId": "signature",
 }
 `;
 
@@ -3681,7 +3681,6 @@ Array [
       "chain_id_source": "eip155:42161",
       "custom_slippage": true,
       "destination_transaction": "PENDING",
-      "error_message": undefined,
       "gas_included": false,
       "is_hardware_wallet": false,
       "price_impact": 0,
@@ -3727,7 +3726,7 @@ Array [
     "chain_id_source": "eip155:42161",
     "custom_slippage": true,
     "destination_transaction": "FAILED",
-    "error_message": undefined,
+    "error_message": "",
     "gas_included": false,
     "is_hardware_wallet": false,
     "price_impact": 0,
@@ -3763,7 +3762,7 @@ Array [
     "chain_id_destination": "eip155:42161",
     "chain_id_source": "eip155:42161",
     "custom_slippage": false,
-    "error_message": undefined,
+    "error_message": "",
     "gas_included": false,
     "is_hardware_wallet": false,
     "price_impact": 0,
@@ -3799,7 +3798,7 @@ Array [
       "chain_id_destination": "eip155:42161",
       "chain_id_source": "eip155:42161",
       "custom_slippage": false,
-      "error_message": undefined,
+      "error_message": "",
       "gas_included": false,
       "is_hardware_wallet": false,
       "price_impact": 0,
@@ -3846,7 +3845,7 @@ Array [
       "chain_id_source": "eip155:42161",
       "custom_slippage": true,
       "destination_transaction": "FAILED",
-      "error_message": undefined,
+      "error_message": "",
       "gas_included": false,
       "is_hardware_wallet": false,
       "price_impact": 0,
@@ -3883,7 +3882,7 @@ Array [
     "chain_id_destination": "eip155:42161",
     "chain_id_source": "eip155:42161",
     "custom_slippage": false,
-    "error_message": undefined,
+    "error_message": "",
     "gas_included": false,
     "is_hardware_wallet": false,
     "price_impact": 0,

packages/bridge-status-controller/src/bridge-status-controller.ts

@@ -229,7 +229,6 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
           this.#trackUnifiedSwapBridgeEvent(
             UnifiedSwapBridgeEventName.Completed,
             id,
-            getEVMTxPropertiesFromTransactionMeta(transactionMeta),
           );
         }
         if (type === TransactionType.bridge && !isSolanaChainId(chainId)) {

packages/bridge-status-controller/src/utils/metrics.test.ts

@@ -985,7 +985,7 @@ describe('metrics utils', () => {
     it('should return correct properties for a successful swap transaction', () => {
       const result = getEVMTxPropertiesFromTransactionMeta(mockTransactionMeta);
       expect(result).toStrictEqual({
-        error_message: undefined,
+        error_message: '',
         chain_id_source: 'eip155:1',
         chain_id_destination: 'eip155:1',
         token_symbol_source: 'ETH',
@@ -1027,7 +1027,7 @@ describe('metrics utils', () => {
       const result = getEVMTxPropertiesFromTransactionMeta(
         failedTransactionMeta,
       );
-      expect(result.error_message).toBe('Failed to finalize swap tx');
+      expect(result.error_message).toBe('Transaction failed');
       expect(result.source_transaction).toBe('FAILED');
     });
 

packages/bridge-status-controller/src/utils/metrics.ts

@@ -247,9 +247,7 @@ export const getEVMTxPropertiesFromTransactionMeta = (
     ].includes(transactionMeta.status)
       ? StatusTypes.FAILED
       : StatusTypes.COMPLETE,
-    error_message: transactionMeta.error?.message
-      ? 'Failed to finalize swap tx'
-      : undefined,
+    error_message: transactionMeta.error?.message ?? '',
     chain_id_source: formatChainIdToCaip(transactionMeta.chainId),
     chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),
     token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',

packages/bridge-status-controller/src/utils/transaction.ts

@@ -148,7 +148,7 @@ export const handleSolanaTxResponse = (
   return {
     ...getTxMetaFields(quoteResponse),
     time: Date.now(),
-    id: uuid(),
+    id: hash ?? uuid(),
     chainId: hexChainId,
     networkClientId: snapId ?? hexChainId,
     txParams: { from: selectedAccountAddress, data: quoteResponse.trade },