pezkuwichain/pwap
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pwap.git synced 2026-04-23 01:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve DEX pool issues with XCM Location format and slippage calculation

Browse Source 
- Fix PoolDashboard reserve fetching (was hardcoded to 0)
- Fix slippage calculation bug in AddLiquidityModal
- Add XCM Location format support for native token (-1) in all liquidity modals
- Update KNOWN_TOKENS with correct wUSDT asset ID (1000) and add NATIVE_TOKEN_ID constant
- Implement dynamic pool discovery in fetchPools() using XCM Location parsing
- Update fetchUserLPPositions() to use correct LP token ID from chain
- Add formatAssetLocation() helper to shared/utils/dex.ts
This commit is contained in:
Kurdistan Tech Ministry
2026-02-04 20:13:26 +03:00
parent c8fcd262c8
commit 2bfbbe6d1a
7 changed files with 327 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/components/AddLiquidityModal.tsx
+4 -2
View File
@@ -104,7 +104,8 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
if (assetDetails0.isSome) {
const details0 = assetDetails0.unwrap().toJSON() as AssetDetails;
const minBalance0Raw = details0.minBalance || '0';
minBalance0 = Number(minBalance0Raw) / Math.pow(10, asset0Decimals);
const fetchedMin0 = Number(minBalance0Raw) / Math.pow(10, asset0Decimals);
minBalance0 = Math.max(fetchedMin0, 0.01); // Ensure at least 0.01
}
}
@@ -113,7 +114,8 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
if (assetDetails1.isSome) {
const details1 = assetDetails1.unwrap().toJSON() as AssetDetails;
const minBalance1Raw = details1.minBalance || '0';
minBalance1 = Number(minBalance1Raw) / Math.pow(10, asset1Decimals);
const fetchedMin1 = Number(minBalance1Raw) / Math.pow(10, asset1Decimals);
minBalance1 = Math.max(fetchedMin1, 0.01); // Ensure at least 0.01
}
}
web/src/components/PoolDashboard.tsx
+53 -9
View File
@@ -152,16 +152,60 @@ const PoolDashboard = () => {
const lpTokenData = (poolInfo as { unwrap: () => { toJSON: () => Record<string, unknown> } }).unwrap().toJSON();
const lpTokenId = lpTokenData.lpToken as number;
// For now, use a placeholder pool account
// The pool account derivation is complex with XCM locations
const poolAccount = 'Pool Account';
// Get decimals for each asset
const getAssetDecimals = (assetId: number): number => {
if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 6; // wUSDT has 6 decimals
return 12; // Native, wHEZ, PEZ have 12 decimals
};
// Get reserves - for Native token, query system.account on the pool
// For assets, query assets.account
// TODO: Properly derive pool account and fetch reserves
// For now, show the pool exists but reserves need proper implementation
const reserve0 = 0;
const reserve1 = 0;
const asset1Decimals = getAssetDecimals(asset1);
const asset2Decimals = getAssetDecimals(asset2);
// Use runtime API to get reserves via price quote
// Query the price for 1 unit to determine if pool has liquidity
let reserve0 = 0;
let reserve1 = 0;
try {
// Use quotePriceExactTokensForTokens to check pool liquidity
const oneUnit1 = BigInt(Math.pow(10, asset1Decimals));
const quote1 = await assetHubApi.call.assetConversionApi.quotePriceExactTokensForTokens(
formatAssetId(asset1),
formatAssetId(asset2),
oneUnit1.toString(),
true // include fee
);
if (quote1 && !(quote1 as { isNone?: boolean }).isNone) {
const outputForOneUnit = Number((quote1 as { unwrap: () => { toString: () => string } }).unwrap().toString());
// Calculate approximate reserves based on price
// This is an approximation - actual reserves would need pool account query
// Price = reserve1 / reserve0, so if we have the price ratio, we can estimate
const price = outputForOneUnit / Math.pow(10, asset2Decimals);
// Try to get LP token total supply to estimate pool size
const lpAssetData = await assetHubApi.query.poolAssets.asset(lpTokenId);
if ((lpAssetData as { isSome: boolean }).isSome) {
const assetInfo = (lpAssetData as { unwrap: () => { toJSON: () => Record<string, unknown> } }).unwrap().toJSON();
const totalLpSupply = Number(assetInfo.supply) / 1e12;
// Estimate reserves: LP supply is approximately sqrt(reserve0 * reserve1)
// With known price ratio, we can solve for individual reserves
// reserve0 * reserve1 = lpSupply^2
// reserve1 / reserve0 = price
// Therefore: reserve0 = lpSupply / sqrt(price), reserve1 = lpSupply * sqrt(price)
if (price > 0 && totalLpSupply > 0) {
const sqrtPrice = Math.sqrt(price);
reserve0 = totalLpSupply / sqrtPrice;
reserve1 = totalLpSupply * sqrtPrice;
}
}
}
} catch (err) {
if (import.meta.env.DEV) console.warn('Could not fetch reserves via runtime API:', err);
}
const poolAccount = 'Pool Account (derived)';
setPoolData({
asset0: asset1,
web/src/components/RemoveLiquidityModal.tsx
+19 -2
View File
@@ -7,6 +7,19 @@ import { Button } from '@/components/ui/button';
import { Alert, AlertDescription } from '@/components/ui/alert';
import { ASSET_IDS, getAssetSymbol } from '@pezkuwi/lib/wallet';
// Native token ID constant (relay chain HEZ)
const NATIVE_TOKEN_ID = -1;
// Helper to convert asset ID to XCM Location format for assetConversion pallet
const formatAssetLocation = (id: number) => {
if (id === NATIVE_TOKEN_ID) {
// Native token from relay chain
return { parents: 1, interior: 'Here' };
}
// Asset on Asset Hub - XCM location format with PalletInstance 50 (assets pallet)
return { parents: 0, interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: id }] } };
};
// Helper to get display name for tokens
const getDisplayTokenName = (assetId: number): string => {
if (assetId === -1) return 'HEZ'; // Native HEZ from relay chain
@@ -158,10 +171,14 @@ export const RemoveLiquidityModal: React.FC<RemoveLiquidityModalProps> = ({
const minAsset0BN = (expectedAsset0BN * BigInt(95)) / BigInt(100);
const minAsset1BN = (expectedAsset1BN * BigInt(95)) / BigInt(100);
// Use XCM Location format for assets (required for native token support)
const asset0Location = formatAssetLocation(asset0);
const asset1Location = formatAssetLocation(asset1);
// Remove liquidity transaction
const removeLiquidityTx = assetHubApi.tx.assetConversion.removeLiquidity(
asset0,
asset1,
asset0Location,
asset1Location,
lpToRemoveBN.toString(),
minAsset0BN.toString(),
minAsset1BN.toString(),
web/src/components/dex/AddLiquidityModal.tsx
+22 -5
View File
@@ -3,9 +3,19 @@ import { usePezkuwi } from '@/contexts/PezkuwiContext';
import { useWallet } from '@/contexts/WalletContext';
import { X, Plus, AlertCircle, Loader2, CheckCircle, Info } from 'lucide-react';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { PoolInfo } from '@/types/dex';
import { PoolInfo, NATIVE_TOKEN_ID } from '@/types/dex';
import { parseTokenInput, formatTokenBalance, quote } from '@pezkuwi/utils/dex';
// Helper to convert asset ID to XCM Location format for assetConversion pallet
const formatAssetLocation = (id: number) => {
if (id === NATIVE_TOKEN_ID) {
// Native token from relay chain
return { parents: 1, interior: 'Here' };
}
// Asset on Asset Hub - XCM location format with PalletInstance 50 (assets pallet)
return { parents: 0, interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: id }] } };
};
interface AddLiquidityModalProps {
isOpen: boolean;
pool: PoolInfo | null;
@@ -140,16 +150,23 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
const amount2Raw = parseTokenInput(amount2Input, pool.asset2Decimals);
// Calculate minimum amounts with slippage tolerance
const minAmount1 = (BigInt(amount1Raw) * BigInt(100 - slippage * 100)) / BigInt(10000);
const minAmount2 = (BigInt(amount2Raw) * BigInt(100 - slippage * 100)) / BigInt(10000);
// Formula: minAmount = amount * (100 - slippage%) / 100
// For 1% slippage: minAmount = amount * 99 / 100
const slippageBasisPoints = Math.floor(slippage * 100); // Convert percentage to basis points
const minAmount1 = (BigInt(amount1Raw) * BigInt(10000 - slippageBasisPoints)) / BigInt(10000);
const minAmount2 = (BigInt(amount2Raw) * BigInt(10000 - slippageBasisPoints)) / BigInt(10000);
try {
setTxStatus('signing');
setErrorMessage('');
// Use XCM Location format for assets (required for native token support)
const asset1Location = formatAssetLocation(pool.asset1);
const asset2Location = formatAssetLocation(pool.asset2);
const tx = assetHubApi.tx.assetConversion.addLiquidity(
pool.asset1,
pool.asset2,
asset1Location,
asset2Location,
amount1Raw,
amount2Raw,
minAmount1.toString(),
web/src/components/dex/RemoveLiquidityModal.tsx
+27 -8
View File
@@ -3,9 +3,19 @@ import { usePezkuwi } from '@/contexts/PezkuwiContext';
import { useWallet } from '@/contexts/WalletContext';
import { X, Minus, AlertCircle, Loader2, CheckCircle, Info } from 'lucide-react';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { PoolInfo } from '@/types/dex';
import { PoolInfo, NATIVE_TOKEN_ID } from '@/types/dex';
import { formatTokenBalance } from '@pezkuwi/utils/dex';
// Helper to convert asset ID to XCM Location format for assetConversion pallet
const formatAssetLocation = (id: number) => {
if (id === NATIVE_TOKEN_ID) {
// Native token from relay chain
return { parents: 1, interior: 'Here' };
}
// Asset on Asset Hub - XCM location format with PalletInstance 50 (assets pallet)
return { parents: 0, interior: { X2: [{ PalletInstance: 50 }, { GeneralIndex: id }] } };
};
interface RemoveLiquidityModalProps {
isOpen: boolean;
pool: PoolInfo | null;
@@ -47,10 +57,12 @@ export const RemoveLiquidityModal: React.FC<RemoveLiquidityModalProps> = ({
if (!assetHubApi || !isAssetHubReady || !account || !pool) return;
try {
// Get pool account
// Get pool account using XCM Location format
const asset1Location = formatAssetLocation(pool.asset1);
const asset2Location = formatAssetLocation(pool.asset2);
const poolAccount = await assetHubApi.query.assetConversion.pools([
pool.asset1,
pool.asset2,
asset1Location,
asset2Location,
]);
if (poolAccount.isNone) {
@@ -113,16 +125,23 @@ export const RemoveLiquidityModal: React.FC<RemoveLiquidityModalProps> = ({
const { amount1, amount2 } = calculateOutputAmounts();
// Calculate minimum amounts with slippage tolerance
const minAmount1 = (BigInt(amount1) * BigInt(100 - slippage * 100)) / BigInt(10000);
const minAmount2 = (BigInt(amount2) * BigInt(100 - slippage * 100)) / BigInt(10000);
// Formula: minAmount = amount * (100 - slippage%) / 100
// For 1% slippage: minAmount = amount * 99 / 100
const slippageBasisPoints = Math.floor(slippage * 100); // Convert percentage to basis points
const minAmount1 = (BigInt(amount1) * BigInt(10000 - slippageBasisPoints)) / BigInt(10000);
const minAmount2 = (BigInt(amount2) * BigInt(10000 - slippageBasisPoints)) / BigInt(10000);
try {
setTxStatus('signing');
setErrorMessage('');
// Use XCM Location format for assets (required for native token support)
const asset1Location = formatAssetLocation(pool.asset1);
const asset2Location = formatAssetLocation(pool.asset2);
const tx = assetHubApi.tx.assetConversion.removeLiquidity(
pool.asset1,
pool.asset2,
asset1Location,
asset2Location,
lpAmount.toString(),
minAmount1.toString(),
minAmount2.toString(),