feat: implement load operation key

Author: HinsonSIDAN

package-lock.json

@@ -77,4 +77,4 @@
             "npm run eslint --fix"
         ]
     }
-}
+}

package.json

@@ -1,9 +1,10 @@
+import { MeshWallet } from '@meshsdk/core';
 import axios, { AxiosInstance } from 'axios';
 import { ApiConfig, ApiHeaders, PostOrderRequest, PostOrderResponse } from '../types';
 import { Accounts } from './accounts';
 import { Orders } from './orders';
 import { Markets } from './markets';
-import { DeFiWallet } from './wallet';
+import { decryptWithCipher } from './components/encryption';
 
 /**
  * Represents the API client for interacting with the DeltaDefi API.
@@ -23,7 +24,9 @@ export class ApiClient {
 
     public markets: Markets;
 
-    public wallet?: DeFiWallet;
+    public masterWallet?: MeshWallet;
+
+    public operationWallet?: MeshWallet;
 
     /**
      * Creates an instance of ApiClient.
@@ -32,7 +35,7 @@ export class ApiClient {
      * @param providedWsURL - Optional WebSocket URL for the API.
      */
     constructor(
-        { network, jwt, apiKey, signingKey }: ApiConfig,
+        { network, jwt, apiKey, masterWallet }: ApiConfig,
         providedBaseURL?: string,
         providedWsURL?: string,
     ) {
@@ -59,8 +62,8 @@ export class ApiClient {
         if (apiKey) {
             headers['X-API-KEY'] = apiKey;
         }
-        if (signingKey) {
-            this.wallet = new DeFiWallet(signingKey, this.networkId);
+        if (masterWallet) {
+            this.masterWallet = masterWallet;
         }
         if (providedBaseURL) {
             baseURL = providedBaseURL;
@@ -79,24 +82,61 @@ export class ApiClient {
         this.markets = new Markets(this.axiosInstance);
     }
 
+    /**
+     * Initializes the operation wallet with the provided encryption password.
+     * @param password - The password used to decrypt the operation key.
+     */
+    public async loadOperationKey(password: string) {
+        const { encrypted_operation_key: encryptedOperationKey } =
+            await this.accounts.getOperationKey();
+        const operationKey = await decryptWithCipher({
+            encryptedDataJSON: encryptedOperationKey,
+            key: password,
+        });
+        this.operationWallet = new MeshWallet({
+            key: {
+                type: 'root',
+                bech32: operationKey,
+            },
+            networkId: this.networkId,
+        });
+    }
+
     /**
      * Posts an order.
      * @param data - The post order request data.
      * @returns A promise that resolves to the post order response.
      * @throws An error if the wallet is not initialized.
      */
     public async postOrder(data: PostOrderRequest): Promise<PostOrderResponse> {
-        if (!this.wallet) {
-            throw new Error('Wallet is not initialized');
+        if (!this.operationWallet) {
+            throw new Error('Operation wallet is not initialized');
         }
         const buildRes = await this.orders.buildPlaceOrderTransaction(data);
-        const signedTx = await this.wallet.signTx(buildRes.tx_hex);
+        const signedTx = await this.operationWallet.signTx(buildRes.tx_hex);
         const submitRes: PostOrderResponse = await this.orders.submitPlaceOrderTransaction({
             order_id: buildRes.order_id,
             signed_tx: signedTx,
         });
         return submitRes;
     }
+
+    /**
+     * Cancels an order.
+     * @param orderId - The ID of the order to cancel.
+     * @returns A promise that resolves to a message indicating the order was cancelled successfully.
+     */
+    public async cancelOrder(orderId: string) {
+        if (!this.operationWallet) {
+            throw new Error('Operation wallet is not initialized');
+        }
+        const buildRes = await this.orders.buildCancelOrderTransaction(orderId);
+        const signedTx = await this.operationWallet.signTx(buildRes.tx_hex);
+        await this.orders.submitCancelOrderTransaction({
+            signed_tx: signedTx,
+        });
+        return { message: 'Order cancelled successfully', orderId };
+    }
 }
 
 export { encryptWithCipher, decryptWithCipher } from './components/encryption';

src/client/index.ts

@@ -1,7 +1,7 @@
-import { AppWalletKeyType } from '@meshsdk/core';
+import { MeshWallet } from '@meshsdk/core';
 import { AuthHeaders } from './auth';
 
 export type ApiConfig = {
     network?: 'preprod' | 'mainnet';
-    signingKey?: AppWalletKeyType;
+    masterWallet?: MeshWallet;
 } & AuthHeaders;

src/client/wallet/index.ts

@@ -71,10 +71,6 @@ export type SubmitPlaceOrderTransactionRequest = {
     signed_tx: string;
 };
 
-export type BuildCancelOrderTransactionRequest = {
-    order_id: string;
-};
-
 export type SubmitCancelOrderTransactionRequest = {
     signed_tx: string;
 };
@@ -83,6 +79,6 @@ export type Status = 'openOrder' | 'orderHistory' | 'tradingHistory';
 
 export type GetOrderRecordRequest = {
     status: Status; // Must be either 'openOrder' | 'orderHistory' | 'tradingHistory'
-    limit: number; // default number is 10 while number must be between 1 and 250
-    page: number; // default number is 1 while number must be between 1 and 1000
+    limit?: number; // default number is 10 while number must be between 1 and 250
+    page?: number; // default number is 1 while number must be between 1 and 1000
 };

src/types/api.ts

@@ -22,7 +22,7 @@ describe('Account APIs', () => {
     test('Get Orders', async () => {
         if (skipApiTests) return;
         const api = new ApiClient({ apiKey, network: 'preprod' });
-        const res = await api.accounts.getOrderRecords();
+        const res = await api.accounts.getOrderRecords({ status: 'openOrder' });
         console.log(res);
     });
 });

src/types/requests/index.ts

@@ -13,7 +13,7 @@ describe('GetDepthResponse', () => {
     test('should have correct structure and non-negative values', async () => {
         if (skipApiTests) return;
         const api = new ApiClient({ apiKey, network: 'preprod' });
-        const res = await api.markets.getDepth({ symbol: 'ADAUSDX' });
+        const res = await api.markets.getDepth({ symbol: 'ADAUSDM' });
 
         console.log('response', res);
 
@@ -41,7 +41,7 @@ describe('GetMarketPriceRequest', () => {
     test('Buying price should have correct data format and non-negative vaule', async () => {
         if (skipApiTests) return;
         const api = new ApiClient({ apiKey, network: 'preprod' });
-        const res = await api.markets.getMarketPrice({ symbol: 'ADAUSDX' });
+        const res = await api.markets.getMarketPrice({ symbol: 'ADAUSDM' });
 
         console.log('response', res);
 
@@ -54,7 +54,7 @@ describe('GetMarketPriceRequest', () => {
     test('Selling price should have correct data format and non-negative vaule', async () => {
         if (skipApiTests) return;
         const api = new ApiClient({ apiKey, network: 'preprod' });
-        const res = await api.markets.getMarketPrice({ symbol: 'ADAUSDX' });
+        const res = await api.markets.getMarketPrice({ symbol: 'ADAUSDM' });
 
         console.log('response', res);
 

tests/accounts.test.ts

@@ -2,68 +2,28 @@
 /* eslint-disable import/no-unresolved */
 /* eslint-disable import/no-extraneous-dependencies */
 import dotenv from 'dotenv';
-import { AppWalletKeyType } from '@meshsdk/core';
 import { ApiClient } from '../src';
 
 dotenv.config();
 
 const skipApiTests = process.env.SKIP_API_TESTS === 'true';
 const apiKey = process.env.API_KEY || '';
 
-const signingKey: AppWalletKeyType = {
-    type: 'mnemonic',
-    words: (process.env.MNEMONIC || '').split(',') || [],
-};
-
 describe('Orders APIs', () => {
     test('Orders should be successfully placed and cancelled programmatically', async () => {
         if (skipApiTests) return;
-        const api = new ApiClient({ apiKey, signingKey, network: 'preprod' });
-        const buildRes = await api.orders.buildPlaceOrderTransaction({
-            symbol: 'ADAUSDX',
+        const api = new ApiClient({ apiKey, network: 'preprod' });
+        const postOrderRes = await api.postOrder({
+            symbol: 'ADAUSDM',
             side: 'sell',
             type: 'limit',
             quantity: 1000_000_000,
             price: 0.62,
         });
-        console.log('build order response', buildRes);
-        const unsignedTx = buildRes.tx_hex;
-        const signedTx = await api.wallet!.signTx(unsignedTx);
-        console.log('signed txs', signedTx);
-        const res = await api.orders.submitPlaceOrderTransaction({
-            order_id: buildRes.order_id,
-            signed_tx: signedTx,
-        });
-        console.log('response', res);
-        const cancelRes = await api.orders.buildCancelOrderTransaction(buildRes.order_id);
-        console.log('cancel order response', cancelRes);
-        const unsignedCancelTx = cancelRes.tx_hex;
-        const signedCancelTx = await api.wallet!.signTx(unsignedCancelTx);
-        console.log('signed cancel txs', signedCancelTx);
-        const cancelRes2 = await api.orders.submitCancelOrderTransaction({
-            signed_tx: signedCancelTx,
-        });
-        console.log('cancel order response', cancelRes2);
-    });
-    test('Orders should be successfully placed and cancelled programmatically in one api', async () => {
-        if (skipApiTests) return;
-        const api = new ApiClient({ apiKey, signingKey, network: 'preprod' });
-        const buildRes = await api.postOrder({
-            symbol: 'ADAUSDX',
-            side: 'sell',
-            type: 'limit',
-            quantity: 1000_000_000,
-            price: 0.62,
-        });
-        const cancelRes = await api.orders.buildCancelOrderTransaction(buildRes.order.order_id);
+        console.log('Post order response', postOrderRes);
+
+        const cancelRes = await api.cancelOrder(postOrderRes.order.order_id);
         console.log('cancel order response', cancelRes);
-        const unsignedCancelTx = cancelRes.tx_hex;
-        const signedCancelTx = await api.wallet!.signTx(unsignedCancelTx);
-        console.log('signed cancel txs', signedCancelTx);
-        const cancelRes2 = await api.orders.submitCancelOrderTransaction({
-            signed_tx: signedCancelTx,
-        });
-        console.log('cancel order response', cancelRes2);
     });
     // const sleep = (ms: number) =>
     //     new Promise((resolve) => {