Add tests; Asset func renames; Append slash helper

jest.config.cjs

@@ -6,12 +6,7 @@ module.exports = {
     '<rootDir>/node_modules/',
   ],
   transform: {
-    '^.+\\.tsx?$': [
-      'ts-jest',
-      {
-        useESM: true,
-      },
-    ],
+    "^.+\\.ts?$": "babel-jest",
   },
   roots: ['<rootDir>'],
   modulePaths: ['<rootDir>'],
@@ -22,4 +17,4 @@ module.exports = {
     '@providers/(.*)': '<rootDir>/src/providers/$1',
     '@requests/(.*)': '<rootDir>/src/requests/$1',
   }
-};
+};

src/dex/api/minswap-api.ts

@@ -6,6 +6,7 @@ import { Minswap } from '../minswap';
 import { RequestConfig } from '@app/types';
 import AES from 'crypto-js/aes';
 import Utf8 from 'crypto-js/enc-utf8';
+import { appendSlash } from '@app/utils';
 
 const AES_KEY: string = '22eaca439bfd89cf125827a7a33fe3970d735dbfd5d84f19dd95820781fc47be';
 
@@ -21,7 +22,7 @@ export class MinswapApi extends BaseApi {
 
         this.api = axios.create({
             timeout: requestConfig.timeout,
-            baseURL: `${requestConfig.proxyUrl}https://monorepo-mainnet-prod.minswap.org/graphql`,
+            baseURL: `${appendSlash(requestConfig.proxyUrl)}https://monorepo-mainnet-prod.minswap.org/graphql`,
             withCredentials: false,
         });
     }

src/dex/api/muesliswap-api.ts

@@ -4,6 +4,7 @@ import { LiquidityPool } from '../models/liquidity-pool';
 import axios, { AxiosInstance } from 'axios';
 import { MuesliSwap } from '../muesliswap';
 import { RequestConfig } from '@app/types';
