Skip to content

feat(bridge-status): add polling for Tron same-chain swaps #7697

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

Draft
ghgoodreau wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

feat(bridge-status): add polling for Tron same-chain swaps #7697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6726887
feat(bridge-status): add polling for Tron same-chain swaps
ghgoodreau Jan 22, 2026
1da7003
fix: handle Tron same-chain swap polling and metrics
ghgoodreau Jan 22, 2026
5d38b1a
changelog
ghgoodreau Jan 22, 2026
5509578
fix: changelog
ghgoodreau Jan 23, 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
4 changes: 4 additions & 0 deletions packages/bridge-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Export `isTronChainId` from the package entrypoint ([#7697](https://github.com/MetaMask/core/pull/7697))

## [64.7.0]

### Changed
Expand Down
1 change: 1 addition & 0 deletions packages/bridge-controller/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export {
isNativeAddress,
isSolanaChainId,
isBitcoinChainId,
isTronChainId,
isNonEvmChainId,
getNativeAssetForChainId,
getDefaultBridgeControllerState,
Expand Down
4 changes: 4 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 @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Bump `@metamask/bridge-controller` from `^64.5.1` to `^64.7.0` ([#7667](https://github.com/MetaMask/core/pull/7667), [#7672](https://github.com/MetaMask/core/pull/7672), [#7694](https://github.com/MetaMask/core/pull/7694))

### Fixed

- Fix Tron same-chain swap polling and Completed event tracking ([#7697](https://github.com/MetaMask/core/pull/7697))

## [64.4.3]

### Changed
Expand Down
7 changes: 0 additions & 7 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 @@ -4609,13 +4609,6 @@ Array [
"snapId": "npm:@metamask/tron-snap",
},
],
Array [
"AccountsController:getAccountByAddress",
"TRX123...",
],
Array [
"TransactionController:getState",
],
]
`;

Expand Down
4 changes: 2 additions & 2 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 @@ -2275,8 +2275,8 @@ describe('BridgeStatusController', () => {

expect(mockMessengerCall.mock.calls).toMatchSnapshot();
expect(result).toMatchSnapshot();
// Swaps don't start polling (only bridges do)
expect(startPollingForBridgeTxStatusSpy).toHaveBeenCalledTimes(0);
// Tron swaps start polling for async settlement
expect(startPollingForBridgeTxStatusSpy).toHaveBeenCalledTimes(1);
expect(controller.state.txHistory[result.id]).toMatchSnapshot();
});

Expand Down
44 changes: 26 additions & 18 deletions packages/bridge-status-controller/src/bridge-status-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
UnifiedSwapBridgeEventName,
formatChainIdToCaip,
isCrossChain,
isTronChainId,
isEvmTxData,
isHardwareWallet,
MetricsActionType,
Expand Down Expand Up @@ -362,13 +363,8 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
}
});

// Restart polling if it was stopped and this is a bridge transaction
const isBridgeTx = isCrossChain(
historyItem.quote.srcChainId,
historyItem.quote.destChainId,
);

if (isBridgeTx) {
// Restart polling if it was stopped and this tx still needs status updates
if (this.#shouldPollHistoryItem(historyItem, targetTxMetaId)) {
// Check if polling was stopped (no active polling token)
const existingPollingToken =
this.#pollingTokensByTxMetaId[targetTxMetaId];
Expand Down Expand Up @@ -412,13 +408,9 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
this.#pollingTokensByTxMetaId[historyItem.txMetaId];
return !pollingToken;
})
// Swap txs don't need to have their statuses polled
// Only restart polling for items that still require status updates
.filter((historyItem) => {
const isBridgeTx = isCrossChain(
historyItem.quote.srcChainId,
historyItem.quote.destChainId,
);
return isBridgeTx;
return this.#shouldPollHistoryItem(historyItem, historyItem.txMetaId);
});

incompleteHistoryItems.forEach((historyItem) => {
Expand Down Expand Up @@ -507,16 +499,30 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
if (!txHistoryItem) {
return;
}
const { quote } = txHistoryItem;
const isIntent = txId.startsWith('intent:');
const isBridgeTx = isCrossChain(quote.srcChainId, quote.destChainId);
if (isBridgeTx || isIntent) {
if (this.#shouldPollHistoryItem(txHistoryItem, txId)) {
this.#pollingTokensByTxMetaId[txId] = this.startPolling({
bridgeTxMetaId: txId,
});
}
};

readonly #shouldPollHistoryItem = (
historyItem: BridgeHistoryItem,
txMetaId: string,
): boolean => {
const isIntent = txMetaId.startsWith('intent:');
const isBridgeTx = isCrossChain(
historyItem.quote.srcChainId,
historyItem.quote.destChainId,
);

// Tron same-chain swaps use async settlement and need polling
const isTronSameChainSwap =
!isBridgeTx && !isIntent && isTronChainId(historyItem.quote.srcChainId);
Comment on lines +519 to +521
Copy link
Member

@micaelae micaelae Jan 23, 2026

Choose a reason for hiding this comment

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

Polling needs to be done for Tron bridge txs too so this should just check for isTronChainId


return isBridgeTx || isIntent || isTronSameChainSwap;
};

/**
* @deprecated For EVM/Solana swap/bridge txs we add tx to history in submitTx()
* For Solana swap/bridge we start polling in submitTx()
Expand Down Expand Up @@ -1390,6 +1396,8 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
quoteResponse.quote.srcChainId,
quoteResponse.quote.destChainId,
);
const isTronSameChainSwap =
!isBridgeTx && isTronChainId(quoteResponse.quote.srcChainId);

// Submit non-EVM tx (Solana, BTC, Tron)
if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
Expand Down Expand Up @@ -1570,7 +1578,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
// Start polling for bridge tx status
this.#startPollingForTxId(txMeta.id);
// Track non-EVM Swap completed event
if (!isBridgeTx) {
if (!isBridgeTx && !isTronSameChainSwap) {
Copy link
Member

@micaelae micaelae Jan 23, 2026

Choose a reason for hiding this comment

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

Same here - both swaps and bridges will be polled so the Completed event can't be published until we get a txStatus

Suggested change
if (!isBridgeTx && !isTronSameChainSwap) {
if (!(isBridgeTx || isTronTx)) {

this.#trackUnifiedSwapBridgeEvent(
UnifiedSwapBridgeEventName.Completed,
txMeta.id,
Expand Down