Revert "Merge branch 'feat/cardano' of https://github.com/AIQUANT-Tech/gateway into feat/cardano"

This reverts commit 17a5b9b, reversing
changes made to 6f3affc.

Author: AIQUANT7

src/chains/cardano/cardano.ts

@@ -436,15 +436,6 @@ export class Cardano {
     }
   }
 
-  public async getTokenByAddress(tokenAddress: string): Promise<CardanoToken | undefined> {
-    const token = this.tokenList.find((token: CardanoToken) => {
-      const splitAddress = token.address.split('.').join('');
-      const splitTokenAddress = tokenAddress.split('.').join('');
-      return splitTokenAddress === splitAddress;
-    });
-    return token;
-  }
-
   async close() {
     if (this._chain in Cardano._instances) {
       delete Cardano._instances[this._chain];

src/connectors/minswap/amm-routes/addLiquidity.ts

@@ -2,8 +2,6 @@ import { TxComplete } from '@aiquant/lucid-cardano';
 import { calculateDeposit, Dex } from '@aiquant/minswap-sdk';
 import { FastifyPluginAsync } from 'fastify';
 
-import { CardanoToken } from '#src/tokens/types';
-
 import {
   AddLiquidityRequestType,
   AddLiquidityRequest,
@@ -20,8 +18,8 @@ async function addLiquidity(
   network: string,
   walletAddress: string,
   poolAddress: string,
-  baseToken: CardanoToken,
-  quoteToken: CardanoToken,
+  baseToken: string,
+  quoteToken: string,
   baseTokenAmount: number,
   quoteTokenAmount: number,
   slippagePct?: number, // decimal, e.g. 0.01 for 1%
@@ -159,18 +157,8 @@ export const addLiquidityRoute: FastifyPluginAsync = async (fastify) => {
 
         const poolInfo = await minswap.getAmmPoolInfo(reqPool);
 
-        const baseTokenAddress = poolInfo.baseTokenAddress;
-        // console.log('baseTokenAddress', baseTokenAddress);
-
-        const quoteTokenAddress = poolInfo.quoteTokenAddress;
-        // console.log('quoteTokenAddress', quoteTokenAddress);
-
-        // Find token symbol from token address
-        const baseToken = await minswap.cardano.getTokenByAddress(baseTokenAddress);
-        // console.log('baseToken', baseToken);
-
-        const quoteToken = await minswap.cardano.getTokenByAddress(quoteTokenAddress);
-        // console.log('quoteToken', quoteToken);
+        const baseToken = poolInfo.baseTokenAddress;
+        const quoteToken = poolInfo.quoteTokenAddress;
 
         return await addLiquidity(
           fastify,

src/connectors/minswap/amm-routes/quoteLiquidity.ts

@@ -16,8 +16,8 @@ import { formatTokenAmount } from '../minswap.utils';
 export async function getMinswapAmmLiquidityQuote(
   network: string,
   poolAddress?: string,
-  baseToken?: CardanoToken,
-  quoteToken?: CardanoToken,
+  baseToken?: string,
+  quoteToken?: string,
   baseTokenAmount?: number,
   quoteTokenAmount?: number,
   _slippagePct?: number,
@@ -45,10 +45,16 @@ export async function getMinswapAmmLiquidityQuote(
 
   const minswap = await Minswap.getInstance(networkToUse);
 
+  const baseTokenObj = minswap.cardano.getTokenBySymbol(baseToken);
+  const quoteTokenObj = minswap.cardano.getTokenBySymbol(quoteToken);
+  if (!baseTokenObj || !quoteTokenObj) {
+    throw new Error(`Token not found: ${!baseTokenObj ? baseToken : quoteToken}`);
+  }
+
   let poolAddressToUse = poolAddress;
   let existingPool = true;
   if (!poolAddressToUse) {
-    poolAddressToUse = await minswap.findDefaultPool(baseToken.symbol, quoteToken.symbol, 'amm');
+    poolAddressToUse = await minswap.findDefaultPool(baseToken, quoteToken, 'amm');
     if (!poolAddressToUse) {
       existingPool = false;
       logger.info(`No existing pool found for ${baseToken}-${quoteToken}, providing theoretical quote`);
@@ -71,9 +77,11 @@ export async function getMinswapAmmLiquidityQuote(
     const quoteReserve: bigint = poolState.reserveB;
 
     // ── 3) Convert user inputs into raw bigints ───────────
-    const baseRaw = baseTokenAmount ? BigInt(Math.floor(baseTokenAmount * 10 ** baseToken.decimals).toString()) : null;
+    const baseRaw = baseTokenAmount
+      ? BigInt(Math.floor(baseTokenAmount * 10 ** baseTokenObj.decimals).toString())
+      : null;
     const quoteRaw = quoteTokenAmount
-      ? BigInt(Math.floor(quoteTokenAmount * 10 ** quoteToken.decimals).toString())
+      ? BigInt(Math.floor(quoteTokenAmount * 10 ** quoteTokenObj.decimals).toString())
       : null;
 
     // ── 4) Compute the “optimal” opposite amount ───────────
@@ -82,21 +90,21 @@ export async function getMinswapAmmLiquidityQuote(
       const quoteOptimal = (baseRaw * quoteReserve) / baseReserve;
       if (quoteOptimal <= quoteRaw) {
         baseLimited = true;
-        quoteTokenAmountOptimal = Number(formatTokenAmount(quoteOptimal.toString(), quoteToken.decimals));
+        quoteTokenAmountOptimal = Number(formatTokenAmount(quoteOptimal.toString(), quoteTokenObj.decimals));
       } else {
         baseLimited = false;
         const baseOptimal = (quoteRaw * baseReserve) / quoteReserve;
-        baseTokenAmountOptimal = Number(formatTokenAmount(baseOptimal.toString(), baseToken.decimals));
+        baseTokenAmountOptimal = Number(formatTokenAmount(baseOptimal.toString(), baseTokenObj.decimals));
       }
     } else if (baseRaw !== null) {
       // only base provided
       const quoteOptimal = baseReserve === BigInt(0) ? BigInt(0) : (baseRaw * quoteReserve) / baseReserve;
-      quoteTokenAmountOptimal = Number(formatTokenAmount(quoteOptimal.toString(), quoteToken.decimals));
+      quoteTokenAmountOptimal = Number(formatTokenAmount(quoteOptimal.toString(), quoteTokenObj.decimals));
       baseLimited = true;
     } else if (quoteRaw !== null) {
       // only quote provided
       const baseOptimal = quoteReserve === BigInt(0) ? BigInt(0) : (quoteRaw * baseReserve) / quoteReserve;
-      baseTokenAmountOptimal = Number(formatTokenAmount(baseOptimal.toString(), baseToken.decimals));
+      baseTokenAmountOptimal = Number(formatTokenAmount(baseOptimal.toString(), baseTokenObj.decimals));
       baseLimited = false;
     }
   } else {
@@ -108,9 +116,11 @@ export async function getMinswapAmmLiquidityQuote(
   }
 
   // ── 5) Convert back into Ethers BigNumber for any on‐chain tx ───
-  const rawBaseTokenAmount = BigNumber.from(Math.floor(baseTokenAmountOptimal * 10 ** baseToken.decimals).toString());
+  const rawBaseTokenAmount = BigNumber.from(
+    Math.floor(baseTokenAmountOptimal * 10 ** baseTokenObj.decimals).toString(),
+  );
   const rawQuoteTokenAmount = BigNumber.from(
-    Math.floor(quoteTokenAmountOptimal * 10 ** quoteToken.decimals).toString(),
+    Math.floor(quoteTokenAmountOptimal * 10 ** quoteTokenObj.decimals).toString(),
   );
 
   return {
@@ -119,8 +129,8 @@ export async function getMinswapAmmLiquidityQuote(
     quoteTokenAmount: quoteTokenAmountOptimal,
     baseTokenAmountMax: baseTokenAmount ?? baseTokenAmountOptimal,
     quoteTokenAmountMax: quoteTokenAmount ?? quoteTokenAmountOptimal,
-    baseTokenObj: baseToken,
-    quoteTokenObj: quoteToken,
+    baseTokenObj,
+    quoteTokenObj,
     poolAddress: poolAddressToUse,
     rawBaseTokenAmount,
     rawQuoteTokenAmount,
@@ -173,11 +183,8 @@ export const quoteLiquidityRoute: FastifyPluginAsync = async (fastify) => {
 
         const poolInfo = await minswap.getAmmPoolInfo(poolAddress);
 
-        const baseTokenAddress = poolInfo.baseTokenAddress;
-        const quoteTokenAddress = poolInfo.quoteTokenAddress;
-        // Find token symbol from token address
-        const baseToken = await minswap.cardano.getTokenByAddress(baseTokenAddress);
-        const quoteToken = await minswap.cardano.getTokenByAddress(quoteTokenAddress);
+        const baseToken = poolInfo.baseTokenAddress;
+        const quoteToken = poolInfo.quoteTokenAddress;
 
         const quote = await getMinswapAmmLiquidityQuote(
           network,

src/connectors/minswap/amm-routes/removeLiquidity.ts

@@ -76,33 +76,35 @@ export const removeLiquidityRoute: FastifyPluginAsync = async (fastify) => {
 
         const poolInfo = await minswap.getAmmPoolInfo(requestedPoolAddress);
 
-        const baseTokenAddress = poolInfo.baseTokenAddress;
-        // console.log('baseTokenAddress', baseTokenAddress);
+        const baseToken = poolInfo.baseTokenAddress;
+        const quoteToken = poolInfo.quoteTokenAddress;
 
-        const quoteTokenAddress = poolInfo.quoteTokenAddress;
-        // console.log('quoteTokenAddress', quoteTokenAddress);
+        // Resolve tokens
+        const baseTokenObj = minswap.cardano.getTokenBySymbol(baseToken);
+        const quoteTokenObj = minswap.cardano.getTokenBySymbol(quoteToken);
 
-        // Find token symbol from token address
-        const baseToken = await minswap.cardano.getTokenByAddress(baseTokenAddress);
-        // console.log('baseToken', baseToken);
-
-        const quoteToken = await minswap.cardano.getTokenByAddress(quoteTokenAddress);
-        // console.log('quoteToken', quoteToken);
-
-        if (!baseToken || !quoteToken) {
-          throw fastify.httpErrors.badRequest(`Token not found: ${!baseToken ? baseToken : quoteToken}`);
+        if (!baseTokenObj || !quoteTokenObj) {
+          throw fastify.httpErrors.badRequest(`Token not found: ${!baseTokenObj ? baseToken : quoteToken}`);
         }
 
         // Find pool address if not provided
         let poolAddress = requestedPoolAddress;
         if (!poolAddress) {
-          poolAddress = await minswap.findDefaultPool(baseToken.symbol, quoteToken.symbol, 'amm');
+          poolAddress = await minswap.findDefaultPool(baseToken, quoteToken, 'amm');
 
           if (!poolAddress) {
             throw fastify.httpErrors.notFound(`No AMM pool found for pair ${baseToken}-${quoteToken}`);
           }
         }
         // 5) Fetch on-chain pool state for withdraw calculation
+        const assetA: Asset = {
+          policyId: baseTokenObj.policyId,
+          tokenName: baseTokenObj.assetName,
+        };
+        const assetB: Asset = {
+          policyId: quoteTokenObj.policyId,
+          tokenName: quoteTokenObj.assetName,
+        };
         const { poolState, poolDatum } = await minswap.getPoolData(poolAddress);
 
         // 6) Fetch wallet UTxOs (this also selects the key in Lucid)
@@ -141,8 +143,8 @@ export const removeLiquidityRoute: FastifyPluginAsync = async (fastify) => {
         const fee = txBuild.fee;
 
         // 10) Compute how many tokens were removed (roughly)
-        const baseTokenAmountRemoved = formatTokenAmount(amountAReceive, baseToken.decimals);
-        const quoteTokenAmountRemoved = formatTokenAmount(amountBReceive, quoteToken.decimals);
+        const baseTokenAmountRemoved = formatTokenAmount(amountAReceive, baseTokenObj.decimals);
+        const quoteTokenAmountRemoved = formatTokenAmount(amountBReceive, quoteTokenObj.decimals);
 
         return {
           signature: txHash,

src/connectors/minswap/minswap.ts

@@ -171,8 +171,8 @@ export class Minswap {
 
     return {
       address: poolAddress,
-      baseTokenAddress: pool.assetA === 'lovelace' ? 'adalovelace' : pool.assetA,
-      quoteTokenAddress: pool.assetB === 'lovelace' ? 'adalovelace' : pool.assetB,
+      baseTokenAddress: pool.assetA,
+      quoteTokenAddress: pool.assetB,
       feePct: 2,
       price: price[0],
       baseTokenAmount: baseTokenAmount,

src/connectors/sundaeswap/amm-routes/addLiquidity.ts

@@ -5,8 +5,6 @@ import { AssetAmount, IAssetAmountMetadata } from '@sundaeswap/asset';
 import { BigNumber } from 'ethers';
 import { FastifyPluginAsync } from 'fastify';
 
-import { CardanoToken } from '#src/tokens/types';
-
 import {
   AddLiquidityRequestType,
   AddLiquidityRequest,
@@ -24,8 +22,8 @@ async function addLiquidity(
   network: string,
   walletAddress: string,
   poolAddress: string,
-  baseToken: CardanoToken,
-  quoteToken: CardanoToken,
+  baseToken: string,
+  quoteToken: string,
   baseTokenAmount: number,
   quoteTokenAmount: number,
   slippagePct?: number, // decimal, e.g. 0.01 for 1%
@@ -147,12 +145,8 @@ export const addLiquidityRoute: FastifyPluginAsync = async (fastify) => {
 
         const poolInfo = await sundaeswap.getAmmPoolInfo(reqPool);
 
-        const baseTokenAddress = poolInfo.baseTokenAddress;
-        const quoteTokenAddress = poolInfo.quoteTokenAddress;
-        // Find token symbol from token address
-        const baseToken = await sundaeswap.cardano.getTokenByAddress(baseTokenAddress);
-        const quoteToken = await sundaeswap.cardano.getTokenByAddress(quoteTokenAddress);
-
+        const baseToken = poolInfo.baseTokenAddress;
+        const quoteToken = poolInfo.quoteTokenAddress;
         return await addLiquidity(
           fastify,
           network || 'mainnet',

src/connectors/sundaeswap/amm-routes/poolInfo.ts

@@ -18,7 +18,7 @@ export const ammPoolInfoRoute: FastifyPluginAsync = async (fastify) => {
           ...GetPoolInfoRequest,
           properties: {
             network: { type: 'string', examples: ['mainnet'] },
-            poolAddress: {
+            poolIdent: {
               type: 'string',
               examples: ['2f36866691fa75a9aab66dec99f7cc2d297ca09e34d9ce68cde04773'],
             },
@@ -33,18 +33,18 @@ export const ammPoolInfoRoute: FastifyPluginAsync = async (fastify) => {
     },
     async (request): Promise<PoolInfo> => {
       try {
-        const { poolAddress } = request.query;
+        const { poolAddress: poolIdent } = request.query;
         const network = request.query.network || 'mainnet';
 
         const sundaeswap = await Sundaeswap.getInstance(network);
-        // console.log('sundaeswap ', sundaeswap);
 
-        // Check if either poolAddress or both baseToken and quoteToken are provided
-        if (!poolAddress) {
-          throw fastify.httpErrors.badRequest('poolAddress is required');
+        // Check if either poolIdent or both baseToken and quoteToken are provided
+        if (!poolIdent) {
+          throw fastify.httpErrors.badRequest('poolIdent is required');
         }
 
-        const poolInfo = await sundaeswap.getAmmPoolInfo(poolAddress);
+        const poolIdentToUse = poolIdent;
+        const poolInfo = await sundaeswap.getAmmPoolInfo(poolIdentToUse);
         if (!poolInfo) throw fastify.httpErrors.notFound('Pool not found');
         return poolInfo;
       } catch (e) {