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

fix: migrate remaining DEX components to Asset Hub API

Browse Source 
- Update dex/AddLiquidityModal to use assetHubApi
- Update dex/PoolBrowser to use assetHubApi
- Update dex/SwapInterface to use assetHubApi
- Update dex/XCMBridgeSetupModal to use assetHubApi
- Fix all dependency array references
This commit is contained in:
Kurdistan Tech Ministry
2026-02-04 15:04:25 +03:00
parent 9b66f355f5
commit 7bfa47edd0
4 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/components/dex/AddLiquidityModal.tsx
+9 -8
View File
@@ -21,7 +21,8 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
onClose, onClose,
onSuccess, onSuccess,
}) => { }) => {
const { api, isApiReady } = usePezkuwi(); // Use Asset Hub API for DEX operations
const { assetHubApi, isAssetHubReady } = usePezkuwi();
const { account, signer } = useWallet(); const { account, signer } = useWallet();
const [amount1Input, setAmount1Input] = useState(''); const [amount1Input, setAmount1Input] = useState('');
@@ -47,11 +48,11 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
// Fetch balances // Fetch balances
useEffect(() => { useEffect(() => {
const fetchBalances = async () => { const fetchBalances = async () => {
if (!api || !isApiReady || !account || !pool) return; if (!assetHubApi || !isAssetHubReady || !account || !pool) return;
try { try {
const balance1Data = await api.query.assets.account(pool.asset1, account); const balance1Data = await assetHubApi.query.assets.account(pool.asset1, account);
const balance2Data = await api.query.assets.account(pool.asset2, account); const balance2Data = await assetHubApi.query.assets.account(pool.asset2, account);
setBalance1(balance1Data.isSome ? balance1Data.unwrap().balance.toString() : '0'); setBalance1(balance1Data.isSome ? balance1Data.unwrap().balance.toString() : '0');
setBalance2(balance2Data.isSome ? balance2Data.unwrap().balance.toString() : '0'); setBalance2(balance2Data.isSome ? balance2Data.unwrap().balance.toString() : '0');
@@ -61,7 +62,7 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
}; };
fetchBalances(); fetchBalances();
}, [api, isApiReady, account, pool]); }, [assetHubApi, isAssetHubReady, account, pool]);
// Auto-calculate amount2 when amount1 changes // Auto-calculate amount2 when amount1 changes
const handleAmount1Change = (value: string) => { const handleAmount1Change = (value: string) => {
@@ -124,7 +125,7 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
}; };
const handleAddLiquidity = async () => { const handleAddLiquidity = async () => {
if (!api || !isApiReady || !signer || !account || !pool) { if (!assetHubApi || !isAssetHubReady || !signer || !account || !pool) {
setErrorMessage('Wallet not connected'); setErrorMessage('Wallet not connected');
return; return;
} }
@@ -146,7 +147,7 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
setTxStatus('signing'); setTxStatus('signing');
setErrorMessage(''); setErrorMessage('');
const tx = api.tx.assetConversion.addLiquidity( const tx = assetHubApi.tx.assetConversion.addLiquidity(
pool.asset1, pool.asset1,
pool.asset2, pool.asset2,
amount1Raw, amount1Raw,
@@ -165,7 +166,7 @@ export const AddLiquidityModal: React.FC<AddLiquidityModalProps> = ({
if (status.isInBlock) { if (status.isInBlock) {
if (dispatchError) { if (dispatchError) {
if (dispatchError.isModule) { if (dispatchError.isModule) {
const decoded = api.registry.findMetaError(dispatchError.asModule); const decoded = assetHubApi.registry.findMetaError(dispatchError.asModule);
setErrorMessage(`${decoded.section}.${decoded.name}: ${decoded.docs}`); setErrorMessage(`${decoded.section}.${decoded.name}: ${decoded.docs}`);
} else { } else {
setErrorMessage(dispatchError.toString()); setErrorMessage(dispatchError.toString());
web/src/components/dex/PoolBrowser.tsx
+5 -4
View File
@@ -22,7 +22,8 @@ export const PoolBrowser: React.FC<PoolBrowserProps> = ({
onSwap, onSwap,
onCreatePool, onCreatePool,
}) => { }) => {
const { api, isApiReady, sudoKey } = usePezkuwi(); // Use Asset Hub API for DEX operations
const { assetHubApi, isAssetHubReady, sudoKey } = usePezkuwi();
const { account } = useWallet(); const { account } = useWallet();
const [pools, setPools] = useState<PoolInfo[]>([]); const [pools, setPools] = useState<PoolInfo[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@@ -32,11 +33,11 @@ export const PoolBrowser: React.FC<PoolBrowserProps> = ({
useEffect(() => { useEffect(() => {
const loadPools = async () => { const loadPools = async () => {
if (!api || !isApiReady) return; if (!assetHubApi || !isAssetHubReady) return;
try { try {
setLoading(true); setLoading(true);
const poolsData = await fetchPools(api); const poolsData = await fetchPools(assetHubApi);
setPools(poolsData); setPools(poolsData);
} catch (error) { } catch (error) {
if (import.meta.env.DEV) console.error('Failed to load pools:', error); if (import.meta.env.DEV) console.error('Failed to load pools:', error);
@@ -50,7 +51,7 @@ export const PoolBrowser: React.FC<PoolBrowserProps> = ({
// Refresh pools every 10 seconds // Refresh pools every 10 seconds
const interval = setInterval(loadPools, 10000); const interval = setInterval(loadPools, 10000);
return () => clearInterval(interval); return () => clearInterval(interval);
}, [api, isApiReady]); }, [assetHubApi, isAssetHubReady]);
const filteredPools = pools.filter((pool) => { const filteredPools = pools.filter((pool) => {
if (!searchTerm) return true; if (!searchTerm) return true;
web/src/components/dex/SwapInterface.tsx
+23 -22
View File
@@ -32,7 +32,8 @@ const USER_TOKENS = [
] as const; ] as const;
export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => { export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
const { api, isApiReady } = usePezkuwi(); // Use Asset Hub API for DEX operations
const { assetHubApi, isAssetHubReady } = usePezkuwi();
const { account, signer } = useWallet(); const { account, signer } = useWallet();
const { toast } = useToast(); const { toast } = useToast();
@@ -73,12 +74,12 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
// Fetch balances // Fetch balances
useEffect(() => { useEffect(() => {
const fetchBalances = async () => { const fetchBalances = async () => {
if (!api || !isApiReady || !account) return; if (!assetHubApi || !isAssetHubReady || !account) return;
// For HEZ, fetch native balance (not wHEZ asset balance) // For HEZ, fetch native balance (not wHEZ asset balance)
if (fromToken === 'HEZ') { if (fromToken === 'HEZ') {
try { try {
const balance = await api.query.system.account(account); const balance = await assetHubApi.query.system.account(account);
const freeBalance = balance.data.free.toString(); const freeBalance = balance.data.free.toString();
setFromBalance(freeBalance); setFromBalance(freeBalance);
} catch (error) { } catch (error) {
@@ -87,7 +88,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
} }
} else if (fromAssetId !== null) { } else if (fromAssetId !== null) {
try { try {
const balanceData = await api.query.assets.account(fromAssetId, account); const balanceData = await assetHubApi.query.assets.account(fromAssetId, account);
setFromBalance(balanceData.isSome ? balanceData.unwrap().balance.toString() : '0'); setFromBalance(balanceData.isSome ? balanceData.unwrap().balance.toString() : '0');
} catch (error) { } catch (error) {
if (import.meta.env.DEV) console.error('Failed to fetch from balance:', error); if (import.meta.env.DEV) console.error('Failed to fetch from balance:', error);
@@ -98,7 +99,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
// For HEZ, fetch native balance // For HEZ, fetch native balance
if (toToken === 'HEZ') { if (toToken === 'HEZ') {
try { try {
const balance = await api.query.system.account(account); const balance = await assetHubApi.query.system.account(account);
const freeBalance = balance.data.free.toString(); const freeBalance = balance.data.free.toString();
setToBalance(freeBalance); setToBalance(freeBalance);
} catch (error) { } catch (error) {
@@ -107,7 +108,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
} }
} else if (toAssetId !== null) { } else if (toAssetId !== null) {
try { try {
const balanceData = await api.query.assets.account(toAssetId, account); const balanceData = await assetHubApi.query.assets.account(toAssetId, account);
setToBalance(balanceData.isSome ? balanceData.unwrap().balance.toString() : '0'); setToBalance(balanceData.isSome ? balanceData.unwrap().balance.toString() : '0');
} catch (error) { } catch (error) {
if (import.meta.env.DEV) console.error('Failed to fetch to balance:', error); if (import.meta.env.DEV) console.error('Failed to fetch to balance:', error);
@@ -117,7 +118,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
}; };
fetchBalances(); fetchBalances();
}, [api, isApiReady, account, fromToken, toToken, fromAssetId, toAssetId]); }, [assetHubApi, isAssetHubReady, account, fromToken, toToken, fromAssetId, toAssetId]);
// Calculate output amount when input changes // Calculate output amount when input changes
useEffect(() => { useEffect(() => {
@@ -188,7 +189,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
}; };
const handleConfirmSwap = async () => { const handleConfirmSwap = async () => {
if (!api || !signer || !account || !fromTokenInfo || !toTokenInfo) { if (!assetHubApi || !signer || !account || !fromTokenInfo || !toTokenInfo) {
toast({ toast({
title: 'Error', title: 'Error',
description: 'Please connect your wallet', description: 'Please connect your wallet',
@@ -228,55 +229,55 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
if (fromToken === 'HEZ' && toToken === 'PEZ') { if (fromToken === 'HEZ' && toToken === 'PEZ') {
// HEZ → PEZ: wrap(HEZ→wHEZ) then swap(wHEZ→PEZ) // HEZ → PEZ: wrap(HEZ→wHEZ) then swap(wHEZ→PEZ)
const wrapTx = api.tx.tokenWrapper.wrap(amountIn.toString()); const wrapTx = assetHubApi.tx.tokenWrapper.wrap(amountIn.toString());
const swapTx = api.tx.assetConversion.swapExactTokensForTokens( const swapTx = assetHubApi.tx.assetConversion.swapExactTokensForTokens(
[0, 1], // wHEZ → PEZ [0, 1], // wHEZ → PEZ
amountIn.toString(), amountIn.toString(),
minAmountOut.toString(), minAmountOut.toString(),
account, account,
true true
); );
tx = api.tx.utility.batchAll([wrapTx, swapTx]); tx = assetHubApi.tx.utility.batchAll([wrapTx, swapTx]);
} else if (fromToken === 'PEZ' && toToken === 'HEZ') { } else if (fromToken === 'PEZ' && toToken === 'HEZ') {
// PEZ → HEZ: swap(PEZ→wHEZ) then unwrap(wHEZ→HEZ) // PEZ → HEZ: swap(PEZ→wHEZ) then unwrap(wHEZ→HEZ)
const swapTx = api.tx.assetConversion.swapExactTokensForTokens( const swapTx = assetHubApi.tx.assetConversion.swapExactTokensForTokens(
[1, 0], // PEZ → wHEZ [1, 0], // PEZ → wHEZ
amountIn.toString(), amountIn.toString(),
minAmountOut.toString(), minAmountOut.toString(),
account, account,
true true
); );
const unwrapTx = api.tx.tokenWrapper.unwrap(minAmountOut.toString()); const unwrapTx = assetHubApi.tx.tokenWrapper.unwrap(minAmountOut.toString());
tx = api.tx.utility.batchAll([swapTx, unwrapTx]); tx = assetHubApi.tx.utility.batchAll([swapTx, unwrapTx]);
} else if (fromToken === 'HEZ') { } else if (fromToken === 'HEZ') {
// HEZ → Any Asset: wrap(HEZ→wHEZ) then swap(wHEZ→Asset) // HEZ → Any Asset: wrap(HEZ→wHEZ) then swap(wHEZ→Asset)
const wrapTx = api.tx.tokenWrapper.wrap(amountIn.toString()); const wrapTx = assetHubApi.tx.tokenWrapper.wrap(amountIn.toString());
const swapTx = api.tx.assetConversion.swapExactTokensForTokens( const swapTx = assetHubApi.tx.assetConversion.swapExactTokensForTokens(
[0, toAssetId!], // wHEZ → target asset [0, toAssetId!], // wHEZ → target asset
amountIn.toString(), amountIn.toString(),
minAmountOut.toString(), minAmountOut.toString(),
account, account,
true true
); );
tx = api.tx.utility.batchAll([wrapTx, swapTx]); tx = assetHubApi.tx.utility.batchAll([wrapTx, swapTx]);
} else if (toToken === 'HEZ') { } else if (toToken === 'HEZ') {
// Any Asset → HEZ: swap(Asset→wHEZ) then unwrap(wHEZ→HEZ) // Any Asset → HEZ: swap(Asset→wHEZ) then unwrap(wHEZ→HEZ)
const swapTx = api.tx.assetConversion.swapExactTokensForTokens( const swapTx = assetHubApi.tx.assetConversion.swapExactTokensForTokens(
[fromAssetId!, 0], // source asset → wHEZ [fromAssetId!, 0], // source asset → wHEZ
amountIn.toString(), amountIn.toString(),
minAmountOut.toString(), minAmountOut.toString(),
account, account,
true true
); );
const unwrapTx = api.tx.tokenWrapper.unwrap(minAmountOut.toString()); const unwrapTx = assetHubApi.tx.tokenWrapper.unwrap(minAmountOut.toString());
tx = api.tx.utility.batchAll([swapTx, unwrapTx]); tx = assetHubApi.tx.utility.batchAll([swapTx, unwrapTx]);
} else { } else {
// Direct swap between assets (PEZ ↔ USDT, etc.) // Direct swap between assets (PEZ ↔ USDT, etc.)
tx = api.tx.assetConversion.swapExactTokensForTokens( tx = assetHubApi.tx.assetConversion.swapExactTokensForTokens(
[fromAssetId!, toAssetId!], [fromAssetId!, toAssetId!],
amountIn.toString(), amountIn.toString(),
minAmountOut.toString(), minAmountOut.toString(),
@@ -294,7 +295,7 @@ export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {
if (status.isInBlock) { if (status.isInBlock) {
if (dispatchError) { if (dispatchError) {
if (dispatchError.isModule) { if (dispatchError.isModule) {
const decoded = api.registry.findMetaError(dispatchError.asModule); const decoded = assetHubApi.registry.findMetaError(dispatchError.asModule);
setErrorMessage(`${decoded.section}.${decoded.name}: ${decoded.docs}`); setErrorMessage(`${decoded.section}.${decoded.name}: ${decoded.docs}`);
} else { } else {
setErrorMessage(dispatchError.toString()); setErrorMessage(dispatchError.toString());
web/src/components/dex/XCMBridgeSetupModal.tsx
+8 -7
View File
@@ -34,7 +34,8 @@ export const XCMBridgeSetupModal: React.FC<XCMBridgeSetupModalProps> = ({
onClose, onClose,
onSuccess, onSuccess,
}) => { }) => {
const { api, isApiReady } = usePezkuwi(); // Use Asset Hub API for DEX operations
const { assetHubApi, isAssetHubReady } = usePezkuwi();
const { account, signer } = useWallet(); const { account, signer } = useWallet();
const { toast } = useToast(); const { toast } = useToast();
@@ -52,7 +53,7 @@ export const XCMBridgeSetupModal: React.FC<XCMBridgeSetupModalProps> = ({
* Perform initial status check * Perform initial status check
*/ */
const performInitialCheck = useCallback(async () => { const performInitialCheck = useCallback(async () => {
if (!api || !isApiReady) return; if (!assetHubApi || !isAssetHubReady) return;
setStep('checking'); setStep('checking');
setStatusMessage('Checking bridge status...'); setStatusMessage('Checking bridge status...');
@@ -75,7 +76,7 @@ export const XCMBridgeSetupModal: React.FC<XCMBridgeSetupModalProps> = ({
setErrorMessage(error instanceof Error ? error.message : 'Status check failed'); setErrorMessage(error instanceof Error ? error.message : 'Status check failed');
setStep('error'); setStep('error');
} }
}, [api, isApiReady]); }, [assetHubApi, isAssetHubReady]);
// Reset when modal opens/closes // Reset when modal opens/closes
useEffect(() => { useEffect(() => {
@@ -86,17 +87,17 @@ export const XCMBridgeSetupModal: React.FC<XCMBridgeSetupModalProps> = ({
setShowPoolCreation(false); setShowPoolCreation(false);
} else { } else {
// Auto-check status when opened // Auto-check status when opened
if (api && isApiReady && account) { if (assetHubApi && isAssetHubReady && account) {
performInitialCheck(); performInitialCheck();
} }
} }
}, [isOpen, api, isApiReady, account, performInitialCheck]); }, [isOpen, assetHubApi, isAssetHubReady, account, performInitialCheck]);
/** /**
* Configure XCM bridge * Configure XCM bridge
*/ */
const handleConfigureBridge = async () => { const handleConfigureBridge = async () => {
if (!api || !isApiReady || !signer || !account) { if (!assetHubApi || !isAssetHubReady || !signer || !account) {
toast({ toast({
title: 'Error', title: 'Error',
description: 'Please connect your wallet', description: 'Please connect your wallet',
@@ -142,7 +143,7 @@ export const XCMBridgeSetupModal: React.FC<XCMBridgeSetupModalProps> = ({
* Create wUSDT/HEZ pool * Create wUSDT/HEZ pool
*/ */
const handleCreatePool = async () => { const handleCreatePool = async () => {
if (!api || !isApiReady || !signer || !account) { if (!assetHubApi || !isAssetHubReady || !signer || !account) {
toast({ toast({
title: 'Error', title: 'Error',
description: 'Please connect your wallet', description: 'Please connect your wallet',