@super-protocol/sdk-js 0.12.8-beta.0 → 0.12.8-beta.2

package/build/connectors/BlockchainConnector.js

@@ -79,7 +79,7 @@ var utils_1 = require("../utils");
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var app_json_1 = __importDefault(require("../contracts/app.json"));
 var ethers_1 = require("ethers");
-var Jsonrpc = require('web3-core-requestmanager/src/jsonrpc');
+var Jsonrpc = require("web3-core-requestmanager/src/jsonrpc");
 // TODO: remove this dependencies
 var store_1 = __importDefault(require("../store"));
 var Superpro_1 = __importDefault(require("../staticModels/Superpro"));
@@ -110,17 +110,17 @@ var BlockchainConnector = /** @class */ (function (_super) {
      * Needs to run this function before using blockchain connector
      */
     BlockchainConnector.prototype.initialize = function (config) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var url, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var url, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         this.logger.trace(config, "Initializing");
                         url = (config === null || config === void 0 ? void 0 : config.blockchainUrl) || constants_1.defaultBlockchainUrl;
                         this.provider = new web3_1.default.providers.HttpProvider(url);
                         store_1.default.web3Https = new web3_1.default(this.provider);
-                        if (config === null || config === void 0 ? void 0 : config.gasPrice)
-                            store_1.default.gasPrice = config.gasPrice;
+                        store_1.default.gasPrice = (_a = config === null || config === void 0 ? void 0 : config.gasPrice) !== null && _a !== void 0 ? _a : constants_1.defaultGasPrice;
                         if (config === null || config === void 0 ? void 0 : config.gasLimit)
                             store_1.default.gasLimit = config.gasLimit;
                         if (config === null || config === void 0 ? void 0 : config.gasLimitMultiplier)
@@ -130,10 +130,10 @@ var BlockchainConnector = /** @class */ (function (_super) {
                         Superpro_1.default.address = config.contractAddress;
                         this.contract = new store_1.default.web3Https.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
                         TxManager_1.default.init(store_1.default.web3Https);
-                        _a = SuperproToken_1.default;
+                        _b = SuperproToken_1.default;
                         return [4 /*yield*/, Superpro_1.default.getTokenAddress(this.contract)];
                     case 1:
-                        _a.addressHttps = _b.sent();
+                        _b.addressHttps = _c.sent();
                         Monitoring_1.Monitoring.getInstance().initializeLogging();
                         this.initialized = true;
                         this.logger.trace("Initialized");

package/build/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const defaultBlockchainUrl = "http://127.0.0.1:8545";
 export declare const defaultGasLimit = 7000000;
-export declare const defaultGasPrice = "30000000000";
+export declare const defaultGasPrice = "3000000000";
 export declare const defaultGasPriceMultiplier = 1;
 export declare const defaultGasLimitMultiplier = 1.2;
 export declare const ONE_DAY: number;

package/build/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
 exports.defaultBlockchainUrl = "http://127.0.0.1:8545";
 exports.defaultGasLimit = 7000000;
-exports.defaultGasPrice = "30000000000";
+exports.defaultGasPrice = "3000000000";
 exports.defaultGasPriceMultiplier = 1;
 exports.defaultGasLimitMultiplier = 1.2;
 exports.ONE_DAY = 24 * 60 * 60;

package/build/utils/TxManager.js

@@ -142,9 +142,7 @@ var TxManager = /** @class */ (function () {
                             }
                             txData.gas = options.gas;
                         }
-                        TxManager.logger.debug({ price: txData.gasPrice }, "gasPrice before multipling");
                         txData.gasPrice = Math.ceil(txData.gasPrice * store_1.default.gasPriceMultiplier);
-                        TxManager.logger.debug({ price: txData.gasPrice }, "gasPrice after multipling");
                         _a.label = 6;
                     case 6:
                         if (!(!(0, utils_1.checkForUsingExternalTxManager)(transactionOptions) && this.nonceTrackers[options.from])) return [3 /*break*/, 8];

package/build/utils.js

@@ -74,7 +74,7 @@ exports.getGasPrice = getGasPrice;
  * Used in all set methods
  */
 var createTransactionOptions = function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var web3, _a;
+    var web3, _a, e_1;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -86,21 +86,24 @@ var createTransactionOptions = function (options) { return __awaiter(void 0, voi
                     options.gas = store_1.default.gasLimit;
                 if (!options.gasPriceMultiplier)
                     options.gasPriceMultiplier = store_1.default.gasPriceMultiplier;
-                if (!!options.gasPrice) return [3 /*break*/, 3];
-                if (!store_1.default.gasPrice) return [3 /*break*/, 1];
-                options.gasPrice = store_1.default.gasPrice;
-                return [3 /*break*/, 3];
-            case 1:
+                if (!!options.gasPrice) return [3 /*break*/, 6];
                 web3 = options.web3 || store_1.default.web3Https;
-                if (!web3) {
-                    throw Error("web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.");
-                }
+                if (!web3) return [3 /*break*/, 5];
+                _b.label = 1;
+            case 1:
+                _b.trys.push([1, 3, , 4]);
                 _a = options;
                 return [4 /*yield*/, (0, exports.getGasPrice)(web3)];
             case 2:
                 _a.gasPrice = _b.sent();
-                _b.label = 3;
+                return [3 /*break*/, 4];
             case 3:
+                e_1 = _b.sent();
+                options.gasPrice = store_1.default.gasPrice;
+                return [3 /*break*/, 4];
+            case 4: return [3 /*break*/, 6];
+            case 5: throw Error("web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.");
+            case 6:
                 delete options.web3;
                 return [2 /*return*/, options];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.12.8-beta.0",
+  "version": "0.12.8-beta.2",
   "main": "build/index.js",
   "license": "MIT",
   "files": [