fix: improvement in dapp swap functionality #38627
Open
+164
−70
Conversation
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
jpuri
added
team-confirmations
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
jpuri
commented
Dec 8, 2025
| data, | ||
| V4_BASE_ACTIONS_ABI_DEFINITION, | ||
| ); | ||
| const parsedResult = parseV4ExactIn(result[0]); |
Contributor
Author
There was a problem hiding this comment.
For srcTokenAddress and srcTokenAmount values from first swap command get precedence for destTokenAddress and destTokenAmount values from last swap command get precedence.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Bug: Duplicate swap commands process wrong input data
When there are duplicate swap commands of the same type (e.g., two V3_SWAP_EXACT_OUT '01' commands in sequence like ['04', '00', '01', '01']), the swapCommands array will contain duplicates. The forEach loop iterates over each duplicate, but getCommandData uses findIndex which always returns the index of the first occurrence. This means the second '01' command will incorrectly process inputs[2] again instead of inputs[3], causing wrong token amounts and addresses to be computed for multi-hop swaps with repeated command types.
shared/modules/dapp-swap-comparison/dapp-swap-command-utils.ts#L556-L570
shared/modules/dapp-swap-comparison/dapp-swap-command-utils.ts#L231-L234
There was a problem hiding this comment.
Bug: Duplicate swap commands only process first occurrence's data
When processing duplicate swap commands (e.g., two V3_SWAP_EXACT_IN commands in sequence), the getCommandData function uses findIndex which always returns the index of the first occurrence of that command type. Combined with iterating over filtered commands that preserves duplicates, this means duplicate commands will all process the same input data from the first occurrence, ignoring subsequent commands' actual input data. For example, with commands ['00', '00'], both iterations would use inputs[0] and inputs[1] would never be processed, potentially resulting in incorrect token amounts or addresses.
shared/modules/dapp-swap-comparison/dapp-swap-command-utils.ts#L556-L570
shared/modules/dapp-swap-comparison/dapp-swap-command-utils.ts#L231-L238
Collaborator
Builds ready [fe93b5f]
UI Startup Metrics (1263 ± 83 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [42e6f84]
UI Startup Metrics (1251 ± 101 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [9472034]
UI Startup Metrics (1257 ± 79 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [91f660d]
UI Startup Metrics (1351 ± 116 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Dapp swap comparison: adding support for mode different command types.
Changelog
CHANGELOG entry:
Related issues
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/6393
Manual testing steps
NA
Screenshots/Recordings
NA
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Adds support for parsing multiple sequential swap commands with validation and refactors decoding to map inputs by index while adjusting field precedence for amountMin and token/amount selection.
shared/modules/dapp-swap-comparison/dapp-swap-command-utils.ts):validateSwapCommandsto require at least one swap and enforce sequential swap commands; invoked ingetCommandValues.getGenericValuesto iteratecommandBytesand readinputsby index; accept merged{...SwapCommands, ...NonSwapCommands}; remove one-swap restriction.getCommandDatahelper.amountMinwhere available.quotesInput, prefer existingsrcTokenAmount/srcTokenAddressand prefer decodeddestTokenAddress(fallbacks retained).||and cachedminimumAmount).shared/modules/dapp-swap-comparison/dapp-swap-command-utils.test.ts):Written by Cursor Bugbot for commit 91f660d. This will update automatically on new commits. Configure here.