Add missing types & datapoints

Sluder · Sluder · commit b873c9f4fcc8 · 2024-03-22T08:32:50.000-04:00
diff --git a/src/api.types.ts b/src/api.types.ts
@@ -158,6 +158,8 @@ export type DepositOrderResponse = {
     senderPubKeyHash: string,
     senderStakeKeyHash: string | null,
     statuses: OperationStatusResponse[],
+    txHash: string,
+    outputIndex: number,
     liquidityPool: LiquidityPoolResponse,
 };
 
@@ -170,6 +172,8 @@ export type WithdrawOrderResponse = {
     senderPubKeyHash: string,
     senderStakeKeyHash: string | null,
     statuses: OperationStatusResponse[],
+    txHash: string,
+    outputIndex: number,
     liquidityPool: LiquidityPoolResponse,
 }
 
@@ -180,15 +184,4 @@ export type PriceInfo = {
     dayHigh: number,
     dayChange: number,
     hourChange: number,
-}
-
-export type Tick = {
-    entity?: LiquidityPool | OrderBook | null;
-    time: number;
-    open: number;
-    high: number;
-    low: number;
-    close: number;
-    volume: number;
-}
-
+}
diff --git a/src/api/LiquidityPoolService.ts b/src/api/LiquidityPoolService.ts
@@ -9,7 +9,6 @@ import {
     PaginationParams,
     PriceInfo,
     SwapOrderResponse,
-    Tick,
     WithdrawOrderResponse
 } from '../api.types';
 import { Asset, Token } from '../models/Asset';
@@ -18,6 +17,7 @@ import { OperationStatus } from '../models/OperationStatus';
 import { WithdrawOrder } from '../models/WithdrawOrder';
 import { DepositOrder } from '../models/DepositOrder';
 import { TickInterval } from '../enums';
