@gnolang/tm2-js-client 1.1.1 → 1.1.3

package/bin/provider/jsonrpc/jsonrpc.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONRPCProvider = void 0;
+var types_1 = require("../types");
 var services_1 = require("../../services");
 var utility_1 = require("../utility");
 var endpoints_1 = require("../endpoints");
@@ -224,7 +225,7 @@ var JSONRPCProvider = /** @class */ (function () {
                         // Check if there is an immediate tx-broadcast error
                         // (originating from basic transaction checks like CheckTx)
                         if (response.error) {
-                            errType = response.error.ABCIErrorKey;
+                            errType = response.error[types_1.ABCIErrorKey];
                             log = response.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }
@@ -246,13 +247,13 @@ var JSONRPCProvider = /** @class */ (function () {
                         check_tx = response.check_tx, deliver_tx = response.deliver_tx;
                         // Check if there is an immediate tx-broadcast error (in CheckTx)
                         if (check_tx.ResponseBase.Error) {
-                            errType = check_tx.ResponseBase.Error.ABCIErrorKey;
+                            errType = check_tx.ResponseBase.Error[types_1.ABCIErrorKey];
                             log = check_tx.ResponseBase.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }
                         // Check if there is a parsing error with the transaction (in DeliverTx)
                         if (deliver_tx.ResponseBase.Error) {
-                            errType = deliver_tx.ResponseBase.Error.ABCIErrorKey;
+                            errType = deliver_tx.ResponseBase.Error[types_1.ABCIErrorKey];
                             log = deliver_tx.ResponseBase.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }

package/bin/provider/jsonrpc/jsonrpc.test.js

@@ -39,6 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var types_1 = require("../types");
 var axios_1 = __importDefault(require("axios"));
 var jsonrpc_1 = require("./jsonrpc");
 var utility_1 = require("../utility");
@@ -110,6 +111,7 @@ describe('JSON-RPC Provider', function () {
         });
     }); });
     describe('sendTransaction', function () {
+        var _a;
         var validResult = {
             error: null,
             data: null,
@@ -119,9 +121,9 @@ describe('JSON-RPC Provider', function () {
         var mockError = '/std.UnauthorizedError';
         var mockLog = 'random error message';
         var invalidResult = {
-            error: {
-                ABCIErrorKey: mockError,
-            },
+            error: (_a = {},
+                _a[types_1.ABCIErrorKey] = mockError,
+                _a),
             data: null,
             Log: mockLog,
             hash: '',

package/bin/provider/utility/requests.utility.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.stringToBase64 = exports.parseABCI = exports.newResponse = exports.newRequest = void 0;
+var uuid_1 = require("uuid");
 // The version of the supported JSON-RPC protocol
 var standardVersion = '2.0';
 /**
@@ -26,7 +27,7 @@ exports.newRequest = newRequest;
  */
 var newResponse = function (result, error) {
     return {
-        id: Date.now(),
+        id: (0, uuid_1.v4)(),
         jsonrpc: standardVersion,
         result: result,
         error: error,

package/bin/provider/websocket/ws.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSProvider = void 0;
+var types_1 = require("../types");
 var utility_1 = require("../utility");
 var endpoints_1 = require("../endpoints");
 var errors_utility_1 = require("../utility/errors.utility");
@@ -58,8 +59,8 @@ var WSProvider = /** @class */ (function () {
          */
         this.waitForOpenConnection = function () {
             return new Promise(function (resolve, reject) {
-                var maxNumberOfAttempts = 10;
-                var intervalTime = 200; //ms
+                var maxNumberOfAttempts = 20;
+                var intervalTime = 500; // ms
                 var currentAttempt = 0;
                 var interval = setInterval(function () {
                     if (_this.ws.readyState === WebSocket.OPEN) {
@@ -67,9 +68,9 @@ var WSProvider = /** @class */ (function () {
                         resolve(null);
                     }
                     currentAttempt++;
-                    if (currentAttempt > maxNumberOfAttempts - 1) {
+                    if (currentAttempt >= maxNumberOfAttempts) {
                         clearInterval(interval);
-                        reject(new Error('Maximum number of attempts exceeded'));
+                        reject(new Error('Unable to establish WS connection'));
                     }
                 }, intervalTime);
             });
@@ -313,7 +314,7 @@ var WSProvider = /** @class */ (function () {
                         // Check if there is an immediate tx-broadcast error
                         // (originating from basic transaction checks like CheckTx)
                         if (broadcastResponse.error) {
-                            errType = broadcastResponse.error.ABCIErrorKey;
+                            errType = broadcastResponse.error[types_1.ABCIErrorKey];
                             log = broadcastResponse.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }
@@ -334,13 +335,13 @@ var WSProvider = /** @class */ (function () {
                         check_tx = broadcastResponse.check_tx, deliver_tx = broadcastResponse.deliver_tx;
                         // Check if there is an immediate tx-broadcast error (in CheckTx)
                         if (check_tx.ResponseBase.Error) {
-                            errType = check_tx.ResponseBase.Error.ABCIErrorKey;
+                            errType = check_tx.ResponseBase.Error[types_1.ABCIErrorKey];
                             log = check_tx.ResponseBase.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }
                         // Check if there is a parsing error with the transaction (in DeliverTx)
                         if (deliver_tx.ResponseBase.Error) {
-                            errType = deliver_tx.ResponseBase.Error.ABCIErrorKey;
+                            errType = deliver_tx.ResponseBase.Error[types_1.ABCIErrorKey];
                             log = deliver_tx.ResponseBase.Log;
                             throw (0, errors_utility_1.constructRequestError)(errType, log);
                         }

package/bin/provider/websocket/ws.test.js

@@ -39,6 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var types_1 = require("../types");
 var utility_1 = require("../utility");
 var ws_1 = require("./ws");
 var jest_websocket_mock_1 = __importDefault(require("jest-websocket-mock"));
@@ -338,6 +339,7 @@ describe('WS Provider', function () {
         });
     }); });
     describe('sendTransaction', function () {
+        var _a;
         var validResult = {
             error: null,
             data: null,
@@ -347,9 +349,9 @@ describe('WS Provider', function () {
         var mockError = '/std.UnauthorizedError';
         var mockLog = 'random error message';
         var invalidResult = {
-            error: {
-                ABCIErrorKey: mockError,
-            },
+            error: (_a = {},
+                _a[types_1.ABCIErrorKey] = mockError,
+                _a),
             data: null,
             Log: mockLog,
             hash: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnolang/tm2-js-client",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Tendermint2 JS / TS Client",
   "main": "./bin/index.js",
   "repository": {
@@ -47,9 +47,11 @@
     "@cosmjs/amino": "^0.31.0",
     "@cosmjs/crypto": "^0.31.0",
     "@cosmjs/ledger-amino": "^0.31.0",
+    "@types/uuid": "^9.0.4",
     "axios": "^1.4.0",
     "long": "^5.2.3",
     "protobufjs": "^7.2.3",
+    "uuid": "^9.0.1",
     "ws": "^8.13.0"
   },
   "scripts": {