feat: updating api client

Author: HinsonSIDAN

.env.example

@@ -1,6 +1,5 @@
 # ENV for running unit tests
 
-BASE_URL="http://localhost:8080"
 AUTH_KEY="testing"
 WALLET_ADDRESS="addr_test1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 API_KEY=""

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@deltadefi-protocol/typescript-sdk",
     "description": "The Typescript SDK for interacting with DeltaDeFi protocol",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "license": "Apache-2.0",
     "main": "dist/cjs/index.js",
     "module": "dist/mjs/index.js",

src/client/index.ts

@@ -8,7 +8,7 @@ import { DeFiWallet } from './wallet';
 export class ApiClient {
     private axiosInstance: AxiosInstance;
 
-    public networkId = 0;
+    public networkId: 0 | 1 = 0;
 
     public accounts: Accounts;
 
@@ -18,12 +18,17 @@ export class ApiClient {
 
     public wallet?: DeFiWallet;
 
-    constructor(baseURL: string, { networkId, jwt, apiKey, signingKey }: ApiConfig) {
+    constructor({ network, jwt, apiKey, signingKey }: ApiConfig, ProvidedBaseURL?: string) {
+        let baseURL = 'https://api-dev.deltadefi.io';
         const headers: ApiHeaders = {
             'Content-Type': 'application/json',
         };
-        if (networkId) {
-            this.networkId = networkId;
+        if (network) {
+            this.networkId = network === 'mainnet' ? 1 : 0;
+            baseURL =
+                network === 'mainnet'
+                    ? 'https://api-dev.deltadefi.io'
+                    : 'https://api-dev.deltadefi.io'; // TODO: input production link once available
         }
         if (jwt) {
             headers.Authorization = jwt;
@@ -32,7 +37,10 @@ export class ApiClient {
             headers['X-API-KEY'] = apiKey;
         }
         if (signingKey) {
-            this.wallet = new DeFiWallet(signingKey, networkId || 0);
+            this.wallet = new DeFiWallet(signingKey, this.networkId);
+        }
+        if (ProvidedBaseURL) {
+            baseURL = ProvidedBaseURL;
         }
         this.axiosInstance = axios.create({
             baseURL,

src/types/api.ts

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

tests/accounts.test.ts

@@ -6,18 +6,17 @@ import { ApiClient } from '../src';
 dotenv.config();
 
 const wallet_address = process.env.WALLET_ADDRESS || '';
-const baseURL = process.env.BASE_URL || 'http://localhost:8080';
 const auth_key = process.env.AUTH_KEY || '';
 const apiKey = process.env.API_KEY || '';
 
 describe('Account APIs', () => {
     test('Sign In', async () => {
-        const api = new ApiClient(baseURL, {});
+        const api = new ApiClient({ network: 'preprod' });
         const res = await api.accounts.signIn({ wallet_address, auth_key });
         expect(res.token).not.toBe('');
     });
     test('Get Orders', async () => {
-        const api = new ApiClient(baseURL, { apiKey });
+        const api = new ApiClient({ apiKey, network: 'preprod' });
         const res = await api.accounts.getOrders();
         console.log(res);
     });

tests/markets.test.ts

@@ -6,14 +6,11 @@ import { MarketDepth } from '../src/types';
 
 dotenv.config();
 
-// const wallet_address = process.env.WALLET_ADDRESS || '';
-const baseURL = process.env.BASE_URL || 'http://localhost:8080';
-// const auth_key = process.env.AUTH_KEY || '';
 const apiKey = process.env.API_KEY || '';
 
 describe('GetDepthResponse', () => {
     test('should have correct structure and non-negative values', async () => {
-        const api = new ApiClient(baseURL, { apiKey });
+        const api = new ApiClient({ apiKey, network: 'preprod' });
         const res = await api.markets.getDepth({ pair: 'ADAUSDX' });
 
         console.log('response', res);
@@ -40,7 +37,7 @@ describe('GetDepthResponse', () => {
 
 describe('GetMarketPriceRequest', () => {
     test('Buying price should have correct data format and non-negative vaule', async () => {
-        const api = new ApiClient(baseURL, { apiKey });
+        const api = new ApiClient({ apiKey, network: 'preprod' });
         const res = await api.markets.getMarketPrice({ pair: 'ADAUSDX' });
 
         console.log('response', res);
@@ -52,7 +49,7 @@ describe('GetMarketPriceRequest', () => {
         expect(res.price).toBeGreaterThanOrEqual(0);
     });
     test('Selling price should have correct data format and non-negative vaule', async () => {
-        const api = new ApiClient(baseURL, { apiKey });
+        const api = new ApiClient({ apiKey, network: 'preprod' });
         const res = await api.markets.getMarketPrice({ pair: 'ADAUSDX' });
 
         console.log('response', res);

tests/orders.test.ts

@@ -7,7 +7,6 @@ import { ApiClient } from '../src';
 
 dotenv.config();
 
-const baseURL = process.env.BASE_URL || 'http://localhost:8080';
 const apiKey = process.env.API_KEY || '';
 
 const signingKey: AppWalletKeyType = {
@@ -17,7 +16,7 @@ const signingKey: AppWalletKeyType = {
 
 describe('Orders APIs', () => {
     test('Orders should be successfully placed and cancelled programmatically', async () => {
-        const api = new ApiClient(baseURL, { apiKey, signingKey });
+        const api = new ApiClient({ apiKey, signingKey, network: 'preprod' });
         const buildRes = await api.orders.buildPostOrderTransaction({
             pair: 'ADAUSDX',
             side: 'sell',
@@ -43,7 +42,7 @@ describe('Orders APIs', () => {
     });
 
     test('Orders should be successfully placed and cancelled programmatically in one api', async () => {
-        const api = new ApiClient(baseURL, { apiKey, signingKey });
+        const api = new ApiClient({ apiKey, signingKey, network: 'preprod' });
         const buildRes = await api.postOrder({
             pair: 'ADAUSDX',
             side: 'sell',