+import { Tick } from '../models/Tick';
 
 export class LiquidityPoolService extends BaseApiService {
 
@@ -59,6 +59,7 @@ export class LiquidityPoolService extends BaseApiService {
                     data: response.data.data.map((order: SwapOrderResponse) => {
                         const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                             return new OperationStatus(
+                                null,
                                 status.status,
                                 status.slot,
                                 status.txHash,
@@ -104,6 +105,7 @@ export class LiquidityPoolService extends BaseApiService {
                     data: response.data.data.map((order: DepositOrderResponse) => {
                         const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                             return new OperationStatus(
+                                null,
                                 status.status,
                                 status.slot,
                                 status.txHash,
@@ -130,6 +132,8 @@ export class LiquidityPoolService extends BaseApiService {
                             order.senderPubKeyHash,
                             order.senderStakeKeyHash,
                             operationStatuses,
+                            order.txHash,
+                            Number(order.outputIndex),
                             liquidityPool,
                         );
                     }),
@@ -145,6 +149,7 @@ export class LiquidityPoolService extends BaseApiService {
                     data: response.data.data.map((order: WithdrawOrderResponse) => {
                         const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                             return new OperationStatus(
+                                null,
                                 status.status,
                                 status.slot,
                                 status.txHash,
@@ -167,6 +172,8 @@ export class LiquidityPoolService extends BaseApiService {
                             order.senderPubKeyHash,
                             order.senderStakeKeyHash,
                             operationStatuses,
+                            order.txHash,
+                            Number(order.outputIndex),
                             liquidityPool,
                         );
                     }),
@@ -176,7 +183,7 @@ export class LiquidityPoolService extends BaseApiService {
     }
 
     public prices(poolIdentifiers: string[]): Promise<PriceInfo[]> {
-        return axios.post(`${this._baseHost}/api/liquidity-pools/analytics/prices`, {
+        return axios.post(`${this._baseHost}/api/liquidity-pools/prices`, {
             identifiers: poolIdentifiers,
         }).then((response: any) => response.data.map((entry: any) => {
             return {
@@ -201,10 +208,17 @@ export class LiquidityPoolService extends BaseApiService {
         }
 
         return axios.get(url).then((response: any) => {
-            return response.data.map((tick: any) => {
-               tick.time *= 1000;
-
-               return tick;
+            return response.data.map((tickInfo: any) => {
+                return new Tick(
+                    tickInfo.liquidityPool ? this.responseToLiquidityPool(tickInfo.liquidityPool) : null,
+                        tickInfo.resolution,
+                        tickInfo.time * 1000,
+                        tickInfo.open,
+                        tickInfo.high,
+                        tickInfo.low,
+                        tickInfo.close,
+                        tickInfo.volume,
+                );
             });
         });
     }
diff --git a/src/api/OrderBookService.ts b/src/api/OrderBookService.ts
@@ -5,13 +5,13 @@ import {
     PaginatedResponse,
     PaginationParams,
     PriceInfo,
-    Tick
 } from '../api.types';
 import axios from 'axios';
 import { Asset, Token } from '../models/Asset';
 import { OrderBook } from '../models/OrderBook';
 import { OrderBookOrder } from '../models/OrderBookOrder';
 import { TickInterval } from '../enums';
+import { Tick } from '../models/Tick';
 
 export class OrderBookService extends BaseApiService {
 
@@ -142,10 +142,29 @@ export class OrderBookService extends BaseApiService {
         }
 
         return axios.get(url).then((response: any) => {
-            return response.data.map((tick: any) => {
-                tick.time *= 1000;
+            return response.data.map((tickInfo: any) => {
+                const orderBook: OrderBook | null = tickInfo.orderBook
+                    ? new OrderBook(
+                        tickInfo.orderBook.dex,
+                        tickInfo.orderBook.identifier,
+                        tickInfo.orderBook.tokenA === null
+                            ? 'lovelace'
+                            : new Asset(tickInfo.orderBook.tokenA.policyId, tickInfo.orderBook.tokenA.nameHex, tickInfo.orderBook.tokenA.decimals, tickInfo.orderBook.tokenA.isVerified, tickInfo.orderBook.tokenA.isLpToken, tickInfo.orderBook.tokenA.name, tickInfo.orderBook.tokenA.ticker, tickInfo.orderBook.tokenA.logo, tickInfo.orderBook.tokenA.description),
+                        new Asset(tickInfo.orderBook.tokenB.policyId, tickInfo.orderBook.tokenB.nameHex, tickInfo.orderBook.tokenB.decimals, tickInfo.orderBook.tokenB.isVerified, tickInfo.orderBook.tokenB.isLpToken, tickInfo.orderBook.tokenB.name, tickInfo.orderBook.tokenB.ticker, tickInfo.orderBook.tokenB.logo, tickInfo.orderBook.tokenB.description),
+                        tickInfo.orderBook.createdSlot,
+                    )
+                : null;
 
-                return tick;
+                return new Tick(
+                    orderBook,
+                    tickInfo.resolution,
+                    tickInfo.time * 1000,
+                    tickInfo.open,
+                    tickInfo.high,
+                    tickInfo.low,
+                    tickInfo.close,
+                    tickInfo.volume,
+                );
             });
         });
     }
diff --git a/src/api/OrdersService.ts b/src/api/OrdersService.ts
@@ -36,6 +36,7 @@ export class OrdersService extends BaseApiService {
                 data: response.data.data.map((order: SwapOrderResponse) => {
                     const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                         return new OperationStatus(
+                            null,
                             status.status,
                             status.slot,
                             status.txHash,
@@ -89,6 +90,7 @@ export class OrdersService extends BaseApiService {
                 data: response.data.data.map((order: DepositOrderResponse) => {
                     const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                         return new OperationStatus(
+                            null,
                             status.status,
                             status.slot,
                             status.txHash,
@@ -113,6 +115,8 @@ export class OrdersService extends BaseApiService {
                         order.senderPubKeyHash,
                         order.senderStakeKeyHash,
                         operationStatuses,
+                        order.txHash,
+                        Number(order.outputIndex),
                         liquidityPool,
                     );
                 }),
@@ -135,6 +139,7 @@ export class OrdersService extends BaseApiService {
                 data: response.data.data.map((order: WithdrawOrderResponse) => {
                     const operationStatuses: OperationStatus[] = order.statuses.map((status: OperationStatusResponse) => {
                         return new OperationStatus(
+                            null,
                             status.status,
                             status.slot,
                             status.txHash,
@@ -155,6 +160,8 @@ export class OrdersService extends BaseApiService {
                         order.senderPubKeyHash,
                         order.senderStakeKeyHash,
                         operationStatuses,
+                        order.txHash,
+                        Number(order.outputIndex),
                         liquidityPool,
                     );
                 }),
diff --git a/src/index.ts b/src/index.ts
@@ -9,15 +9,18 @@ export * from './enums';
  * Model exports.
  */
 export * from './models/Asset';
+export * from './models/DepositOrder';
 export * from './models/LiquidityPool';
 export * from './models/LiquidityPoolState';
-export * from './models/Statusable';
 export * from './models/OperationStatus';
-export * from './models/SwapOrder';
-export * from './models/DepositOrder';
-export * from './models/WithdrawOrder';
 export * from './models/OrderBook';
+export * from './models/OrderBookMatch';
 export * from './models/OrderBookOrder';
+export * from './models/Statusable';
+export * from './models/SwapOrder';
+export * from './models/Sync';
+export * from './models/Tick';
+export * from './models/WithdrawOrder';
 
 /**
  * Service exports.
diff --git a/src/models/DepositOrder.ts b/src/models/DepositOrder.ts
@@ -14,6 +14,8 @@ export class DepositOrder extends Statusable {
         public senderPubKeyHash: string,
         public senderStakeKeyHash: string | null,
         public statuses: OperationStatus[],
+        public txHash: string,
+        public outputIndex: number,
         public liquidityPool?: LiquidityPool | null,
     ) {
         super(statuses);
diff --git a/src/models/OperationStatus.ts b/src/models/OperationStatus.ts
@@ -1,6 +1,9 @@
+import { Statusable } from './Statusable';
+
 export class OperationStatus {
 
     constructor(
+        public entity: Statusable | null,
         public status: number,
         public slot: number,
         public txHash: string,
diff --git a/src/models/SwapOrder.ts b/src/models/SwapOrder.ts
@@ -25,16 +25,16 @@ export class SwapOrder extends Statusable {
     }
 
     get price(): number {
-        if (! this.liquidityPool || ! this.actualReceive) return 0;
+        if (! this.liquidityPool) return 0;
 
         // Buy
         if (tokenId(this.swapInToken) === tokenId(this.liquidityPool.tokenA)) {
             return (Number(this.swapInAmount) / 10**tokenDecimals(this.swapInToken ?? 'lovelace'))
-                / (Number(this.actualReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'));
+                / (Number(this.actualReceive ?? this.minReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'));
         }
 
         // Sell
-        return (Number(this.actualReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'))
+        return (Number(this.actualReceive ?? this.minReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'))
             / (Number(this.swapInAmount) / 10**tokenDecimals(this.swapInToken ?? 'lovelace'));
     }
 
diff --git a/src/models/Tick.ts b/src/models/Tick.ts
@@ -0,0 +1,18 @@
+import { LiquidityPool } from './LiquidityPool';
+import { OrderBook } from './OrderBook';
+
+export class Tick {
+
+    constructor(
+        public entity: LiquidityPool | OrderBook | null,
+        public resolution: string,
+        public time: number,
+        public open: number,
+        public high: number,
+        public low: number,
+        public close: number,
+        public volume: number,
+    ) {
+    }
+
+}
diff --git a/src/models/WithdrawOrder.ts b/src/models/WithdrawOrder.ts
@@ -14,6 +14,8 @@ export class WithdrawOrder extends Statusable {
         public senderPubKeyHash: string,
         public senderStakeKeyHash: string | null,
         public statuses: OperationStatus[],
+        public txHash: string,
+        public outputIndex: number,
         public liquidityPool?: LiquidityPool | null,
     ) {
         super(statuses);
diff --git a/src/resources/DepositOrderResource.ts b/src/resources/DepositOrderResource.ts
@@ -1,5 +1,5 @@
 import { BaseWsResource } from './BaseWsResource';
-import { WsLiquidityPoolDesposit, WsOperationStatus } from '../ws.types';
+import { WsLiquidityPoolDeposit, WsOperationStatus } from '../ws.types';
 import { AssetResource } from './AssetResource';
 import { OperationStatusResource } from './OperationStatusResource';
 import { LiquidityPool } from '../models/LiquidityPool';
@@ -8,7 +8,7 @@ import { DepositOrder } from '../models/DepositOrder';
 
 export class DepositOrderResource extends BaseWsResource {
 
-    fromWebsocketMessage(message: WsLiquidityPoolDesposit): DepositOrder {
+    fromWebsocketMessage(message: WsLiquidityPoolDeposit): DepositOrder {
         const assetResource: AssetResource = new AssetResource();
         const operationStatusResource: OperationStatusResource = new OperationStatusResource();
 
@@ -27,6 +27,8 @@ export class DepositOrderResource extends BaseWsResource {
             message.st
                 ? message.st.map((status: WsOperationStatus) => operationStatusResource.fromWebsocketMessage(status))
                 : [],
+            message.tH,
+            Number(message.oI),
             liquidityPool,
         );
     }
diff --git a/src/resources/LiquidityPoolTickResource.ts b/src/resources/LiquidityPoolTickResource.ts
@@ -1,21 +1,22 @@
 import { BaseWsResource } from './BaseWsResource';
 import { WsLiquidityPoolTick } from '../ws.types';
-import { Tick } from '../api.types';
 import { LiquidityPoolResource } from './LiquidityPoolResource';
 import { LiquidityPool } from '../models/LiquidityPool';
+import { Tick } from '../models/Tick';
 
 export class LiquidityPoolTickResource extends BaseWsResource {
 
     fromWebsocketMessage(message: WsLiquidityPoolTick): Tick {
-        return {
-            entity: message.lP ? (new LiquidityPoolResource()).fromWebsocketMessage(message.lP) as LiquidityPool : null,
-            time: message.ti,
-            open: message.o,
-            high: message.h,
-            low: message.l,
-            close: message.c,
-            volume: message.v,
-        };
+        return new Tick(
+            message.lP ? (new LiquidityPoolResource()).fromWebsocketMessage(message.lP) as LiquidityPool : null,
+            message.r,
+            message.ti * 1000,
+            message.o,
+            message.h,
+            message.l,
+            message.c,
+            message.v,
+        );
     }
 
 }
diff --git a/src/resources/OperationStatusResource.ts b/src/resources/OperationStatusResource.ts
@@ -1,11 +1,33 @@
 import { BaseWsResource } from './BaseWsResource';
 import { WsOperationStatus } from '../ws.types';
 import { OperationStatus } from '../models/OperationStatus';
+import { Statusable } from '../models/Statusable';
+import { WsEvent } from '../enums';
+import { SwapOrderResource } from './SwapOrderResource';
+import { DepositOrderResource } from './DepositOrderResource';
+import { WithdrawOrderResource } from './WithdrawOrderResource';
 
 export class OperationStatusResource extends BaseWsResource {
 
     fromWebsocketMessage(message: WsOperationStatus): OperationStatus {
+        let entity: Statusable | null = null;
+
+        if (message.oE) {
+            switch (message.oE.t) {
+                case WsEvent.LiquidityPoolSwap:
+                    entity = (new SwapOrderResource()).fromWebsocketMessage(message.oE);
+                    break;
+                case WsEvent.LiquidityPoolDeposit:
+                    entity = (new DepositOrderResource()).fromWebsocketMessage(message.oE);
+                    break;
+                case WsEvent.LiquidityPoolWithdraw:
+                    entity = (new WithdrawOrderResource()).fromWebsocketMessage(message.oE);
+                    break;
+            }
+        }
+
         return new OperationStatus(
+            entity,
             message.st,
             message.s,
             message.tH,
diff --git a/src/resources/OrderBookTickResource.ts b/src/resources/OrderBookTickResource.ts
diff --git a/src/resources/WithdrawOrderResource.ts b/src/resources/WithdrawOrderResource.ts
diff --git a/src/ws.types.ts b/src/ws.types.ts

Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,16 @@ export class SwapOrder extends Statusable {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`get price(): number {`
`28`		`- if (! this.liquidityPool \|\| ! this.actualReceive) return 0;`
	`28`	`+ if (! this.liquidityPool) return 0;`
`29`	`29`
`30`	`30`	`// Buy`
`31`	`31`	`if (tokenId(this.swapInToken) === tokenId(this.liquidityPool.tokenA)) {`
`32`	`32`	`return (Number(this.swapInAmount) / 10**tokenDecimals(this.swapInToken ?? 'lovelace'))`
`33`		`- / (Number(this.actualReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'));`
	`33`	`+ / (Number(this.actualReceive ?? this.minReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'));`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Sell`
`37`		`- return (Number(this.actualReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'))`
	`37`	`+ return (Number(this.actualReceive ?? this.minReceive) / 10**tokenDecimals(this.swapOutToken ?? 'lovelace'))`
`38`	`38`	`/ (Number(this.swapInAmount) / 10**tokenDecimals(this.swapInToken ?? 'lovelace'));`
`39`	`39`	`}`
`40`	`40`