@super-protocol/sdk-js 0.8.1-beta.2 → 0.9.0-beta.1

package/build/staticModels/OrdersFactory.js

@@ -39,14 +39,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var store_1 = __importDefault(require("../store"));
-var logger_1 = __importDefault(require("../logger"));
-var app_json_1 = __importDefault(require("../contracts/app.json"));
 var utils_1 = require("../utils");
 var Order_1 = require("../types/Order");
 var utils_2 = require("ethers/lib/utils");
 var Superpro_1 = __importDefault(require("./Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
+var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
 var OrdersFactory = /** @class */ (function () {
     function OrdersFactory() {
     }
@@ -57,23 +55,6 @@ var OrdersFactory = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    OrdersFactory.checkInit = function (transactionOptions) {
-        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
-            (0, utils_1.checkIfInitialized)();
-            return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-        }
-        if (this.contract)
-            return this.contract;
-        (0, utils_1.checkIfInitialized)();
-        this.logger = logger_1.default.child({
-            className: "OrdersFactory",
-            address: Superpro_1.default.address,
-        });
-        return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
-    };
     /**
      * Function for fetching list of all orders ids
      * @returns list of orders ids
@@ -81,14 +62,14 @@ var OrdersFactory = /** @class */ (function () {
     OrdersFactory.getAllOrders = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var ordersSet, ordersCount, orderId;
+            var contract, ordersSet, ordersCount, orderId;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.checkInit();
+                        contract = BlockchainConnector_1.default.getContractInstance();
                         this.orders = (_a = this.orders) !== null && _a !== void 0 ? _a : [];
                         ordersSet = new Set(this.orders);
-                        return [4 /*yield*/, this.contract.methods.getOrdersCount().call()];
+                        return [4 /*yield*/, contract.methods.getOrdersCount().call()];
                     case 1:
                         ordersCount = _b.sent();
                         for (orderId = ordersSet.size + 1; orderId <= ordersCount; orderId++) {
@@ -105,13 +86,13 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.getOrdersCount = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
+            var contract, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.checkInit();
+                        contract = BlockchainConnector_1.default.getContractInstance();
                         _a = Number;
-                        return [4 /*yield*/, this.contract.methods.getOrdersCount().call()];
+                        return [4 /*yield*/, contract.methods.getOrdersCount().call()];
                     case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
                 }
             });
@@ -123,11 +104,12 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.getOrderHoldDeposit = function (orderId) {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getOrderHoldDeposit(orderId).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getOrderHoldDeposit(orderId).call()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -149,7 +131,7 @@ var OrdersFactory = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         orderInfoArguments = (0, utils_1.objectToTuple)(orderInfo, Order_1.OrderInfoStructure);
                         formattedExternalId = (0, utils_2.formatBytes32String)(externalId);
@@ -167,7 +149,7 @@ var OrdersFactory = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit();
+                        contract = BlockchainConnector_1.default.getContractInstance();
                         filter = {
                             consumer: consumer,
                             externalId: (0, utils_2.formatBytes32String)(externalId),
@@ -203,7 +185,7 @@ var OrdersFactory = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         perentOrderInfoArgs = (0, utils_1.objectToTuple)(perentOrderInfo, Order_1.OrderInfoStructure);
                         formattedExternalId = (0, utils_2.formatBytes32String)(externalId);
@@ -228,7 +210,7 @@ var OrdersFactory = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.refillOrder, [orderId, amount], transactionOptions)];
                     case 1:
@@ -245,9 +227,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onWorkflowCreated = function (callback) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onWorkflowCreated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .WorkflowCreated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -273,9 +255,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderCreated = function (callback) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderCreated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderCreated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -302,9 +284,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onSubOrderCreated = function (callback, parentOrderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onSubOrderCreated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .SubOrderCreated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -333,9 +315,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderStarted = function (callback, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderStarted" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderStarted()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -364,9 +346,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrdersStatusUpdated = function (callback, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrdersStatusUpdated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderStatusUpdated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -396,9 +378,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderDepositRefilled = function (callback, consumer, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderDepositRefilled" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderDepositRefilled()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -430,9 +412,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderPriceUpdated = function (callback, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderPriceUpdated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderPriceUpdated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -461,9 +443,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderChangedWithdrawn = function (callback, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderChangedWithdrawn" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderChangedWithdrawn()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -493,9 +475,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderProfitWithdrawn = function (callback, orderId, tokenReceiver) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderProfitWithdrawn" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderProfitWithdrawn()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -528,9 +510,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderAwaitingPaymentChanged = function (callback, consumer, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderAwaitingPaymentChanged" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderAwaitingPaymentChanged()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -563,9 +545,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderDepositSpentChanged = function (callback, consumer, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderDepositSpentChanged" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderDepositSpentChanged()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -598,9 +580,9 @@ var OrdersFactory = /** @class */ (function () {
      */
     OrdersFactory.onOrderEncryptedResultUpdated = function (callback, consumer, orderId) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOrderEncryptedResultUpdated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OrderEncryptedResultUpdated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/build/staticModels/ProviderRegistry.d.ts

@@ -2,14 +2,8 @@ import { ProviderInfo } from "../types/Provider";
 import { BigNumber } from "ethers";
 import { BlockInfo, TransactionOptions } from "../types/Web3";
 declare class ProviderRegistry {
-    private static contract;
     private static logger;
     static providers?: string[];
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    private static checkInitProviders;
-    private static checkInitProvidersOffers;
     /**
      * Function for fetching list of all providers addresses
      */

package/build/staticModels/ProviderRegistry.js

@@ -39,53 +39,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var store_1 = __importDefault(require("../store"));
-var logger_1 = __importDefault(require("../logger"));
-var app_json_1 = __importDefault(require("../contracts/app.json"));
 var utils_1 = require("../utils");
 var Provider_1 = require("../types/Provider");
-var Superpro_1 = __importDefault(require("./Superpro"));
+var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var ProviderRegistry = /** @class */ (function () {
     function ProviderRegistry() {
     }
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    ProviderRegistry.checkInitProviders = function (transactionOptions) {
-        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
-            (0, utils_1.checkIfInitialized)();
-            return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-        }
-        if (this.contract)
-            return this.contract;
-        (0, utils_1.checkIfInitialized)();
-        this.logger = logger_1.default.child({ className: "Providers" });
-        return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
-    };
-    ProviderRegistry.checkInitProvidersOffers = function (transactionOptions) {
-        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
-            (0, utils_1.checkIfInitialized)();
-            return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-        }
-        if (this.contract)
-            return this.contract;
-        (0, utils_1.checkIfInitialized)();
-        this.logger = logger_1.default.child({ className: "ProvidersOffers" });
-        return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
-    };
     /**
      * Function for fetching list of all providers addresses
      */
     ProviderRegistry.getAllProviders = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
+            var contract, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.checkInitProviders();
+                        contract = BlockchainConnector_1.default.getContractInstance();
                         _a = this;
-                        return [4 /*yield*/, this.contract.methods.getProvidersAuths().call()];
+                        return [4 /*yield*/, contract.methods.getProvidersAuths().call()];
                     case 1:
                         _a.providers = _b.sent();
                         return [2 /*return*/, this.providers];
@@ -108,11 +80,12 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.getSecurityDeposit = function (providerAuthority) {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInitProviders();
-                        return [4 /*yield*/, this.contract.methods.getProviderSecurityDeposit(providerAuthority).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getProviderSecurityDeposit(providerAuthority).call()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -120,11 +93,12 @@ var ProviderRegistry = /** @class */ (function () {
     };
     ProviderRegistry.isProviderRegistered = function (providerAuthority) {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInitProviders();
-                        return [4 /*yield*/, this.contract.methods.isProviderRegistered(providerAuthority).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.isProviderRegistered(providerAuthority).call()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -142,7 +116,7 @@ var ProviderRegistry = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInitProviders(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         providerInfoParams = (0, utils_1.objectToTuple)(providerInfo, Provider_1.ProviderInfoStructure);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.registerProvider, [providerInfoParams], transactionOptions)];
@@ -165,7 +139,7 @@ var ProviderRegistry = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInitProviders(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.refillProviderSecurityDepo, [amount], transactionOptions)];
                     case 1:
@@ -187,7 +161,7 @@ var ProviderRegistry = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInitProviders(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.returnProviderSecurityDepo, [amount], transactionOptions)];
                     case 1:
@@ -204,9 +178,9 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.onProviderRegistered = function (callback) {
         var _this = this;
-        this.checkInitProviders();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onProviderRegistered" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .ProviderRegistred()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -231,9 +205,9 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.onProviderModified = function (callback) {
         var _this = this;
-        this.checkInitProviders();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onProviderModified" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .ProviderModified()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -258,9 +232,9 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.onProviderViolationRateIncremented = function (callback) {
         var _this = this;
-        this.checkInitProviders();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onProviderViolationRateIncremented" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .ProviderViolationRateIncremented()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -285,9 +259,9 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.onProviderSecurityDepoRefilled = function (callback) {
         var _this = this;
-        this.checkInitProviders();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onProviderSecurityDepoRefilled" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .ProviderSecurityDepoRefilled()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -312,9 +286,9 @@ var ProviderRegistry = /** @class */ (function () {
      */
     ProviderRegistry.onProviderSecurityDepoUnlocked = function (callback) {
         var _this = this;
-        this.checkInitProviders();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onProviderSecurityDepoUnlocked" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .ProviderSecurityDepoUnlocked()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/build/staticModels/Staking.d.ts

@@ -1,13 +1,8 @@
 import { LockInfo, StakeInfo, Purpose } from "../types/Staking";
 import { TransactionOptions } from "../types/Web3";
 declare class Staking {
-    private static contract;
     private static logger;
     static get address(): string;
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    private static checkInit;
     /**
      * Fetching stake info by owner address from blockchain
      */

package/build/staticModels/Staking.js

@@ -39,11 +39,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = __importDefault(require("../logger"));
-var app_json_1 = __importDefault(require("../contracts/app.json"));
-var store_1 = __importDefault(require("../store"));
 var utils_1 = require("../utils");
 var Staking_1 = require("../types/Staking");
+var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
 var Superpro_1 = __importDefault(require("./Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var Staking = /** @class */ (function () {
@@ -56,31 +54,17 @@ var Staking = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    Staking.checkInit = function (transactionOptions) {
-        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
-            (0, utils_1.checkIfInitialized)();
-            return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-        }
-        if (this.contract)
-            return this.contract;
-        (0, utils_1.checkIfInitialized)();
-        this.logger = logger_1.default.child({ className: "Staking" });
-        return this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-    };
     /**
      * Fetching stake info by owner address from blockchain
      */
     Staking.getStakeInfo = function (ownerAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var stakeInfoParams;
+            var contract, stakeInfoParams;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getStakeInfo(ownerAddress).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getStakeInfo(ownerAddress).call()];
                     case 1:
                         stakeInfoParams = _a.sent();
                         return [2 /*return*/, (0, utils_1.tupleToObject)(stakeInfoParams, Staking_1.StakeInfoStructure)];
@@ -93,12 +77,12 @@ var Staking = /** @class */ (function () {
      */
     Staking.getLockInfo = function (purpose, ownerAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var lockInfoParams;
+            var contract, lockInfoParams;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getLockedTokensInfo(purpose, ownerAddress).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getLockedTokensInfo(purpose, ownerAddress).call()];
                     case 1:
                         lockInfoParams = _a.sent();
                         return [2 /*return*/, (0, utils_1.tupleToObject)(lockInfoParams, Staking_1.LockInfoStructure)];
@@ -117,7 +101,7 @@ var Staking = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit(transactionOptions);
+                        contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.stake, [amount], transactionOptions)];
                     case 1:

package/build/staticModels/Superpro.d.ts

@@ -1,12 +1,7 @@
 import { ContractName, ParamName } from "../types/Superpro";
 declare class Superpro {
     static address: string;
-    private static contract;
     private static logger;
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    private static checkInit;
     /**
      * Fetching address of contract by name
      */

package/build/staticModels/Superpro.js

@@ -39,41 +39,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = __importDefault(require("../logger"));
-var app_json_1 = __importDefault(require("../contracts/app.json"));
-var store_1 = __importDefault(require("../store"));
+var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
 var Superpro = /** @class */ (function () {
     function Superpro() {
     }
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    Superpro.checkInit = function () {
-        if (this.contract)
-            return;
-        if (!this.address || !store_1.default.web3)
-            throw new Error("BlockchainConnector is not initialized, needs to run 'await BlockchainConnector.init(CONFIG)' first");
-        this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, this.address);
-        this.logger = logger_1.default.child({ className: "Superpro", address: this.address });
-    };
     /**
      * Fetching address of contract by name
      */
     Superpro.getContractAddress = function (name) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.checkInit();
                 return [2 /*return*/, this.address];
             });
         });
     };
     Superpro.getTokenAddress = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getToken().call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getToken().call()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -84,11 +71,12 @@ var Superpro = /** @class */ (function () {
      */
     Superpro.getParam = function (name) {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getConfigParam(name).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getConfigParam(name).call()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });

package/build/staticModels/SuperproToken.d.ts

@@ -1,9 +1,11 @@
 import { Transaction } from "web3-core";
 import { TransactionOptions, BlockInfo } from "../types/Web3";
 declare class SuperproToken {
-    static address: string;
+    private static _address;
     private static contract;
     private static logger;
+    static get address(): string;
+    static set address(newAddress: string);
     /**
      * Checks if contract has been initialized, if not - initialize contract
      */