Merge branch 'main' into dilshan/add-more-filter-options-to-accounthi…

…storycount

apps/legacy-api/src/pipes/NetworkValidationPipe.ts

@@ -5,14 +5,15 @@ import {
   PipeTransform
 } from '@nestjs/common'
 
-export type SupportedNetwork = 'mainnet' | 'testnet' | 'regtest'
+export type SupportedNetwork = 'mainnet' | 'testnet' | 'devnet' | 'regtest'
 
 @Injectable()
 export class NetworkValidationPipe implements PipeTransform {
   private static readonly VALID_NETWORKS: Set<undefined | SupportedNetwork> = new Set([
     undefined, // defaults to 'mainnet'
     'mainnet',
     'testnet',
+    'devnet',
     'regtest'
   ])
 

apps/whale-api/src/module.api/poolpair.controller.e2e.ts

@@ -512,6 +512,38 @@ describe('get best path', () => {
     })
   })
 
+  it('should return direct path even if composite swap paths has greater return', async () => {
+    // 1 J = 7 K
+    // 1 J = 2 L = 8 K
+    const response = await controller.getBestPath('10', '11')
+    expect(response).toStrictEqual({
+      fromToken: {
+        id: '10',
+        name: 'J',
+        symbol: 'J',
+        displaySymbol: 'dJ'
+      },
+      toToken: {
+        id: '11',
+        name: 'K',
+        symbol: 'K',
+        displaySymbol: 'dK'
+      },
+      bestPath: [
+        {
+          symbol: 'J-K',
+          poolPairId: '23',
+          priceRatio: { ab: '0.14285714', ba: '7.00000000' },
+          tokenA: { id: '10', name: 'J', symbol: 'J', displaySymbol: 'dJ' },
+          tokenB: { id: '11', name: 'K', symbol: 'K', displaySymbol: 'dK' },
+          commissionFeeInPct: '0.25000000'
+        }
+      ],
+      estimatedReturn: '7.00000000',
+      estimatedReturnLessDexFees: '5.25000000'
+    })
+  })
+
   it('should deduct commission fee - 1 leg', async () => {
     const response = await controller.getBestPath('10', '12')
     expect(response).toStrictEqual({

apps/whale-api/src/module.api/poolswap.pathfinding.service.ts

@@ -52,6 +52,20 @@ export class PoolSwapPathFindingService {
       paths
     } = await this.getAllSwapPaths(fromTokenId, toTokenId)
 
+    // always use direct path if available
+    for (const path of paths) {
+      const { estimatedReturn, estimatedReturnLessDexFees } = computeReturnLessDexFeesInDestinationToken(path, fromTokenId)
+      if (path.length === 1) {
+        return {
+          fromToken: fromToken,
+          toToken: toToken,
+          bestPath: path,
+          estimatedReturn: formatNumber(estimatedReturn), // denoted in toToken
+          estimatedReturnLessDexFees: formatNumber(estimatedReturnLessDexFees) // denoted in toToken
+        }
+      }
+    }
+
     // otherwise, search for the best path based on return
     let bestPath: SwapPathPoolPair[] = []
     let bestReturnLessDexFees = new BigNumber(0)

packages/jellyfish-network/__tests__/Network.test.ts

@@ -17,6 +17,11 @@ describe('getNetwork', () => {
     expect(getNetwork('testnet').bech32.hrp).toStrictEqual('tf')
   })
 
+  it('should get devnet', () => {
+    expect(getNetwork('devnet').name).toStrictEqual('devnet')
+    expect(getNetwork('devnet').bech32.hrp).toStrictEqual('tf')
+  })
+
   it('should get regtest', () => {
     expect(getNetwork('regtest').name).toStrictEqual('regtest')
     expect(getNetwork('regtest').bech32.hrp).toStrictEqual('bcrt')

packages/jellyfish-network/src/Network.ts

@@ -44,6 +44,8 @@ export function getNetwork (network: NetworkName): Network {
       return MainNet
     case 'testnet':
       return TestNet
+    case 'devnet':
+      return DevNet
     case 'regtest':
       return RegTest
     default:

packages/ocean-api-client/src/OceanApiClient.ts

@@ -24,7 +24,7 @@ export interface OceanApiClientOptions {
   /**
    * Network that ocean client is configured to
    */
-  network?: 'mainnet' | 'testnet' | 'regtest' | string
+  network?: 'mainnet' | 'testnet' | 'devnet' | 'regtest' | string
 }
 
 /**