pezkuwichain/pwap
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pwap.git synced 2026-04-22 11:18:01 +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 f9089aaba5
commit ddaa39653d
7 changed files with 327 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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(),