fix(swap): restrict quotes to Dexie-supported assets and fix price calculation #835
+178
−25
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,10 +17,27 @@ import { t } from '@lingui/core/macro'; | |
| import { Trans } from '@lingui/react/macro'; | ||
| import BigNumber from 'bignumber.js'; | ||
| import { HandCoins, Handshake } from 'lucide-react'; | ||
| import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; | ||
| import { useNavigate } from 'react-router-dom'; | ||
| import { z } from 'zod'; | ||
| import { useNetwork } from '@/hooks/useNetwork'; | ||
|
|
||
| const dexieErrorResponseSchema = z.object({ | ||
| error_message: z.string().optional(), | ||
| }); | ||
|
|
||
| const dexieQuoteResponseSchema = z.object({ | ||
| quote: z.object({ | ||
| from_amount: z.union([z.number(), z.string()]), | ||
| to_amount: z.union([z.number(), z.string()]), | ||
| suggested_tx_fee: z.union([z.number(), z.string()]), | ||
| }), | ||
| }); | ||
|
|
||
| const dexieSwapTokensResponseSchema = z.object({ | ||
| tokens: z.array(z.object({ id: z.string() })), | ||
| }); | ||
|
|
||
| export function Swap() { | ||
| const walletState = useWalletState(); | ||
| const navigate = useNavigate(); | ||
|
|
@@ -29,6 +46,10 @@ export function Swap() { | |
| const { isTestnet } = useNetwork(); | ||
|
|
||
| const [ownedTokens, setOwnedTokens] = useState<TokenRecord[]>([]); | ||
| const [dexieAssetIds, setDexieAssetIds] = useState<ReadonlySet<string>>( | ||
| new Set(), | ||
| ); | ||
| const [isLoadingDexieAssets, setIsLoadingDexieAssets] = useState(true); | ||
|
|
||
| const [payAssetId, setPayAssetId] = useState<string | null | undefined>(); | ||
| const [payAmount, setPayAmount] = useState(''); | ||
|
|
@@ -40,6 +61,7 @@ export function Swap() { | |
|
|
||
| const [fee, setFee] = useState(''); | ||
| const [hasUserInputFee, setHasUserInputFee] = useState(false); | ||
| const quoteRequestId = useRef(0); | ||
|
|
||
| const [isConfirmDialogOpen, setIsConfirmDialogOpen] = useState(false); | ||
| const [isProgressDialogOpen, setIsProgressDialogOpen] = useState(false); | ||
|
|
@@ -60,8 +82,36 @@ export function Swap() { | |
| return () => clearInterval(interval); | ||
| }, [updateCats]); | ||
|
|
||
| useEffect(() => { | ||
| const controller = new AbortController(); | ||
|
|
||
| setDexieAssetIds(new Set()); | ||
| setIsLoadingDexieAssets(true); | ||
|
|
||
| getDexieSwapAssetIds(isTestnet, controller.signal) | ||
| .then(setDexieAssetIds) | ||
| .catch((error: unknown) => { | ||
| if (error instanceof DOMException && error.name === 'AbortError') | ||
| return; | ||
| addError({ | ||
| kind: 'dexie', | ||
| reason: `Failed to load supported Dexie assets: ${getErrorMessage(error)}`, | ||
| }); | ||
| }) | ||
| .finally(() => { | ||
| if (!controller.signal.aborted) setIsLoadingDexieAssets(false); | ||
| }); | ||
|
|
||
| return () => controller.abort(); | ||
| }, [addError, isTestnet]); | ||
|
|
||
| const updateReceiveAmount = useCallback( | ||
| async ( | ||
| payAssetId: string | null | undefined, | ||
| receiveAssetId: string | null | undefined, | ||
| payAmount: string, | ||
| ) => { | ||
| const requestId = ++quoteRequestId.current; | ||
| const mojoAmount = toMojos(payAmount, payAssetId === null ? 12 : 3); | ||
|
|
||
| if ( | ||
|
|
@@ -84,10 +134,12 @@ export function Swap() { | |
| isTestnet, | ||
| ); | ||
|
|
||
| if (requestId !== quoteRequestId.current) return; | ||
|
|
||
| if ('error' in quote) { | ||
| addError({ | ||
| kind: 'dexie', | ||
| reason: `Failed to get quote from Dexie: ${quote.error}`, | ||
| }); | ||
| return; | ||
| } | ||
|
|
@@ -100,11 +152,16 @@ export function Swap() { | |
| setFee(toDecimal(quote.networkFee, 12)); | ||
| } | ||
| }, | ||
| [hasUserInputFee, addError, isTestnet], | ||
| ); | ||
|
|
||
| const updatePayAmount = useCallback( | ||
| async ( | ||
| payAssetId: string | null | undefined, | ||
| receiveAssetId: string | null | undefined, | ||
| receiveAmount: string, | ||
| ) => { | ||
| const requestId = ++quoteRequestId.current; | ||
| const mojoAmount = toMojos( | ||
| receiveAmount, | ||
| receiveAssetId === null ? 12 : 3, | ||
|
|
@@ -130,10 +187,12 @@ export function Swap() { | |
| isTestnet, | ||
| ); | ||
|
|
||
| if (requestId !== quoteRequestId.current) return; | ||
|
|
||
| if ('error' in quote) { | ||
| addError({ | ||
| kind: 'dexie', | ||
| reason: `Failed to get quote from Dexie: ${quote.error}`, | ||
| }); | ||
| return; | ||
| } | ||
|
|
@@ -144,7 +203,7 @@ export function Swap() { | |
| setFee(toDecimal(quote.networkFee, 12)); | ||
| } | ||
| }, | ||
| [hasUserInputFee, addError, isTestnet], | ||
| ); | ||
|
|
||
| const offerState = useMemo<OfferState>(() => { | ||
|
|
@@ -198,13 +257,18 @@ export function Swap() { | |
| <TokenSelector | ||
| value={payAssetId} | ||
| onChange={(value) => { | ||
| const nextReceiveAssetId = | ||
| value === null ? receiveAssetId : null; | ||
| setPayAssetId(value); | ||
| if (value !== null) setReceiveAssetId(null); | ||
| updatePayAmount(value, nextReceiveAssetId, receiveAmount); | ||
|
There was a problem hiding this comment. Pair flip reuses counterpart amountHigh Severity Selecting a CAT on one side forces the other side to XCH but leaves the counterpart amount unchanged. That leftover value is then converted with XCH precision and sent to Dexie, so the new quote (and a still-enabled Swap action) is for the wrong trade. Additional Locations (1)  Reviewed by Cursor Bugbot for commit e8dad14. Configure here. |
||
| }} | ||
| className='!rounded-r-none' | ||
| hideZeroBalance={true} | ||
| showAllCats={false} | ||
| includeXch={true} | ||
| allowedAssetIds={dexieAssetIds} | ||
| isLoading={isLoadingDexieAssets} | ||
| disabled={ | ||
| receiveAssetId === undefined ? undefined : [receiveAssetId] | ||
| } | ||
|
|
@@ -217,8 +281,12 @@ export function Swap() { | |
| value={payAmount} | ||
| onChange={(e) => { | ||
| setPayAmount(e.target.value); | ||
| if (receiveAssetId !== undefined) { | ||
| updateReceiveAmount( | ||
| payAssetId, | ||
| receiveAssetId, | ||
| e.target.value, | ||
| ); | ||
| } | ||
| }} | ||
| precision={payAssetId === null ? 12 : 3} | ||
|
|
@@ -268,13 +336,17 @@ export function Swap() { | |
| <TokenSelector | ||
| value={receiveAssetId} | ||
| onChange={(value) => { | ||
| const nextPayAssetId = value === null ? payAssetId : null; | ||
| setReceiveAssetId(value); | ||
| if (value !== null) setPayAssetId(null); | ||
| updateReceiveAmount(nextPayAssetId, value, payAmount); | ||
| }} | ||
| className='!rounded-r-none' | ||
| hideZeroBalance={false} | ||
| showAllCats={true} | ||
| includeXch={true} | ||
| allowedAssetIds={dexieAssetIds} | ||
| isLoading={isLoadingDexieAssets} | ||
| disabled={payAssetId === undefined ? undefined : [payAssetId]} | ||
| /> | ||
| <div className='flex flex-grow-0'> | ||
|
|
@@ -285,8 +357,12 @@ export function Swap() { | |
| value={receiveAmount} | ||
| onChange={(e) => { | ||
| setReceiveAmount(e.target.value); | ||
| if (payAssetId !== undefined) { | ||
| updatePayAmount( | ||
| payAssetId, | ||
| receiveAssetId, | ||
| e.target.value, | ||
| ); | ||
| } | ||
| }} | ||
| precision={receiveAssetId === null ? 12 : 3} | ||
|
|
@@ -385,17 +461,66 @@ async function getDexieQuote( | |
| isTestnet, | ||
| ), | ||
| ); | ||
| const data: unknown = await response.json(); | ||
|
|
||
| if (!response.ok) { | ||
| return { | ||
| error: | ||
| getDexieErrorMessage(data) ?? | ||
| `Dexie returned HTTP ${response.status}.`, | ||
| }; | ||
| } | ||
|
|
||
| const parsed = dexieQuoteResponseSchema.safeParse(data); | ||
| if (!parsed.success) { | ||
| return { error: 'Dexie returned an invalid quote response.' }; | ||
| } | ||
|
|
||
| const quotedAmount = | ||
| amountKind === 'pay' | ||
| ? parsed.data.quote.to_amount | ||
| : parsed.data.quote.from_amount; | ||
|
|
||
| return { | ||
| amount: quotedAmount, | ||
| networkFee: parsed.data.quote.suggested_tx_fee, | ||
| }; | ||
| } catch (error: unknown) { | ||
| console.error(error); | ||
| return { error: getErrorMessage(error) }; | ||
| } | ||
| } | ||
|
|
||
| async function getDexieSwapAssetIds( | ||
| isTestnet: boolean, | ||
| signal: AbortSignal, | ||
| ): Promise<ReadonlySet<string>> { | ||
| const response = await fetch(dexieApiUrl('v1/swap/tokens', isTestnet), { | ||
| signal, | ||
| }); | ||
| const data: unknown = await response.json(); | ||
|
|
||
| if (!response.ok) { | ||
| throw new Error( | ||
| getDexieErrorMessage(data) ?? `Dexie returned HTTP ${response.status}.`, | ||
| ); | ||
| } | ||
|
|
||
| const parsed = dexieSwapTokensResponseSchema.safeParse(data); | ||
| if (!parsed.success) { | ||
| throw new Error('Dexie returned an invalid token list.'); | ||
| } | ||
|
|
||
| return new Set(parsed.data.tokens.map((token) => token.id.toLowerCase())); | ||
| } | ||
|
|
||
| function getDexieErrorMessage(data: unknown): string | null { | ||
| const parsed = dexieErrorResponseSchema.safeParse(data); | ||
| return parsed.success ? (parsed.data.error_message ?? null) : null; | ||
| } | ||
|
|
||
| function getErrorMessage(error: unknown): string { | ||
| return error instanceof Error ? error.message : String(error); | ||
| } | ||
|
|
||
| async function executeDexieSwap( | ||
|
|
||
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.
Failed token fetch blocks swaps
Medium Severity
A Dexie token-list failure leaves
dexieAssetIdsas an emptySet.TokenSelectortreats any provided set as an allow-list, so every CAT is hidden. With only XCH left and XCH disabled on the opposite selector, no valid pair can be chosen.Additional Locations (1)
src/components/selectors/TokenSelector.tsx#L75-L81Reviewed by Cursor Bugbot for commit e8dad14. Configure here.