Skip to content

refactor: unify submitTx and submitIntent #8257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micaelae wants to merge 11 commits into
base: main
Choose a base branch
from
Open

refactor: unify submitTx and submitIntent #8257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ee6619
feat: implement new submission flows
micaelae Mar 19, 2026
f6ec410
feat: use submission flows in controller
micaelae Mar 19, 2026
ba94710
chore: rename
micaelae Mar 23, 2026
761a5ee
fix: comments
micaelae Apr 7, 2026
e97bc41
chore: move tx data validation
micaelae Apr 7, 2026
8f243cc
chore: specify history keys
micaelae Apr 7, 2026
babd6f6
refactor: gasless params
micaelae Apr 7, 2026
d709ae9
fix: unit tests
micaelae Apr 9, 2026
cc89a81
Merge branch 'main' into swaps4229-submitTx-strategy-refactor
micaelae Apr 9, 2026
ff4e75c
fix: lint error
micaelae Apr 9, 2026
5b79bb8
chore: changelog
micaelae Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions eslint-suppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,11 +774,6 @@
"count": 3
}
},
"packages/bridge-status-controller/src/utils/transaction.ts": {
"no-restricted-syntax": {
"count": 4
}
},
"packages/chain-agnostic-permission/src/caip25Permission.ts": {
"@typescript-eslint/explicit-function-return-type": {
"count": 11
Expand Down
1 change: 1 addition & 0 deletions packages/bridge-status-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Refactor tx submission into strategies to reduce quote-specific branching in the controller, and to de-duplicate shared logic between `submitTx` and `submitIntent`. Each strategy yields payloads that the controller uses to update history, poll, and publish metrics ([#8257](https://github.com/MetaMask/core/pull/8257))
- Bump `@metamask/accounts-controller` from `^37.1.1` to `^37.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363))
- Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363))
- Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373))
Expand Down
7 changes: 6 additions & 1 deletion packages/bridge-status-controller/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ module.exports = merge(baseConfig, {

coverageProvider: 'v8',

coveragePathIgnorePatterns: ['.*/index\\.ts', '.*-method-action-types\\.ts'],
coveragePathIgnorePatterns: [
...baseConfig.coveragePathIgnorePatterns,
'.*/strategy/types\\.ts$',
'.*/index\\.ts',
'.*-method-action-types\\.ts',
],

// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
Expand Down
1 change: 1 addition & 0 deletions packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3859,6 +3859,7 @@ exports[`BridgeStatusController submitTx: EVM swap should handle smart transacti
"requireApproval": false,
"transactions": [
{
"assetsFiatValues": undefined,
"params": {
"data": "0xapprovalData",
"from": "0xaccount1",
Expand Down
2 changes: 0 additions & 2 deletions packages/bridge-status-controller/src/bridge-status-controller.intent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,7 @@ describe('BridgeStatusController (intent swaps)', () => {
"chainId": "0x1",
"hash": undefined,
"id": "intentDisplayTxId1",
"isIntentTx": true,
"networkClientId": "network-client-id-1",
"orderUid": "order-uid-approve-1",
"status": "submitted",
"time": 1773879217428,
"txParams": {
Expand Down
Loading
Loading