feat: update functions and type according to latest espresso repo (#24)

* feat: update functions and type according to latest espresso repo

* fix: add additional npm package to package-lock.json

* fix: fix duplicated orderstatus type issue

* fix: reinstall npm package

Author: AnsonSIDAN

package-lock.json

@@ -17,6 +17,7 @@ import {
     GetAccountBalanceResponse,
     GenerateNewAPIKeyResponse,
     AccountBalance,
+    GetAPIKeyResponse,
     // AccountStream,
     // AccountBalanceStream,
 } from '../../types';
@@ -65,6 +66,11 @@ export class Accounts extends Api {
         return this.resolveAxiosData(res);
     }
 
+    public getApiKey(): Promise<GetAPIKeyResponse> {
+        const res = this.axiosInstance.get('/accounts/api-key');
+        return this.resolveAxiosData(res);
+    }
+
     public buildDepositTransaction(
         data: BuildDepositTransactionRequest,
     ): Promise<BuildDepositTransactionResponse> {

src/client/accounts/index.ts

@@ -1,6 +1,6 @@
 import { AxiosInstance } from 'axios';
 import { Api } from '../api';
-import { GetTermsAndConditionResponse } from '../../types';
+import { GetHydraCycleResponse, GetTermsAndConditionResponse } from '../../types';
 
 export class App extends Api {
     private axiosInstance: AxiosInstance;
@@ -14,4 +14,9 @@ export class App extends Api {
         const res = this.axiosInstance.get('/app/terms-and-conditions');
         return this.resolveAxiosData(res);
     }
+
+    public getHydraCycle(): Promise<GetHydraCycleResponse> {
+        const res = this.axiosInstance.get('/app/hydra-cycle');
+        return this.resolveAxiosData(res);
+    }
 }

src/client/app/index.ts

@@ -1,6 +1,6 @@
 export type TradingSymbol = 'ADAUSDX';
 
-export type OrderStatus = 'building' | 'open' | 'closed' | 'failed' | 'cancelled';
+export type OrderStatus = 'building' | 'processing' | 'open' | 'closed' | 'failed' | 'cancelled';
 
 export type OrderSide = 'buy' | 'sell';
 
@@ -16,18 +16,34 @@ export const OrderTypes = {
     LimitOrder: 'limit' as OrderType,
 };
 
+export type OrderExecutionRole = 'maker' | 'taker';
+
+export type OrderExecutionRecordJSON = {
+    id: string;
+    order_id: string;
+    execution_price: number;
+    filled_amount: string;
+    fee_unit: string;
+    fee_amount: string;
+    role: OrderExecutionRole;
+    counter_party_order_id: string;
+    create_time: number;
+};
+
 export type OrderJSON = {
     order_id: string;
     status: OrderStatus;
     symbol: TradingSymbol;
     orig_qty: string;
     executed_qty: string;
     side: OrderSide;
-    price: string;
+    price: number;
     type: OrderType;
-    fee_amount: number;
+    fee_charged: string;
+    fee_unit: string;
     executed_price: number;
     slippage: string;
     create_time: number;
     update_time: number;
+    fills?: OrderExecutionRecordJSON[];
 };

src/types/models/order.ts

@@ -1,4 +1,4 @@
-import { Asset, UTxO } from '@meshsdk/core';
+import { UTxO } from '@meshsdk/core';
 import { TradingSymbol, OrderSide, OrderType } from '../models/order';
 
 // SignInRequest to be refactored
@@ -12,6 +12,11 @@ export type SignInRequest = {
 //     quantity: number;
 // };
 
+export type Asset = {
+    unit: string;
+    quantity: string;
+};
+
 export type BuildDepositTransactionRequest = {
     deposit_amount: Asset[];
     input_utxos: UTxO[];
@@ -34,7 +39,7 @@ export type GetMarketDepthRequest = {
 };
 
 export type GetMarketPriceRequest = {
-    pair: string;
+    pair: TradingSymbol;
 };
 
 export type Interval = '15m' | '30m' | '1h' | '1d' | '1w' | '1M';
@@ -53,7 +58,7 @@ export type BuildPlaceOrderTransactionRequest = {
     quantity: number;
     price?: number;
     max_slippage_basis_point?: number;
-    max_slippage?: boolean;
+    max_slippage: boolean;
 };
 
 export type PostOrderRequest = BuildPlaceOrderTransactionRequest;
@@ -70,3 +75,9 @@ export type BuildCancelOrderTransactionRequest = {
 export type SubmitCancelOrderTransactionRequest = {
     signed_tx: string;
 };
+
+export type Status = 'open' | 'closed';
+
+export type GetOrderRecordRequest = {
+    status?: Status;
+};

src/types/requests/index.ts

@@ -31,12 +31,7 @@ export type SignInResponse = {
 //     tx_hash: string;
 // };
 
-export type TransactionStatus =
-    | 'building'
-    | 'held_for_order'
-    | 'submitted'
-    | 'submission_failed'
-    | 'confirmed';
+export type TransactionStatus = 'building' | 'submitted' | 'submission_failed' | 'confirmed';
 
 export type DepositRecord = {
     created_at: string;
@@ -53,6 +48,7 @@ export type GetOrderRecordResponse = {
 
 export type WithdrawalRecord = {
     created_at: string;
+    status: TransactionStatus;
     assets: Asset[];
 };
 
@@ -62,6 +58,7 @@ export type GetAccountBalanceResponse = AccountBalance[];
 
 export type GenerateNewAPIKeyResponse = {
     api_key: string;
+    created_at: string;
 };
 
 export type BuildDepositTransactionResponse = {
@@ -80,9 +77,7 @@ export type SubmitWithdrawalTransactionResponse = {
     tx_hash: string;
 };
 
-export type GetTermsAndConditionResponse = {
-    value: string;
-};
+export type GetTermsAndConditionResponse = string;
 
 export type MarketDepth = {
     price: number;
@@ -128,3 +123,13 @@ export type BuildCancelOrderTransactionResponse = {
 export type SubmitCancelOrderTransactionResponse = {
     tx_hash: string;
 };
+
+export type GetAPIKeyResponse = {
+    api_key: string;
+    created_at: string;
+};
+
+export type GetHydraCycleResponse = {
+    start: string;
+    end: string;
+};