feat: swap transaction batching (tx type + non-stx batch support)

packages/bridge-controller/CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - **BREAKING:** Bump peer dependency `@metamask/snaps-controllers` from `^12.0.0` to `^14.0.0` ([#6035](https://github.com/MetaMask/core/pull/6035))
+- Remove `addUserOperationFromTransaction` tx submission code and constructor arg since it is unsupported ([#6057](https://github.com/MetaMask/core/pull/6057))
+- Remove @metamask/user-operation-controller dependency ([#6057](https://github.com/MetaMask/core/pull/6057))
 
 ## [34.0.0]
 

packages/bridge-status-controller/CHANGELOG.md

@@ -7,8 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `batchId` to BridgeHistoryItem to enable querying history by batchId when txId is not defined ([#6051](https://github.com/MetaMask/core/pull/6051))
+- Add optional `type` to BridgeHistoryItem to indicate the TransactionType (bridge or swap). This mitigates an edge case in which batched STX lose their TransactionType after confirmation ([#6051](https://github.com/MetaMask/core/pull/6051))
+
 ### Changed
 
+- **BREAKING** Add tx batching functionality, which requires an `addTransactionBatchFn` handler to be passed to the BridgeStatusController's constructor ([#6051](https://github.com/MetaMask/core/pull/6051))
+- **BREAKING** Make BridgeHistoryItem.txMetaId optional. Batched transactions don't immediately have a transaction ID so a transaction may be keyed using batchId until it is confirmed ([#6051](https://github.com/MetaMask/core/pull/6051))
 - **BREAKING:** Bump peer dependency `@metamask/snaps-controllers` from `^12.0.0` to `^14.0.0` ([#6035](https://github.com/MetaMask/core/pull/6035))
 
 ### Fixed

packages/bridge-status-controller/package.json

@@ -52,7 +52,6 @@
     "@metamask/keyring-api": "^18.0.0",
     "@metamask/polling-controller": "^14.0.0",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/user-operation-controller": "^37.0.0",
     "@metamask/utils": "^11.2.0",
     "bignumber.js": "^9.1.2",
     "uuid": "^8.3.2"