+import { appendSlash } from '@app/utils';
 
 export class MuesliSwapApi extends BaseApi {
 
@@ -16,7 +17,7 @@ export class MuesliSwapApi extends BaseApi {
         this.dex = dex;
         this.api = axios.create({
             timeout: requestConfig.timeout,
-            baseURL: `${requestConfig.proxyUrl}https://api.muesliswap.com/`,
+            baseURL: `${appendSlash(requestConfig.proxyUrl)}https://api.muesliswap.com/`,
             headers: {
                 'Content-Type': 'application/json',
             }
@@ -27,9 +28,9 @@ export class MuesliSwapApi extends BaseApi {
         const providers: string[] = ['muesliswap', 'muesliswap_v2', 'muesliswap_clp'];
         const tokenA: string = (assetA === 'lovelace')
             ? '.'
-            : assetA.id('.');
+            : assetA.identifier('.');
         const tokenB: string = (assetB && assetB !== 'lovelace')
-            ? assetB.id('.')
+            ? assetB.identifier('.')
             : '';
 
         return this.api.get(`/liquidity/pools?providers=${providers.join(',')}&token-a=${tokenA}&token-b=${tokenB}`)

src/dex/api/sundaeswap-api.ts

@@ -4,6 +4,7 @@ import { LiquidityPool } from '../models/liquidity-pool';
 import axios, { AxiosInstance } from 'axios';
 import { SundaeSwap } from '../sundaeswap';
 import { RequestConfig } from '@app/types';
+import { appendSlash } from '@app/utils';
 
 export class SundaeSwapApi extends BaseApi {
 
@@ -16,7 +17,7 @@ export class SundaeSwapApi extends BaseApi {
         this.dex = dex;
         this.api = axios.create({
             timeout: requestConfig.timeout,
-            baseURL: `${requestConfig.proxyUrl}https://stats.sundaeswap.finance/graphql`,
+            baseURL: `${appendSlash(requestConfig.proxyUrl)}https://stats.sundaeswap.finance/graphql`,
             headers: {
                 'Content-Type': 'application/json',
             }
@@ -28,9 +29,9 @@ export class SundaeSwapApi extends BaseApi {
 
         const assetAId: string = (assetA === 'lovelace')
             ? ''
-            : assetA.id('.');
+            : assetA.identifier('.');
         let assetBId: string = (assetB && assetB !== 'lovelace')
-            ? assetB.id('.')
+            ? assetB.identifier('.')
             : '';
 
         const getPaginatedResponse = (page: number): Promise<LiquidityPool[]> => {
@@ -76,10 +77,10 @@ export class SundaeSwapApi extends BaseApi {
                     let liquidityPool: LiquidityPool = new LiquidityPool(
                         SundaeSwap.identifier,
                         pool.assetA.assetId
-                            ? Asset.fromId(pool.assetA.assetId, pool.assetA.decimals)
+                            ? Asset.fromIdentifier(pool.assetA.assetId, pool.assetA.decimals)
                             : 'lovelace',
                         pool.assetB.assetId
-                            ? Asset.fromId(pool.assetB.assetId, pool.assetB.decimals)
+                            ? Asset.fromIdentifier(pool.assetB.assetId, pool.assetB.decimals)
                             : 'lovelace',
                         BigInt(pool.quantityA),
                         BigInt(pool.quantityB),
@@ -89,7 +90,7 @@ export class SundaeSwapApi extends BaseApi {
                     );
 
                     liquidityPool.identifier = pool.ident;
-                    liquidityPool.lpToken = Asset.fromId(pool.assetLP.assetId);
+                    liquidityPool.lpToken = Asset.fromIdentifier(pool.assetLP.assetId);
                     liquidityPool.poolFeePercent = Number(pool.fee);
 
                     return liquidityPool;

src/dex/api/vyfinance-api.ts

@@ -4,6 +4,7 @@ import { LiquidityPool } from '../models/liquidity-pool';
 import axios, { AxiosInstance } from 'axios';
 import { VyFinance } from '../vyfinance';
 import { RequestConfig } from '@app/types';
+import { appendSlash } from '@app/utils';
 
 export class VyfinanceApi extends BaseApi {
 
@@ -16,7 +17,7 @@ export class VyfinanceApi extends BaseApi {
         this.dex = dex;
         this.api = axios.create({
             timeout: requestConfig.timeout,
-            baseURL: `${requestConfig.proxyUrl}https://api.vyfi.io`,
+            baseURL: `${appendSlash(requestConfig.proxyUrl)}https://api.vyfi.io`,
             headers: {
                 'Content-Type': 'application/json',
             }
@@ -26,9 +27,9 @@ export class VyfinanceApi extends BaseApi {
     liquidityPools(assetA: Token, assetB?: Token): Promise<LiquidityPool[]> {
         const assetAId: string = (assetA === 'lovelace')
             ? 'lovelace'
-            : assetA.id();
+            : assetA.identifier();
         let assetBId: string = (assetB && assetB !== 'lovelace')
-            ? assetB.id()
+            ? assetB.identifier()
             : 'lovelace';
 
         const url: string = assetB

src/dex/api/wingriders-api.ts

@@ -4,6 +4,7 @@ import { LiquidityPool } from '../models/liquidity-pool';
 import axios, { AxiosInstance } from 'axios';
 import { RequestConfig } from '@app/types';
 import { WingRiders } from '@dex/wingriders';
+import { appendSlash } from '@app/utils';
 
 export class WingRidersApi extends BaseApi {
 
@@ -16,7 +17,7 @@ export class WingRidersApi extends BaseApi {
         this.dex = dex;
         this.api = axios.create({
             timeout: requestConfig.timeout,
-            baseURL: `${requestConfig.proxyUrl}https://api.mainnet.wingriders.com/graphql`,
+            baseURL: `${appendSlash(requestConfig.proxyUrl)}https://api.mainnet.wingriders.com/graphql`,
             headers: {
                 'Content-Type': 'application/json',
             }

src/dex/minswap.ts

@@ -39,14 +39,14 @@ export class Minswap extends BaseDex {
     }
 
     public async liquidityPoolAddresses(provider: BaseDataProvider): Promise<string[]> {
-        const validityAsset: Asset = Asset.fromId(this.poolValidityAsset);
+        const validityAsset: Asset = Asset.fromIdentifier(this.poolValidityAsset);
         const assetAddresses: AssetAddress[] = await provider.assetAddresses(validityAsset);
 
         return Promise.resolve([...new Set(assetAddresses.map((assetAddress: AssetAddress) => assetAddress.address))]);
     }
 
     public async liquidityPools(provider: BaseDataProvider): Promise<LiquidityPool[]> {
-        const validityAsset: Asset = Asset.fromId(this.poolValidityAsset);
+        const validityAsset: Asset = Asset.fromIdentifier(this.poolValidityAsset);
         const poolAddresses: string[] = await this.liquidityPoolAddresses(provider);
 
         const addressPromises: Promise<LiquidityPool[]>[] = poolAddresses.map(async (address: string) => {
@@ -75,7 +75,7 @@ export class Minswap extends BaseDex {
 
         const relevantAssets: AssetBalance[] = utxo.assetBalances
             .filter((assetBalance: AssetBalance) => {
-                const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.id();
+                const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.identifier();
 
                 return assetBalanceId !== this.poolValidityAsset
                     && ! assetBalanceId.startsWith(this.lpTokenPolicyId)

src/dex/models/asset.ts

@@ -10,7 +10,7 @@ export class Asset {
         this.decimals = decimals;
     }
 
-    static fromId(id: string, decimals: number = 0): Asset {
+    static fromIdentifier(id: string, decimals: number = 0): Asset {
         id = id.replace('.', '');
 
         return new Asset(
@@ -20,7 +20,7 @@ export class Asset {
         );
     }
 
-    id(dilimeter: '' | '.' = ''): string {
+    identifier(dilimeter: '' | '.' = ''): string {
         return this.policyId + dilimeter + this.nameHex;
     }
 

src/dex/muesliswap.ts

@@ -41,14 +41,14 @@ export class MuesliSwap extends BaseDex {
     }
 
     public async liquidityPoolAddresses(provider: BaseDataProvider): Promise<string[]> {
-        const validityAsset: Asset = Asset.fromId(this.factoryToken);
+        const validityAsset: Asset = Asset.fromIdentifier(this.factoryToken);
         const assetAddresses: AssetAddress[] = await provider.assetAddresses(validityAsset);
 
         return Promise.resolve([...new Set(assetAddresses.map((assetAddress: AssetAddress) => assetAddress.address))]);
     }
 
     async liquidityPools(provider: BaseDataProvider): Promise<LiquidityPool[]> {
-        const validityAsset: Asset = Asset.fromId(this.factoryToken);
+        const validityAsset: Asset = Asset.fromIdentifier(this.factoryToken);
         const poolAddresses: string[] = await this.liquidityPoolAddresses(provider);
 
         const addressPromises: Promise<LiquidityPool[]>[] = poolAddresses.map(async (address: string) => {
@@ -76,7 +76,7 @@ export class MuesliSwap extends BaseDex {
         }
 
         const relevantAssets: AssetBalance[] = utxo.assetBalances.filter((assetBalance: AssetBalance) => {
-            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.id();
+            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.identifier();
 
             return ! assetBalanceId.startsWith(this.factoryToken.slice(0, 56))
                 && ! assetBalanceId.startsWith(this.poolNftPolicyId);

src/dex/sundaeswap.ts

@@ -63,7 +63,7 @@ export class SundaeSwap extends BaseDex {
         }
 
         const relevantAssets: AssetBalance[] = utxo.assetBalances.filter((assetBalance: AssetBalance) => {
-            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.id();
+            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.identifier();
 
             return ! assetBalanceId.startsWith(this.lpTokenPolicyId);
         });

src/dex/wingriders.ts

@@ -47,7 +47,7 @@ export class WingRiders extends BaseDex {
     }
 
     public async liquidityPoolAddresses(provider: BaseDataProvider): Promise<string[]> {
-        const validityAsset: Asset = Asset.fromId(this.poolValidityAsset);
+        const validityAsset: Asset = Asset.fromIdentifier(this.poolValidityAsset);
         const assetAddresses: AssetAddress[] = this._assetAddresses.length > 0
             ? this._assetAddresses
             : await provider.assetAddresses(validityAsset);
@@ -56,7 +56,7 @@ export class WingRiders extends BaseDex {
     }
 
     async liquidityPools(provider: BaseDataProvider): Promise<LiquidityPool[]> {
-        const validityAsset: Asset = Asset.fromId(this.poolValidityAsset);
+        const validityAsset: Asset = Asset.fromIdentifier(this.poolValidityAsset);
         const poolAddresses: string[] = await this.liquidityPoolAddresses(provider);
 
         const addressPromises: Promise<LiquidityPool[]>[] = poolAddresses.map(async (address: string) => {
@@ -83,10 +83,10 @@ export class WingRiders extends BaseDex {
             return Promise.resolve(undefined);
         }
 
-        const validityAsset: Asset = Asset.fromId(this.poolValidityAsset);
+        const validityAsset: Asset = Asset.fromIdentifier(this.poolValidityAsset);
 
         const relevantAssets: AssetBalance[] = utxo.assetBalances.filter((assetBalance: AssetBalance) => {
-            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.id();
+            const assetBalanceId: string = assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.identifier();
 
             return ! assetBalanceId.startsWith(validityAsset.policyId);
         });

src/providers/asset-metadata/token-registry-provider.ts

@@ -30,7 +30,7 @@ export class TokenRegistryProvider extends BaseMetadataProvider {
      */
     fetch(assets: Asset[]): Promise<AssetMetadata[]> {
         return this._api.post('/metadata/query', {
-            subjects: assets.map((asset: Asset) => asset.id()),
+            subjects: assets.map((asset: Asset) => asset.identifier()),
         }).then((response) => response.data.subjects.map((entry: any) => {
             return {
                 policyId: entry.subject.slice(0, 56),

src/providers/data/blockfrost-provider.ts

@@ -60,7 +60,7 @@ export class BlockfrostProvider extends BaseDataProvider {
      * https://docs.blockfrost.io/#tag/Cardano-Addresses/paths/~1addresses~1%7Baddress%7D~1utxos~1%7Basset%7D/get
      */
     public async utxos(address: string, asset?: Asset): Promise<UTxO[]> {
-        return this.sendPaginatedRequest(`/addresses/${address}/utxos/${asset ? asset.id() : ''}`)
+        return this.sendPaginatedRequest(`/addresses/${address}/utxos/${asset ? asset.identifier() : ''}`)
             .then((results: any) => {
                 return results.map((utxo: any) => {
                     return {
@@ -70,7 +70,7 @@ export class BlockfrostProvider extends BaseDataProvider {
                         outputIndex: utxo.output_index,
                         assetBalances: utxo.amount.reduce((assets: AssetBalance[], amount: any) => {
                             assets.push({
-                                asset: amount.unit === 'lovelace' ? amount.unit : Asset.fromId(amount.unit),
+                                asset: amount.unit === 'lovelace' ? amount.unit : Asset.fromIdentifier(amount.unit),
                                 quantity: BigInt(amount.quantity),
                             })
                             return assets;
@@ -94,7 +94,7 @@ export class BlockfrostProvider extends BaseDataProvider {
                         outputIndex: utxo.output_index,
                         assetBalances: utxo.amount.reduce((assets: AssetBalance[], amount: any) => {
                             assets.push({
-                                asset: amount.unit === 'lovelace' ? amount.unit : Asset.fromId(amount.unit),
+                                asset: amount.unit === 'lovelace' ? amount.unit : Asset.fromIdentifier(amount.unit),
                                 quantity: BigInt(amount.quantity),
                             })
                             return assets;
@@ -108,7 +108,7 @@ export class BlockfrostProvider extends BaseDataProvider {
      * https://docs.blockfrost.io/#tag/Cardano-Assets/paths/~1assets~1%7Basset%7D~1transactions/get
      */
     public async assetTransactions(asset: Asset): Promise<Transaction[]> {
-        return this.sendPaginatedRequest(`/assets/${asset.id()}/transactions`)
+        return this.sendPaginatedRequest(`/assets/${asset.identifier()}/transactions`)
             .then((results: any) => {
                 return results.map((tx: any) => {
                     return {
@@ -122,7 +122,7 @@ export class BlockfrostProvider extends BaseDataProvider {
      * https://docs.blockfrost.io/#tag/Cardano-Assets/paths/~1assets~1%7Basset%7D~1transactions/get
      */
     public async assetAddresses(asset: Asset): Promise<AssetAddress[]> {
-        return this.sendPaginatedRequest(`/assets/${asset.id()}/addresses`)
+        return this.sendPaginatedRequest(`/assets/${asset.identifier()}/addresses`)
             .then((results: any) => {
                 return results.map((result: any) => {
                     return {

src/providers/data/kupo-provider.ts

@@ -73,7 +73,7 @@ export class KupoProvider extends BaseDataProvider {
     }
 
     public async assetTransactions(asset: Asset): Promise<Transaction[]> {
-        return this._kupoApi.get(`/matches/${asset.id('.')}`)
+        return this._kupoApi.get(`/matches/${asset.identifier('.')}`)
             .then((results: any) => {
                 return results.data.map((result: any) => {
                     return {
@@ -84,12 +84,12 @@ export class KupoProvider extends BaseDataProvider {
     }
 
     public async assetAddresses(asset: Asset): Promise<AssetAddress[]> {
-        return this._kupoApi.get(`/matches/${asset.id('.')}?unspent`)
+        return this._kupoApi.get(`/matches/${asset.identifier('.')}?unspent`)
             .then((results: any) => {
                 return results.data.map((result: any) => {
                     return {
                         address: result.address,
-                        quantity: BigInt(result.value.assets[asset.id('.')]),
+                        quantity: BigInt(result.value.assets[asset.identifier('.')]),
                     } as AssetAddress
                 }) as AssetAddress[];
             });
@@ -111,7 +111,7 @@ export class KupoProvider extends BaseDataProvider {
                     ];
                     Object.keys(utxo.value.assets).forEach((unit: string) => {
                         balances.push({
-                            asset: Asset.fromId(unit),
+                            asset: Asset.fromIdentifier(unit),
                             quantity: BigInt(utxo.value.assets[unit]),
                         });
                     });

src/providers/wallet/lucid-provider.ts

@@ -155,7 +155,7 @@ export class LucidProvider extends BaseWalletProvider {
     private paymentFromAssets(assetBalances: AssetBalance[]): Assets {
         return assetBalances
             .reduce((payment: Record<Unit | 'lovelace', bigint>, assetBalance: AssetBalance) => {
-                payment[assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.id()] = assetBalance.quantity;
+                payment[assetBalance.asset === 'lovelace' ? 'lovelace' : assetBalance.asset.identifier()] = assetBalance.quantity;
 
                 return payment;
             }, {} as Assets);

src/requests/fetch-request.ts

@@ -230,10 +230,10 @@ export class FetchRequest {
      */
     private async fetchAssetMetadata(liquidityPools: LiquidityPool[]) {
         const assets: Asset[] = liquidityPools.reduce((results: Asset[], liquidityPool: LiquidityPool) => {
-            if (liquidityPool.assetA !== 'lovelace' && ! results.some((asset: Asset) => asset.id() === (liquidityPool.assetA as Asset).id())) {
+            if (liquidityPool.assetA !== 'lovelace' && ! results.some((asset: Asset) => asset.identifier() === (liquidityPool.assetA as Asset).identifier())) {
                 results.push(liquidityPool.assetA);
             }
-            if (liquidityPool.assetB !== 'lovelace' && ! results.some((asset: Asset) => asset.id() === (liquidityPool.assetB as Asset).id())) {
+            if (liquidityPool.assetB !== 'lovelace' && ! results.some((asset: Asset) => asset.identifier() === (liquidityPool.assetB as Asset).identifier())) {
                 results.push(liquidityPool.assetB);
             }