Skip to content

batch transactions for delegated accounts to avoid in-flight tx limit #8125

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
cloudonshore wants to merge 15 commits into
base: main
Choose a base branch
from
+336 −33
Open

batch transactions for delegated accounts to avoid in-flight tx limit #8125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
afbe131
fix: batch transactions for delegated accounts to avoid in-flight tx …
cloudonshore Mar 3, 2026
d1a7a5d
fix: handle bridge transaction types in 7702 batch matching
cloudonshore Mar 9, 2026
1155451
fix: include delegated accounts in batch history tracking
cloudonshore Mar 9, 2026
0cf12e4
test: update 7702 bridge matching test to expect correct behavior
cloudonshore Mar 9, 2026
489fd55
fix: skip undefined tx types in 7702 batch matching to prevent swap/b…
cloudonshore Mar 9, 2026
22c0af9
Merge remote-tracking branch 'upstream/main' into fix/batch-delegated…
cloudonshore Mar 9, 2026
78691b4
fix: resolve TypeScript errors in delegation check
cloudonshore Mar 9, 2026
79d5b05
fix: separate gas field logic from 7702 batching for delegated accounts
cloudonshore Mar 9, 2026
0ecd574
docs: add changelog entries for both packages
cloudonshore Mar 9, 2026
565248f
style: fix prettier formatting in transaction tests
cloudonshore Mar 9, 2026
cc67872
test: add isAtomicBatchSupported mock to submitTx tests
cloudonshore Mar 9, 2026
396f415
merge: resolve CHANGELOG conflict with main
cloudonshore Mar 10, 2026
9bef1f4
chore: fix prettier formatting on .cursor/worktrees.json
cloudonshore Mar 10, 2026
6dd0653
chore: remove mistakenly committed .cursor/worktrees.json
cloudonshore Mar 10, 2026
1197f32
chore: mark new isAtomicBatchSupported action as breaking change in c…
cloudonshore Mar 10, 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
11 changes: 11 additions & 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 @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- **BREAKING:** `BridgeStatusControllerMessenger` must now allow `TransactionController:isAtomicBatchSupported` action ([#8125](https://github.com/MetaMask/core/pull/8125))

### Fixed

- Delegated accounts (EIP-7702) now use batched transactions to avoid in-flight transaction limit ([#8125](https://github.com/MetaMask/core/pull/8125))
Copy link
Member

@micaelae micaelae Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you mark this as a breaking change since the clients will need to add the new action handler permissions?

Copy link
Author

@cloudonshore cloudonshore Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Just to double check, do you think this is the ideal pattern? I could also detect whether the account is delegated directly in bridge-status-controller (via eth_getCode) to avoid the breaking change, but didn't want the code duplication.

Copy link
Member

@micaelae micaelae Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer reusing TransactionController's handler too so this looks good to me

- Bridge transaction types now properly matched in 7702 batch path ([#8125](https://github.com/MetaMask/core/pull/8125))
- Delegated account batch transactions now recorded in bridge status history ([#8125](https://github.com/MetaMask/core/pull/8125))
- Gas fields now included for delegated account transactions that are not gas-sponsored ([#8125](https://github.com/MetaMask/core/pull/8125))

## [68.0.1]

### Changed
Expand Down
126 changes: 126 additions & 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 @@ -579,6 +579,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should call handleMobileHar
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -818,6 +827,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should delay after submitti
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0x2105",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -1057,6 +1075,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should delay after submitti
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xe708",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -1363,6 +1390,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should handle smart transac
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -1563,6 +1599,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should not call handleMobil
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -1802,6 +1847,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should not call handleMobil
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -2156,6 +2210,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should reset USDT allowance
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -2429,6 +2492,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should successfully submit
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -2688,6 +2760,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should successfully submit
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -2765,6 +2846,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should throw an error if ap
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -2839,6 +2929,15 @@ exports[`BridgeStatusController submitTx: EVM bridge should throw an error if ap
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -3132,6 +3231,15 @@ exports[`BridgeStatusController submitTx: EVM swap should handle smart transacti
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -3201,6 +3309,15 @@ exports[`BridgeStatusController submitTx: EVM swap should successfully submit an
"AccountsController:getAccountByAddress",
"0xaccount1",
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down Expand Up @@ -3411,6 +3528,15 @@ exports[`BridgeStatusController submitTx: EVM swap should successfully submit an
"usd_quoted_return": 0,
},
],
[
"TransactionController:isAtomicBatchSupported",
{
"address": "0xaccount1",
"chainIds": [
"0xa4b1",
],
},
],
[
"AccountsController:getAccountByAddress",
"0xaccount1",
Expand Down
42 changes: 36 additions & 6 deletions packages/bridge-status-controller/src/bridge-status-controller.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2538,6 +2538,7 @@ describe('BridgeStatusController', () => {
const setupEventTrackingMocks = (mockCall: jest.Mock) => {
mockCall.mockReturnValueOnce(mockSelectedAccount);
mockCall.mockImplementationOnce(jest.fn()); // track event
mockCall.mockReturnValueOnce([]); // isAtomicBatchSupported
};

const setupApprovalMocks = (mockCall: jest.Mock) => {
Expand Down Expand Up @@ -2854,7 +2855,7 @@ describe('BridgeStatusController', () => {
expect(estimateGasFeeFn).toHaveBeenCalledTimes(3);
expect(addTransactionFn).not.toHaveBeenCalled();
expect(addTransactionBatchFn).toHaveBeenCalledTimes(1);
expect(mockMessengerCall).toHaveBeenCalledTimes(9);
expect(mockMessengerCall).toHaveBeenCalledTimes(10);
});

it('should throw an error if approval tx fails', async () => {
Expand Down Expand Up @@ -3021,6 +3022,7 @@ describe('BridgeStatusController', () => {
},
});
mockMessengerCall.mockImplementationOnce(jest.fn()); // track event
mockMessengerCall.mockReturnValueOnce([]); // isAtomicBatchSupported

setupApprovalMocks(mockMessengerCall);
setupBridgeMocks(mockMessengerCall);
Expand Down Expand Up @@ -3103,6 +3105,7 @@ describe('BridgeStatusController', () => {
},
});
mockMessengerCall.mockImplementationOnce(jest.fn()); // track event
mockMessengerCall.mockReturnValueOnce([]); // isAtomicBatchSupported

setupApprovalMocks(mockMessengerCall);
setupBridgeMocks(mockMessengerCall);
Expand Down Expand Up @@ -3364,6 +3367,7 @@ describe('BridgeStatusController', () => {
const setupEventTrackingMocks = (mockCall: jest.Mock) => {
mockCall.mockReturnValueOnce(mockSelectedAccount);
mockCall.mockImplementationOnce(jest.fn()); // track event
mockCall.mockReturnValueOnce([]); // isAtomicBatchSupported
};

const setupApprovalMocks = () => {
Expand Down Expand Up @@ -3422,11 +3426,12 @@ describe('BridgeStatusController', () => {
const { approvalTxId } = controller.state.txHistory[result.id];
expect(approvalTxId).toBe('test-approval-tx-id');
expect(addTransactionFn).toHaveBeenCalledTimes(2);
expect(mockMessengerCall).toHaveBeenCalledTimes(11);
expect(mockMessengerCall).toHaveBeenCalledTimes(12);
});

it('should successfully submit an EVM swap transaction with featureId', async () => {
mockMessengerCall.mockReturnValueOnce(mockSelectedAccount);
mockMessengerCall.mockReturnValueOnce([]); // isAtomicBatchSupported
setupApprovalMocks();
setupBridgeMocks();

Expand All @@ -3450,7 +3455,7 @@ describe('BridgeStatusController', () => {
FeatureId.PERPS,
);
expect(addTransactionFn).toHaveBeenCalledTimes(2);
expect(mockMessengerCall).toHaveBeenCalledTimes(10);
expect(mockMessengerCall).toHaveBeenCalledTimes(11);
expect(mockMessengerCall.mock.calls).toMatchSnapshot();
});

Expand Down Expand Up @@ -3501,7 +3506,7 @@ describe('BridgeStatusController', () => {
expect(startPollingForBridgeTxStatusSpy).toHaveBeenCalledTimes(0);
expect(addTransactionFn).not.toHaveBeenCalled();
expect(addTransactionBatchFn).toHaveBeenCalledTimes(1);
expect(mockMessengerCall).toHaveBeenCalledTimes(6);
expect(mockMessengerCall).toHaveBeenCalledTimes(7);
});

it('should successfully submit an EVM swap transaction with no approval', async () => {
Expand Down Expand Up @@ -3729,7 +3734,7 @@ describe('BridgeStatusController', () => {
expect(estimateGasFeeFn).not.toHaveBeenCalled();
expect(addTransactionFn).not.toHaveBeenCalled();
expect(addTransactionBatchFn).not.toHaveBeenCalled();
expect(mockMessengerCall).toHaveBeenCalledTimes(4);
expect(mockMessengerCall).toHaveBeenCalledTimes(5);
});

it('should throw error if batched tx is not found', async () => {
Expand Down Expand Up @@ -3768,7 +3773,32 @@ describe('BridgeStatusController', () => {
expect(estimateGasFeeFn).toHaveBeenCalledTimes(2);
expect(addTransactionFn).not.toHaveBeenCalled();
expect(addTransactionBatchFn).toHaveBeenCalledTimes(1);
expect(mockMessengerCall).toHaveBeenCalledTimes(8);
expect(mockMessengerCall).toHaveBeenCalledTimes(9);
});

it('should gracefully handle isAtomicBatchSupported failure', async () => {
// Manually set up mocks without setupEventTrackingMocks
// to control the isAtomicBatchSupported mock
mockMessengerCall.mockReturnValueOnce(mockSelectedAccount); // getAccountByAddress
mockMessengerCall.mockImplementationOnce(jest.fn()); // track event
mockMessengerCall.mockRejectedValueOnce(
new Error('isAtomicBatchSupported failed'),
); // isAtomicBatchSupported throws
setupApprovalMocks();
setupBridgeMocks();

const { controller } = getController(mockMessengerCall);
const result = await controller.submitTx(
(mockEvmQuoteResponse.trade as TxData).from,
mockEvmQuoteResponse,
false, // STX disabled - uses non-batch path
);
controller.stopAllPolling();

// Should fall back to non-batch path when isAtomicBatchSupported throws
expect(addTransactionFn).toHaveBeenCalledTimes(2);
expect(addTransactionBatchFn).not.toHaveBeenCalled();
expect(result).toBeDefined();
});
});

Expand Down
Loading
Loading