Merge & reject if no LP token

CHANGELOG.md

@@ -3,14 +3,17 @@
 All notable changes to Dexter will be documented in this file.
 
 ## [UNRELEASED]
+- TeddySwap integration
+
+## [v4.2.0]
 - Fix WR price impact formula for 0 decimals
 - Rename Asset identifier function
 - Include '/' helper function for proxy URLs
 - Add export for SplitSwapRequest
 - Add tests for DexTransaction events
 - Fix `withSwapOutAmountMappings` for split swap requests
 - Allow non-existing staking key hash when constructing order
-- TeddySwap integration
+- Add fetching for total LP tokens for liquidity pools
 
 ## [v4.1.0]
 - Support for multi-dex swap requests.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/dexter",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "license": "MIT",
   "author": "Zachary Sluder",
   "keywords": [

src/dex/api/minswap-api.ts

@@ -176,6 +176,7 @@ export class MinswapApi extends BaseApi {
         );
 
         liquidityPool.lpToken = new Asset(poolData.lpAsset.currencySymbol, poolData.lpAsset.tokenName);
+        liquidityPool.totalLpTokens = BigInt(poolData.totalLiquidity);
         liquidityPool.poolFeePercent = 0.3;
         liquidityPool.identifier = liquidityPool.lpToken.identifier();
 

src/dex/api/muesliswap-api.ts

@@ -54,6 +54,7 @@ export class MuesliSwapApi extends BaseApi {
                     liquidityPool.identifier = pool.poolId;
                     liquidityPool.lpToken = new Asset(pool.lpToken.address.policyId, pool.lpToken.address.name);
                     liquidityPool.poolFeePercent = Number(pool.poolFee);
+                    liquidityPool.totalLpTokens = BigInt(pool.lpToken.amount);
 
                     return liquidityPool;
                 });

src/dex/api/sundaeswap-api.ts

@@ -92,6 +92,7 @@ export class SundaeSwapApi extends BaseApi {
                     liquidityPool.identifier = pool.ident;
                     liquidityPool.lpToken = Asset.fromIdentifier(pool.assetLP.assetId);
                     liquidityPool.poolFeePercent = Number(pool.fee);
+                    liquidityPool.totalLpTokens = BigInt(pool.quantityLP);
 
                     return liquidityPool;
                 });

src/dex/api/wingriders-api.ts

@@ -84,6 +84,7 @@ export class WingRidersApi extends BaseApi {
                 liquidityPool.lpToken = new Asset(pool.issuedShareToken.policyId, pool.issuedShareToken.assetName);
                 liquidityPool.poolFeePercent = 0.35;
                 liquidityPool.identifier = liquidityPool.lpToken.identifier();
+                liquidityPool.totalLpTokens = BigInt(pool.issuedShareToken.quantity);
 
                 return liquidityPool;
             }).filter((pool: LiquidityPool | undefined) => pool !== undefined);

src/dex/minswap.ts

