fix: source amount calculation ignores fee asset - #9831
Merged
Conversation
micaelae
marked this pull request as ready for review
August 12, 2026 02:21
micaelae
enabled auto-merge
August 12, 2026 02:30
infiniteflower
approved these changes
Aug 12, 2026
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
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.
Explanation
The initial
toQuoteResponseV2assumes that themetabridgefee is always paid in the src asset. This causes the src amount to be incorrect when the amounts are added up (srcTokenAmount + fees)Changes
assetIdsMatchutil, which does a case-insensitive comparison of EVM assetIds and case-sensitive comparison for non-EVMsrc.amountReferences
Fixes https://consensyssoftware.atlassian.net/browse/SWAPS-4930
Checklist
Note
Medium Risk
Touches quote amount coercion and sent/adjusted-return calculations shown to users; logic is localized but wrong matching would still misstate balances.
Overview
Fixes incorrect source amounts when V1 quotes are coerced to V2 by only rolling tx and metabridge fees into
src.amountwhen the fee’sassetIdmatches the source asset (via newassetIdsMatch).Adds and exports
assetIdsMatch: exact match for non-EVM CAIP IDs; for EIP-155, compares case-insensitively. Replaces ad hoc.toLowerCase()comparisons insumAmounts,calcSentAmount,calcIncludedTxFees, andcalcAdjustedReturnso fee/asset alignment stays consistent across coercion and metadata math.Reviewed by Cursor Bugbot for commit d9aa779. Bugbot is set up for automated code reviews on this repo. Configure here.