Repository navigation
feat(bridge-status-controller): pass swap asset ids to Tron, Solana, and Bitcoin snap requests #10775
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,10 @@ import { | |
| extractTradeData, | ||
| formatChainIdToCaip, | ||
| formatChainIdToHex, | ||
| isBitcoinChainId, | ||
| isCrossChain, | ||
| isSolanaChainId, | ||
| isStellarChainId, | ||
| isTronTrade, | ||
| } from '@metamask/bridge-controller'; | ||
| import { SnapController } from '@metamask/snaps-controllers'; | ||
|
|
@@ -91,10 +93,11 @@ export const getClientRequest = ( | |
|
|
||
| let options: Record<string, unknown> | undefined; | ||
|
|
||
| if ( | ||
| isStellarChainId(srcChainId) || | ||
| isSolanaChainId(srcChainId) || | ||
| isBitcoinChainId(srcChainId) | ||
| ) { | ||
| if (sourceAssetId !== undefined || destAssetId !== undefined) { | ||
| options = { | ||
| ...(sourceAssetId !== undefined && { | ||
|
|
@@ -108,10 +111,15 @@ export const getClientRequest = ( | |
| } | ||
|
|
||
| if (isTronTrade(trade)) { | ||
| options = { | ||
| visible: trade.visible, | ||
| type: trade.raw_data?.contract?.[0]?.type, | ||
| ...(sourceAssetId !== undefined && { | ||
| sourceAssetId, | ||
| }), | ||
| ...(destAssetId !== undefined && { | ||
| destAssetId, | ||
| }), | ||
|
Battambang marked this conversation as resolved.
Copilot marked this conversation as resolved.
Comment on lines
+117
to
+122
Contributor
Author
There was a problem hiding this comment.
MetaMask/internal-snaps#434: feat(tron): classify swap, bridge, and send transactions in analytics
|
||
| }; | ||
| } | ||
|
|
||
|
|
@@ -254,27 +262,33 @@ export const handleNonEvmTxResponse = ( | |
| * @param trade - The trade data (can be approval or main trade) | ||
| * @param quoteResponse - The quote response containing metadata | ||
| * @param selectedAccount - The account to submit the transaction for | ||
| * @param isApproval - Whether the trade is the approval transaction rather than the main trade | ||
| * @returns The transaction meta | ||
| */ | ||
| export const handleNonEvmTx = async ( | ||
| messenger: BridgeStatusControllerMessenger, | ||
| trade: Trade, | ||
| quoteResponse: QuoteResponseV1<Trade, Trade> & QuoteMetadata, | ||
| selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string], | ||
| isApproval = false, | ||
| ): Promise<TransactionMeta> => { | ||
| if (!selectedAccount.metadata?.snap?.id) { | ||
| throw new Error( | ||
| 'Failed to submit cross-chain swap transaction: undefined snap id', | ||
| ); | ||
| } | ||
|
|
||
| // The quote's asset ids describe the swap/bridge transaction, not the token | ||
| // approval that precedes it. Passing them for the approval would make the snap | ||
| // classify the approval as a swap or a bridge, so they are only attached to | ||
| // the main trade. | ||
| const request = getClientRequest( | ||
| trade, | ||
| quoteResponse.quote.srcChainId, | ||
| selectedAccount.id, | ||
| selectedAccount.metadata?.snap?.id, | ||
| isApproval ? undefined : quoteResponse.quote.srcAsset.assetId, | ||
| isApproval ? undefined : quoteResponse.quote.destAsset.assetId, | ||
| ); | ||
| const requestResponse = (await messenger.call( | ||
| 'SnapController:handleRequest', | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why
srcChainIdinstead oftradeTwo reasons: consistency, and the trade shape does not always tell you the chain.
1. The trade shape is a lossy proxy for the chain
The strategy layer establishes that trade shape maps 1:1 to chain, but note the Stellar case in
strategy/index.ts:A Stellar trade is either a
stringor an{ xdr / xdrBase64 }object. SoisStellarTrade(trade)isfalsefor a string-shaped Stellar trade, and that string is indistinguishable from a Solana trade by shape alone. The chain id is the only reliable signal for Stellar-vs-Solana strings, which is exactly why the original Solana check usedisSolanaChainId(srcChainId)(there is noisSolanaTrade).2. Consistency: one condition, one kind of check
Before, the condition mixed two kinds of check:
getClientRequestalready hassrcChainIdin scope (it derivesscopefrom it on the first line), so using chain guards for all three makes the condition uniform:3. It is also slightly more accurate
isStellarChainIdaccepts both pubnet and testnet (XlmScope.Pubnet/XlmScope.Testnet), whereasisStellarTradeonly reflects the payload shape.Behavior equivalence
isStellarTrade-> trueisStellarChainId-> trueisStellarTrade-> falseisStellarChainId-> trueisSolanaChainId-> trueisSolanaChainId-> trueisBitcoinTrade-> trueisBitcoinChainId-> trueThe only behavioral difference is the string-shaped Stellar case, where the new version is correct and the old one would have silently omitted the asset ids.