@@ -5,7 +5,7 @@ import { BaseDex } from './base-dex';
 import {
     AssetAddress,
     AssetBalance,
-    DatumParameters,
+    DatumParameters, DefinitionConstr, DefinitionField,
     PayToAddress,
     RequestConfig,
     SwapFee,
@@ -17,6 +17,7 @@ import { AddressType, DatumParameterKey } from '@app/constants';
 import order from '@dex/definitions/minswap/order';
 import { BaseApi } from '@dex/api/base-api';
 import { MinswapApi } from '@dex/api/minswap-api';
+import pool from '@dex/definitions/minswap/pool';
 
 export class Minswap extends BaseDex {
 
@@ -111,9 +112,28 @@ export class Minswap extends BaseDex {
 
         liquidityPool.lpToken = new Asset(this.lpTokenPolicyId, poolNft.nameHex);
         liquidityPool.identifier = liquidityPool.lpToken.identifier();
-
         liquidityPool.poolFeePercent = 0.3;
 
+        try {
+            liquidityPool.poolFeePercent = 0.3;
+
+            const builder: DefinitionBuilder = await (new DefinitionBuilder())
+                .loadDefinition(pool);
+            const datum: DefinitionField = await provider.datumValue(utxo.datumHash);
+            const parameters: DatumParameters = builder.pullParameters(datum as DefinitionConstr);
+
+            // Ignore Zap orders
+            if (typeof parameters.PoolAssetBPolicyId === 'string' && parameters.PoolAssetBPolicyId === this.lpTokenPolicyId) {
+                return undefined;
+            }
+
+            liquidityPool.totalLpTokens = typeof parameters.TotalLpTokens === 'number'
+                ? BigInt(parameters.TotalLpTokens)
+                : 0n;
+        } catch (e) {
+            return liquidityPool;
+        }
+
         return liquidityPool;
     }
 

src/dex/models/liquidity-pool.ts

@@ -14,6 +14,7 @@ export class LiquidityPool {
     lpToken: Asset;
     identifier: string = '';
     poolFeePercent: number = 0;
+    totalLpTokens: bigint = 0n;
     extra: any = {};
 
     constructor(dex: string, assetA: Token, assetB: Token, reserveA: bigint, reserveB: bigint, address: string, marketOrderAddress: string = '', limitOrderAddress: string = '') {

src/dex/muesliswap.ts

@@ -120,6 +120,9 @@ export class MuesliSwap extends BaseDex {
             const datum: DefinitionField = await provider.datumValue(utxo.datumHash);
             const parameters: DatumParameters = builder.pullParameters(datum as DefinitionConstr);
 
+            liquidityPool.totalLpTokens = typeof parameters.TotalLpTokens === 'number'
+                ? BigInt(parameters.TotalLpTokens)
+                : 0n;
             liquidityPool.poolFeePercent = typeof parameters.LpFee === 'number'
                 ? parameters.LpFee / 100
                 : 0;

src/dex/sundaeswap.ts

@@ -111,6 +111,9 @@ export class SundaeSwap extends BaseDex {
             liquidityPool.poolFeePercent = typeof parameters.LpFeeNumerator === 'number' && typeof parameters.LpFeeDenominator === 'number'
                 ? (parameters.LpFeeNumerator / parameters.LpFeeDenominator) * 100
                 : 0;
+            liquidityPool.totalLpTokens = typeof parameters.TotalLpTokens === 'number'
+                ? BigInt(parameters.TotalLpTokens)
+                : 0n;
         } catch (e) {
             return liquidityPool;
         }

src/dex/teddyswap.ts

@@ -124,10 +124,13 @@ export class TeddySwap extends BaseDex {
                     && assetBalance.asset.nameHex === lpTokenAssetName;
             });
 
-            if (lpTokenBalance) {
-                liquidityPool.lpToken = lpTokenBalance.asset as Asset;
-                liquidityPool.totalLpTokens = Number(MAX_INT - lpTokenBalance.quantity);
+            if (! lpTokenBalance) {
+                return Promise.resolve(undefined);
             }
+
+            liquidityPool.lpToken = lpTokenBalance.asset as Asset;
+            liquidityPool.totalLpTokens = MAX_INT - lpTokenBalance.quantity;
+
         } catch (e) {
             return liquidityPool;
         }

src/dex/wingriders.ts

@@ -130,6 +130,7 @@ export class WingRiders extends BaseDex {
         if (lpTokenBalance) {
             liquidityPool.lpToken = lpTokenBalance.asset as Asset;
             liquidityPool.identifier = liquidityPool.lpToken.identifier();
+            liquidityPool.totalLpTokens = MAX_INT - lpTokenBalance.quantity;
         }
         liquidityPool.poolFeePercent = 0.35;
 

src/utils.ts

@@ -15,7 +15,7 @@ export function correspondingReserves(liquidityPool: LiquidityPool, token: Token
 }
 
 export function appendSlash(value?: string) {
-    if (! value) return;
+    if (! value) return '';
     if (value.endsWith('/')) return;
 
     return `${value}/`;