Merge pull request #218 from Team-Kujira/fix/kujira/tendermint-changes

Fix / Kujira / New tendermint changes

package.json

@@ -23,8 +23,8 @@
     "test:scripts": "jest -i --verbose ./test-scripts/*.test.ts"
   },
   "dependencies": {
-    "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
+    "@cosmjs/proto-signing": "^0.31.1",
+    "@cosmjs/stargate": "^0.31.1",
     "@crocswap/sdk": "^2.4.5",
     "@ethersproject/abstract-provider": "5.7.0",
     "@ethersproject/address": "5.7.0",
@@ -76,7 +76,7 @@
     "http-status-codes": "2.2.0",
     "immutable": "^4.2.4",
     "js-yaml": "^4.1.0",
-    "kujira.js": "^0.8.145",
+    "kujira.js": "0.9.6",
     "level": "^8.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",

src/clob/clob.validators.ts

@@ -112,7 +112,9 @@ export const validateOrderId: Validator = mkValidator(
 export const validateOrderType: Validator = mkValidator(
   'orderType',
   invalidOrderTypeError,
-  (val) => typeof val === 'string' && (val === 'LIMIT' || val === 'LIMIT_MAKER')
+  (val) =>
+    typeof val === 'string' &&
+    (val === 'LIMIT' || val === 'LIMIT_MAKER' || val === 'MARKET')
 );
 
 const NETWORK_VALIDATIONS = [validateConnector, validateChain, validateNetwork];

src/connectors/kujira/kujira.model.ts

@@ -154,7 +154,7 @@ import {
   DirectSecp256k1HdWallet,
   EncodeObject,
 } from '@cosmjs/proto-signing';
-import { HttpBatchClient, Tendermint34Client } from '@cosmjs/tendermint-rpc';
+import { HttpBatchClient, Tendermint37Client } from '@cosmjs/tendermint-rpc';
 import { StdFee } from '@cosmjs/amino';
 import { IndexedTx } from '@cosmjs/stargate/build/stargateclient';
 import { BigNumber } from 'bignumber.js';
@@ -245,7 +245,7 @@ export class KujiraModel {
    */
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  private tendermint34Client: Tendermint34Client;
+  private tendermint37Client: Tendermint37Client;
 
   /**
    *
@@ -385,7 +385,7 @@ export class KujiraModel {
 
       this.kujiraGetHttpBatchClient(rpcEndpoint);
 
-      await this.kujiraGetTendermint34Client();
+      await this.kujiraGetTendermint37Client();
 
       this.kujiraGetKujiraQueryClient();
 
@@ -411,12 +411,12 @@ export class KujiraModel {
 
   private kujiraGetKujiraQueryClient() {
     this.kujiraQueryClient = kujiraQueryClient({
-      client: this.tendermint34Client,
+      client: this.tendermint37Client,
     });
   }
 
-  private async kujiraGetTendermint34Client() {
-    this.tendermint34Client = await Tendermint34Client.create(
+  private async kujiraGetTendermint37Client() {
+    this.tendermint37Client = await Tendermint37Client.create(
       this.httpBatchClient
     );
   }
@@ -1960,8 +1960,8 @@ export class KujiraModel {
     return JSON.parse(decryptedString);
   }
 
-  async toClient(endpoint: string): Promise<[Tendermint34Client, string]> {
-    const client = await Tendermint34Client.create(
+  async toClient(endpoint: string): Promise<[Tendermint37Client, string]> {
+    const client = await Tendermint37Client.create(
       new HttpBatchClient(endpoint, {
         dispatchInterval: 100,
         batchSizeLimit: 200,

test-bronze/connectors/kujira/fixtures/patches/patches.ts

@@ -173,11 +173,11 @@ export const createPatches = (
   );
 
   patches.setIn(
-    ['kujira', 'kujiraGetTendermint34Client'],
+    ['kujira', 'kujiraGetTendermint37Client'],
     async (testTitle: string) => {
       if (!usePatches) return;
 
-      patch(kujira, 'kujiraGetTendermint34Client', async (...any: any[]) => {
+      patch(kujira, 'kujiraGetTendermint37Client', async (...any: any[]) => {
         const inputArguments = any;
 
         if (!ordinalMap.has(testTitle)) {
@@ -191,7 +191,7 @@ export const createPatches = (
 
         const dataKey = [
           'kujira',
-          'kujiraGetTendermint34Client',
+          'kujiraGetTendermint37Client',
           testTitle,
           ordinal,
         ];
@@ -202,7 +202,7 @@ export const createPatches = (
           return await inputOutputWrapper<any>(
             dataKey,
             kujira,
-            'kujiraGetTendermint34Client',
+            'kujiraGetTendermint37Client',
             inputArguments
           );
         }

test-bronze/connectors/kujira/kujira.controllers.test.ts

@@ -80,6 +80,7 @@ import {
   Market,
   MarketId,
   MarketName,
+  MarketNotFoundError,
   MarketsWithdrawsFundsResponse,
   MarketsWithdrawsRequest,
   MarketWithdrawRequest,
@@ -290,7 +291,7 @@ beforeAll(async () => {
   // await getPatch(['global', 'fetch'])('beforeAll');
   await getPatch(['kujira', 'getFastestRpc'])('beforeAll');
   await getPatch(['kujira', 'kujiraGetHttpBatchClient'])('beforeAll');
-  await getPatch(['kujira', 'kujiraGetTendermint34Client'])('beforeAll');
+  await getPatch(['kujira', 'kujiraGetTendermint37Client'])('beforeAll');
   await getPatch(['kujira', 'kujiraGetKujiraQueryClient'])('beforeAll');
   await getPatch(['kujira', 'kujiraGetStargateClient'])('beforeAll');
   await getPatch(['kujira', 'kujiraGetBasicMarkets'])('beforeAll');
@@ -4819,4 +4820,100 @@ describe('Kujira', () => {
       }
     });
   });
+
+  describe('Exceptions', () => {
+    it.skip('Generate TokenNotFound Exception (token)', async () => {
+      const requestBody = {
+        name: 'KUJ',
+      } as GetTokenRequest;
+
+      const request = {
+        ...commonRequestBody,
+        ...requestBody,
+      };
+
+      logRequest(request);
+
+      try {
+        sendRequest<GetTokenResponse>({
+          RESTMethod: RESTfulMethod.GET,
+          RESTRoute: '/token',
+          RESTRequest: request,
+          controllerFunction: KujiraController.getToken,
+        });
+      } catch (e) {
+        expect(true).toBeTrue();
+      }
+    });
+
+    it.skip('Generate MarketNotFoundError Exception', async () => {
+      const requestBody = {
+        ownerAddress: ownerAddress,
+      } as MarketsWithdrawsRequest;
+
+      const request = {
+        ...commonRequestBody,
+        ...requestBody,
+      };
+
+      logRequest(request);
+      try {
+        await sendRequest<MarketsWithdrawsFundsResponse>({
+          RESTMethod: RESTfulMethod.POST,
+          RESTRoute: '/market/withdraws',
+          RESTRequest: request,
+          controllerFunction: KujiraController.withdrawFromMarkets,
+        });
+      } catch (e) {
+        expect(e).toEqual(new MarketNotFoundError('No market informed.'));
+      }
+    });
+
+    it.skip('Generate TokenNotFoundError Exception (tokens)', async () => {
+      const requestBody = {
+        names: ['KUJ', tokensIds[3]],
+      } as GetTokensRequest;
+
+      const request = {
+        ...commonRequestBody,
+        ...requestBody,
+      };
+
+      logRequest(request);
+      try {
+        await sendRequest<GetTokensResponse>({
+          RESTMethod: RESTfulMethod.GET,
+          RESTRoute: '/tokens',
+          RESTRequest: request,
+          controllerFunction: KujiraController.getTokens,
+        });
+      } catch (exception) {
+        expect(true).toBeTrue();
+      }
+    });
+
+    it('Generate Exception in getMarket', async () => {
+      const requestBody = {
+        name: 'KUJX/USK',
+      } as GetMarketRequest;
+
+      const request = {
+        ...commonRequestBody,
+        ...requestBody,
+      };
+
+      logRequest(request);
+
+      try {
+        await sendRequest<GetMarketResponse>({
+          RESTMethod: RESTfulMethod.GET,
+          RESTRoute: '/market',
+          RESTRequest: request,
+          controllerFunction: KujiraController.getMarket,
+        });
+      } catch (exception) {
+        expect(true).toBeTrue();
+      }
+    });
+  });
 });