refactor: Completed final cleanup and resolved local changes before push

2026-04-26 01:47:58 +00:00 · 2025-11-21 07:28:47 +03:00
parent c8b3007449
commit 60a32a325e
20 changed files with 389 additions and 35 deletions
@@ -30,7 +30,7 @@ interface Balances {
 const getDisplayName = (assetId: number): string => {
  if (assetId === ASSET_IDS.WHEZ || assetId === 0) return 'HEZ';
  if (assetId === ASSET_IDS.PEZ || assetId === 1) return 'PEZ';
-  if (assetId === ASSET_IDS.WUSDT || assetId === 2) return 'USDT';
+  if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 'USDT';
  return getAssetSymbol(assetId);
 };

@@ -38,13 +38,13 @@ const getDisplayName = (assetId: number): string => {
 const getBalanceKey = (assetId: number): string => {
  if (assetId === ASSET_IDS.WHEZ || assetId === 0) return 'HEZ';
  if (assetId === ASSET_IDS.PEZ || assetId === 1) return 'PEZ';
-  if (assetId === ASSET_IDS.WUSDT || assetId === 2) return 'USDT';
+  if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 'USDT';
  return getAssetSymbol(assetId);
 };

 // Helper to get decimals for asset
 const getAssetDecimals = (assetId: number): number => {
-  if (assetId === ASSET_IDS.WUSDT || assetId === 2) return 6; // wUSDT has 6 decimals
+  if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 6; // wUSDT has 6 decimals
  return 12; // wHEZ, PEZ have 12 decimals
 };

@@ -16,7 +16,7 @@ import { RemoveLiquidityModal } from '@/components/RemoveLiquidityModal';
 const getDisplayTokenName = (assetId: number): string => {
  if (assetId === ASSET_IDS.WHEZ || assetId === 0) return 'HEZ';
  if (assetId === ASSET_IDS.PEZ || assetId === 1) return 'PEZ';
-  if (assetId === ASSET_IDS.WUSDT || assetId === 2) return 'USDT';
+  if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 'USDT';
  return getAssetSymbol(assetId); // Fallback for other assets
 };

@@ -11,7 +11,7 @@ import { ASSET_IDS, getAssetSymbol } from '@pezkuwi/lib/wallet';
 const getDisplayTokenName = (assetId: number): string => {
  if (assetId === ASSET_IDS.WHEZ || assetId === 0) return 'HEZ';
  if (assetId === ASSET_IDS.PEZ || assetId === 1) return 'PEZ';
-  if (assetId === ASSET_IDS.WUSDT || assetId === 2) return 'USDT';
+  if (assetId === ASSET_IDS.WUSDT || assetId === 1000) return 'USDT';
  return getAssetSymbol(assetId);
 };

@@ -18,7 +18,7 @@ import { PriceChart } from './trading/PriceChart';
 const AVAILABLE_TOKENS = [
  { symbol: 'HEZ', emoji: '🟡', assetId: 0, name: 'HEZ', badge: true, displaySymbol: 'HEZ' },
  { symbol: 'PEZ', emoji: '🟣', assetId: 1, name: 'PEZ', badge: true, displaySymbol: 'PEZ' },
-  { symbol: 'USDT', emoji: '💵', assetId: 2, name: 'USDT', badge: true, displaySymbol: 'USDT' },
+  { symbol: 'USDT', emoji: '💵', assetId: 1000, name: 'USDT', badge: true, displaySymbol: 'USDT' },
 ] as const;

 const TokenSwap = () => {
@@ -182,7 +182,7 @@ const TokenSwap = () => {
        const getPoolAssetId = (token: string) => {
          if (token === 'HEZ') return 0; // wHEZ
          if (token === 'PEZ') return 1;
-          if (token === 'USDT') return 2;
+          if (token === 'USDT') return 1000;
          return ASSET_IDS[token as keyof typeof ASSET_IDS];
        };

@@ -271,9 +271,9 @@ const TokenSwap = () => {
              // Use correct decimals for each asset
              // asset1=0 (wHEZ): 12 decimals
              // asset1=1 (PEZ): 12 decimals
-              // asset2=2 (wUSDT): 6 decimals
-              const decimals0 = asset1 === 2 ? 6 : 12; // asset1 is the smaller ID
-              const decimals1 = asset2 === 2 ? 6 : 12; // asset2 is the larger ID
+              // asset2=1000 (wUSDT): 6 decimals
+              const decimals0 = asset1 === 1000 ? 6 : 12; // asset1 is the smaller ID
+              const decimals1 = asset2 === 1000 ? 6 : 12; // asset2 is the larger ID

              const reserve0 = Number(BigInt(balance0Hex)) / (10 ** decimals0);
              const reserve1 = Number(BigInt(balance1Hex)) / (10 ** decimals1);
@@ -581,7 +581,7 @@ const TokenSwap = () => {
        // HEZ → Any Asset: wrap(HEZ→wHEZ) then swap(wHEZ→Asset)
        const wrapTx = api.tx.tokenWrapper.wrap(amountIn.toString());
        // Map token symbol to asset ID
-        const toAssetId = toToken === 'PEZ' ? 1 : toToken === 'USDT' ? 2 : ASSET_IDS[toToken as keyof typeof ASSET_IDS];
+        const toAssetId = toToken === 'PEZ' ? 1 : toToken === 'USDT' ? 1000 : ASSET_IDS[toToken as keyof typeof ASSET_IDS];
        const swapPath = [0, toAssetId]; // wHEZ → target asset
        const swapTx = api.tx.assetConversion.swapExactTokensForTokens(
          swapPath,
@@ -595,7 +595,7 @@ const TokenSwap = () => {
      } else if (toToken === 'HEZ') {
        // Any Asset → HEZ: swap(Asset→wHEZ) then unwrap(wHEZ→HEZ)
        // Map token symbol to asset ID
-        const fromAssetId = fromToken === 'PEZ' ? 1 : fromToken === 'USDT' ? 2 : ASSET_IDS[fromToken as keyof typeof ASSET_IDS];
+        const fromAssetId = fromToken === 'PEZ' ? 1 : fromToken === 'USDT' ? 1000 : ASSET_IDS[fromToken as keyof typeof ASSET_IDS];
        const swapPath = [fromAssetId, 0]; // source asset → wHEZ
        const swapTx = api.tx.assetConversion.swapExactTokensForTokens(
          swapPath,
@@ -610,8 +610,8 @@ const TokenSwap = () => {
      } else {
        // Direct swap between assets (PEZ ↔ USDT, etc.)
        // Map token symbols to asset IDs
-        const fromAssetId = fromToken === 'PEZ' ? 1 : fromToken === 'USDT' ? 2 : ASSET_IDS[fromToken as keyof typeof ASSET_IDS];
-        const toAssetId = toToken === 'PEZ' ? 1 : toToken === 'USDT' ? 2 : ASSET_IDS[toToken as keyof typeof ASSET_IDS];
+        const fromAssetId = fromToken === 'PEZ' ? 1 : fromToken === 'USDT' ? 1000 : ASSET_IDS[fromToken as keyof typeof ASSET_IDS];
+        const toAssetId = toToken === 'PEZ' ? 1 : toToken === 'USDT' ? 1000 : ASSET_IDS[toToken as keyof typeof ASSET_IDS];
        const swapPath = [fromAssetId, toAssetId];

        tx = api.tx.assetConversion.swapExactTokensForTokens(
@@ -48,7 +48,7 @@ interface Token {
 const TOKENS: Token[] = [
  { symbol: 'HEZ', name: 'Hez Token', decimals: 12, color: 'from-green-600 to-yellow-400' },
  { symbol: 'PEZ', name: 'Pez Token', assetId: 1, decimals: 12, color: 'from-blue-600 to-purple-400' },
-  { symbol: 'USDT', name: 'Tether USD', assetId: 2, decimals: 6, color: 'from-green-500 to-green-600' },
+  { symbol: 'USDT', name: 'Tether USD', assetId: 1000, decimals: 6, color: 'from-green-500 to-green-600' },
  { symbol: 'BTC', name: 'Bitcoin', assetId: 3, decimals: 8, color: 'from-orange-500 to-yellow-500' },
  { symbol: 'ETH', name: 'Ethereum', assetId: 4, decimals: 18, color: 'from-purple-500 to-blue-500' },
  { symbol: 'DOT', name: 'Polkadot', assetId: 5, decimals: 10, color: 'from-pink-500 to-red-500' },
@@ -72,7 +72,7 @@ export const TransferModal: React.FC<TransferModalProps> = ({ isOpen, onClose, s
    assetId: selectedAsset.assetId,
    decimals: selectedAsset.decimals,
    color: selectedAsset.assetId === 0 ? 'from-green-600 to-yellow-400' :
-           selectedAsset.assetId === 2 ? 'from-emerald-500 to-teal-500' :
+           selectedAsset.assetId === 1000 ? 'from-emerald-500 to-teal-500' :
           'from-cyan-500 to-blue-500',
  } : TOKENS.find(t => t.symbol === selectedToken) || TOKENS[0];

@@ -1,23 +1,27 @@
 import React, { useState } from 'react';
 // import { useNavigate } from 'react-router-dom';
 import { useWallet } from '@/contexts/WalletContext';
+import { usePolkadot } from '@/contexts/PolkadotContext';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import TokenSwap from '@/components/TokenSwap';
 import PoolDashboard from '@/components/PoolDashboard';
 import { CreatePoolModal } from './CreatePoolModal';
 import { InitializeHezPoolModal } from './InitializeHezPoolModal';
+import { InitializeUsdtModal } from './InitializeUsdtModal';
 import { ArrowRightLeft, Droplet, Settings } from 'lucide-react';
 import { isFounderWallet } from '@pezkuwi/utils/auth';

 export const DEXDashboard: React.FC = () => {
  const { account } = useWallet();
+  const { sudoKey } = usePolkadot();
  const [activeTab, setActiveTab] = useState('swap');

  // Admin modal states
  const [showCreatePoolModal, setShowCreatePoolModal] = useState(false);
  const [showInitializeHezPoolModal, setShowInitializeHezPoolModal] = useState(false);
+  const [showInitializeUsdtModal, setShowInitializeUsdtModal] = useState(false);

-  const isFounder = account ? isFounderWallet(account) : false;
+  const isFounder = account ? isFounderWallet(account, sudoKey) : false;

  const handleCreatePool = () => {
    setShowCreatePoolModal(true);
@@ -26,6 +30,7 @@ export const DEXDashboard: React.FC = () => {
  const handleModalClose = () => {
    setShowCreatePoolModal(false);
    setShowInitializeHezPoolModal(false);
+    setShowInitializeUsdtModal(false);
  };

  const handleSuccess = async () => {
@@ -116,6 +121,19 @@ export const DEXDashboard: React.FC = () => {
                    </button>
                  </div>

+                  <div className="p-6 bg-gray-900 border border-green-900/30 rounded-lg">
+                    <h3 className="text-xl font-bold text-white mb-2">USDT Token Minting</h3>
+                    <p className="text-gray-400 mb-6">
+                      Mint wUSDT tokens for testing and liquidity provision
+                    </p>
+                    <button
+                      onClick={() => setShowInitializeUsdtModal(true)}
+                      className="w-full px-6 py-3 bg-green-600 hover:bg-green-700 text-white rounded-lg transition-colors font-medium"
+                    >
+                      Mint wUSDT
+                    </button>
+                  </div>
+
                  <div className="p-6 bg-gray-900 border border-gray-800 rounded-lg">
                    <h3 className="text-xl font-bold text-white mb-2">Pool Management</h3>
                    <p className="text-gray-400 mb-6">
@@ -154,6 +172,12 @@ export const DEXDashboard: React.FC = () => {
        onClose={handleModalClose}
        onSuccess={handleSuccess}
      />
+
+      <InitializeUsdtModal
+        isOpen={showInitializeUsdtModal}
+        onClose={handleModalClose}
+        onSuccess={handleSuccess}
+      />
    </div>
  );
 };
@@ -0,0 +1,300 @@
+import React, { useState, useEffect } from 'react';
+import { usePolkadot } from '@/contexts/PolkadotContext';
+import { useWallet } from '@/contexts/WalletContext';
+import { X, AlertCircle, Loader2, CheckCircle, Info } from 'lucide-react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { useToast } from '@/hooks/use-toast';
+import { ASSET_IDS, ASSET_CONFIGS } from '../../../shared/lib/wallet';
+
+interface InitializeUsdtModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSuccess?: () => void;
+}
+
+type TransactionStatus = 'idle' | 'signing' | 'submitting' | 'success' | 'error';
+
+const USDT_ASSET_ID = 1000; // wUSDT asset ID (matches runtime WUSDT_ASSET_ID)
+const USDT_DECIMALS = 6; // USDT standard decimals
+
+export const InitializeUsdtModal: React.FC<InitializeUsdtModalProps> = ({
+  isOpen,
+  onClose,
+  onSuccess,
+}) => {
+  const { api, isApiReady } = usePolkadot();
+  const { account, signer } = useWallet();
+  const { toast } = useToast();
+
+  const [usdtAmount, setUsdtAmount] = useState('10000');
+
+  const [wusdtBalance, setWusdtBalance] = useState<string>('0');
+
+  const [txStatus, setTxStatus] = useState<TransactionStatus>('idle');
+  const [errorMessage, setErrorMessage] = useState<string>('');
+
+  // Reset form when modal closes
+  useEffect(() => {
+    if (!isOpen) {
+      setUsdtAmount('10000');
+      setTxStatus('idle');
+      setErrorMessage('');
+    }
+  }, [isOpen]);
+
+  // Fetch wUSDT balance
+  useEffect(() => {
+    const fetchBalance = async () => {
+      if (!api || !isApiReady || !account) return;
+
+      try {
+        // wUSDT balance (asset 2)
+        const wusdtData = await api.query.assets.account(USDT_ASSET_ID, account);
+        setWusdtBalance(wusdtData.isSome ? wusdtData.unwrap().balance.toString() : '0');
+      } catch (error) {
+        if (import.meta.env.DEV) console.error('Failed to fetch wUSDT balance:', error);
+      }
+    };
+
+    fetchBalance();
+  }, [api, isApiReady, account]);
+
+  const handleMint = async () => {
+    if (!api || !isApiReady || !signer || !account) {
+      toast({
+        title: 'Error',
+        description: 'Please connect your wallet',
+        variant: 'destructive',
+      });
+      return;
+    }
+
+    const usdtAmountRaw = BigInt(parseFloat(usdtAmount) * 10 ** USDT_DECIMALS);
+
+    if (usdtAmountRaw <= BigInt(0)) {
+      setErrorMessage('Amount must be greater than zero');
+      return;
+    }
+
+    setTxStatus('signing');
+    setErrorMessage('');
+
+    try {
+      if (import.meta.env.DEV) console.log('💵 Minting wUSDT...', {
+        usdtAmount,
+        usdtAmountRaw: usdtAmountRaw.toString(),
+        assetId: USDT_ASSET_ID,
+      });
+
+      const mintTx = api.tx.assets.mint(USDT_ASSET_ID, account, usdtAmountRaw.toString());
+
+      setTxStatus('submitting');
+
+      await mintTx.signAndSend(
+        account,
+        { signer },
+        ({ status, dispatchError, events }) => {
+          if (import.meta.env.DEV) console.log('📦 Transaction status:', status.type);
+
+          if (status.isInBlock) {
+            if (import.meta.env.DEV) console.log('✅ In block:', status.asInBlock.toHex());
+
+            if (dispatchError) {
+              let errorMsg = '';
+
+              if (dispatchError.isModule) {
+                const decoded = api.registry.findMetaError(dispatchError.asModule);
+                errorMsg = `${decoded.section}.${decoded.name}: ${decoded.docs.join(' ')}`;
+                if (import.meta.env.DEV) console.error('❌ Module error:', errorMsg);
+              } else {
+                errorMsg = dispatchError.toString();
+                if (import.meta.env.DEV) console.error('❌ Dispatch error:', errorMsg);
+              }
+
+              setErrorMessage(errorMsg);
+              setTxStatus('error');
+              toast({
+                title: 'Transaction Failed',
+                description: errorMsg,
+                variant: 'destructive',
+              });
+            } else {
+              if (import.meta.env.DEV) console.log('✅ Mint successful!');
+              if (import.meta.env.DEV) console.log('📋 Events:', events.map(e => e.event.method).join(', '));
+              setTxStatus('success');
+              toast({
+                title: 'Success!',
+                description: `Successfully minted ${usdtAmount} wUSDT`,
+              });
+              setTimeout(() => {
+                onSuccess?.();
+                onClose();
+              }, 2000);
+            }
+          }
+        }
+      );
+    } catch (error) {
+      if (import.meta.env.DEV) console.error('Mint failed:', error);
+      setErrorMessage(error instanceof Error ? error.message : 'Transaction failed');
+      setTxStatus('error');
+      toast({
+        title: 'Error',
+        description: error instanceof Error ? error.message : 'Mint failed',
+        variant: 'destructive',
+      });
+    }
+  };
+
+  if (!isOpen) return null;
+
+  const wusdtBalanceDisplay = (parseFloat(wusdtBalance) / 10 ** USDT_DECIMALS).toFixed(2);
+
+  return (
+    <div className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4">
+      <Card className="bg-gray-900 border-gray-800 max-w-lg w-full max-h-[90vh] overflow-y-auto">
+        <CardHeader className="border-b border-gray-800">
+          <div className="flex items-center justify-between">
+            <CardTitle className="text-xl font-bold text-white">
+              Mint wUSDT Tokens
+            </CardTitle>
+            <button
+              onClick={onClose}
+              className="text-gray-400 hover:text-white transition-colors"
+              disabled={txStatus === 'signing' || txStatus === 'submitting'}
+            >
+              <X className="w-5 h-5" />
+            </button>
+          </div>
+          <Badge className="bg-green-600/20 text-green-400 border-green-600/30 w-fit mt-2">
+            Admin Only - Token Minting
+          </Badge>
+        </CardHeader>
+
+        <CardContent className="space-y-6 pt-6">
+          {/* Info Banner */}
+          <Alert className="bg-green-500/10 border-green-500/30">
+            <Info className="h-4 w-4 text-green-400" />
+            <AlertDescription className="text-green-300 text-sm">
+              Mint wUSDT (Wrapped USDT) tokens for testing and liquidity pool creation.
+              Use responsibly!
+            </AlertDescription>
+          </Alert>
+
+          {/* USDT Amount */}
+          <div className="space-y-2">
+            <div className="flex items-center justify-between">
+              <label className="text-sm text-gray-400">wUSDT Amount</label>
+              <span className="text-xs text-gray-500">
+                Current: {wusdtBalanceDisplay} wUSDT
+              </span>
+            </div>
+            <div className="relative">
+              <Input
+                type="number"
+                value={usdtAmount}
+                onChange={(e) => setUsdtAmount(e.target.value)}
+                placeholder="10000"
+                className="w-full px-4 py-3 bg-gray-800 border border-gray-700 rounded-lg text-white text-lg"
+                disabled={txStatus === 'signing' || txStatus === 'submitting'}
+              />
+              <div className="absolute right-3 top-1/2 -translate-y-1/2 flex gap-2">
+                <button
+                  onClick={() => setUsdtAmount('10000')}
+                  className="px-3 py-1 bg-green-600/20 hover:bg-green-600/30 text-green-400 text-xs rounded border border-green-600/30 transition-colors"
+                  disabled={txStatus === 'signing' || txStatus === 'submitting'}
+                >
+                  10K
+                </button>
+                <button
+                  onClick={() => setUsdtAmount('100000')}
+                  className="px-3 py-1 bg-green-600/20 hover:bg-green-600/30 text-green-400 text-xs rounded border border-green-600/30 transition-colors"
+                  disabled={txStatus === 'signing' || txStatus === 'submitting'}
+                >
+                  100K
+                </button>
+              </div>
+            </div>
+            <p className="text-xs text-gray-500">
+              💡 wUSDT has 6 decimals (same as real USDT)
+            </p>
+          </div>
+
+          {/* Current wUSDT Balance */}
+          <div className="p-4 bg-gray-800/50 rounded-lg border border-gray-700">
+            <div className="text-sm text-gray-400 mb-1">Current wUSDT Balance</div>
+            <div className="text-2xl font-bold text-green-400 font-mono">
+              {wusdtBalanceDisplay} wUSDT
+            </div>
+          </div>
+
+          {/* Error Message */}
+          {errorMessage && (
+            <Alert className="bg-red-500/10 border-red-500/30">
+              <AlertCircle className="h-4 w-4 text-red-400" />
+              <AlertDescription className="text-red-300 text-sm">
+                {errorMessage}
+              </AlertDescription>
+            </Alert>
+          )}
+
+          {/* Success Message */}
+          {txStatus === 'success' && (
+            <Alert className="bg-green-500/10 border-green-500/30">
+              <CheckCircle className="h-4 w-4 text-green-400" />
+              <AlertDescription className="text-green-300 text-sm">
+                Successfully minted {usdtAmount} wUSDT!
+              </AlertDescription>
+            </Alert>
+          )}
+
+          {/* Action Buttons */}
+          <div className="flex gap-3 pt-4">
+            <Button
+              onClick={onClose}
+              variant="outline"
+              className="flex-1 border-gray-700 hover:bg-gray-800"
+              disabled={txStatus === 'signing' || txStatus === 'submitting'}
+            >
+              Cancel
+            </Button>
+            <Button
+              onClick={handleMint}
+              className="flex-1 bg-green-600 hover:bg-green-700"
+              disabled={
+                txStatus === 'signing' ||
+                txStatus === 'submitting' ||
+                txStatus === 'success'
+              }
+            >
+              {txStatus === 'signing' && (
+                <>
+                  <Loader2 className="w-4 h-4 animate-spin mr-2" />
+                  Signing...
+                </>
+              )}
+              {txStatus === 'submitting' && (
+                <>
+                  <Loader2 className="w-4 h-4 animate-spin mr-2" />
+                  Minting...
+                </>
+              )}
+              {txStatus === 'idle' && 'Mint wUSDT'}
+              {txStatus === 'error' && 'Retry'}
+              {txStatus === 'success' && (
+                <>
+                  <CheckCircle className="w-4 h-4 mr-2" />
+                  Success
+                </>
+              )}
+            </Button>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+};
@@ -28,7 +28,7 @@ type TransactionStatus = 'idle' | 'signing' | 'submitting' | 'success' | 'error'
 const USER_TOKENS = [
  { symbol: 'HEZ', emoji: '🟡', assetId: 0, name: 'HEZ', decimals: 12, displaySymbol: 'HEZ' }, // actually wHEZ (asset 0)
  { symbol: 'PEZ', emoji: '🟣', assetId: 1, name: 'PEZ', decimals: 12, displaySymbol: 'PEZ' },
-  { symbol: 'USDT', emoji: '💵', assetId: 2, name: 'USDT', decimals: 6, displaySymbol: 'USDT' },
+  { symbol: 'USDT', emoji: '💵', assetId: 1000, name: 'USDT', decimals: 6, displaySymbol: 'USDT' },
 ] as const;

 export const SwapInterface: React.FC<SwapInterfaceProps> = ({ pools }) => {