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

package/build/staticModels/Marks.js

@@ -39,10 +39,8 @@ 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 utils_1 = require("../utils");
+var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
 var Superpro_1 = __importDefault(require("./Superpro"));
-var app_json_1 = __importDefault(require("../contracts/app.json"));
 var Marks = /** @class */ (function () {
     function Marks() {
     }
@@ -53,26 +51,14 @@ var Marks = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    Marks.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)();
-        return this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
-    };
     Marks.getProviderMarks = function (providerAddress) {
         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.getProviderMarks(providerAddress).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getProviderMarks(providerAddress).call()];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -82,11 +68,12 @@ var Marks = /** @class */ (function () {
     };
     Marks.getOrderMark = 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.getOrderMark(orderId).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getOrderMark(orderId).call()];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -96,11 +83,12 @@ var Marks = /** @class */ (function () {
     };
     Marks.setOrderMark = function (orderId, mark) {
         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.setOrderMark(orderId, mark).call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.setOrderMark(orderId, mark).call()];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/staticModels/OffersFactory.d.ts

@@ -2,14 +2,9 @@ import { OfferInfoV1, OfferType } from "../types/Offer";
 import { BlockInfo, TransactionOptions } from "../types/Web3";
 import { OfferCreatedEvent } from "../types/Events";
 declare class OffersFactory {
-    private static contract;
-    private static logger;
+    private static readonly logger;
     static offers?: string[];
     static get address(): string;
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    private static checkInit;
     /**
      * Function for fetching list of all offers ids
      */

package/build/staticModels/OffersFactory.js

@@ -39,14 +39,13 @@ 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 Offer_1 = require("../types/Offer");
 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 OffersFactory = /** @class */ (function () {
     function OffersFactory() {
     }
@@ -57,31 +56,17 @@ var OffersFactory = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    OffersFactory.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: "OffersFactory" });
-        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 offers ids
      */
     OffersFactory.getAllOffers = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var count, offersSet, offerId, offerType;
+            var contract, count, offersSet, offerId, offerType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.checkInit();
-                        return [4 /*yield*/, this.contract.methods.getOffersTotalCount().call()];
+                        contract = BlockchainConnector_1.default.getContractInstance();
+                        return [4 /*yield*/, contract.methods.getOffersTotalCount().call()];
                     case 1:
                         count = _a.sent();
                         this.offers = this.offers || [];
@@ -90,7 +75,7 @@ var OffersFactory = /** @class */ (function () {
                         _a.label = 2;
                     case 2:
                         if (!(offerId <= count)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.contract.methods.getOfferType(offerId).call()];
+                        return [4 /*yield*/, contract.methods.getOfferType(offerId).call()];
                     case 3:
                         offerType = (_a.sent());
                         if (offerType !== Offer_1.OfferType.TeeOffer) {
@@ -120,7 +105,7 @@ var OffersFactory = /** @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);
                         delete offerInfoV1.disabledAfter;
                         offerInfo = offerInfoV1;
@@ -140,7 +125,7 @@ var OffersFactory = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        contract = this.checkInit();
+                        contract = BlockchainConnector_1.default.getContractInstance();
                         filter = {
                             creator: creator,
                             externalId: (0, utils_2.formatBytes32String)(externalId),
@@ -167,9 +152,9 @@ var OffersFactory = /** @class */ (function () {
      */
     OffersFactory.onOfferCreated = function (callback) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOfferCreated" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OfferCreated()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -189,9 +174,9 @@ var OffersFactory = /** @class */ (function () {
     };
     OffersFactory.onOfferEnabled = function (callback) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOfferEnabled" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OfferEnabled()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -211,9 +196,9 @@ var OffersFactory = /** @class */ (function () {
     };
     OffersFactory.onOfferDisabled = function (callback) {
         var _this = this;
-        this.checkInit();
+        var contract = BlockchainConnector_1.default.getContractInstance();
         var logger = this.logger.child({ method: "onOfferDisabled" });
-        var subscription = this.contract.events
+        var subscription = contract.events
             .OfferEnabled()
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -231,6 +216,7 @@ var OffersFactory = /** @class */ (function () {
         });
         return function () { return subscription.unsubscribe(); };
     };
+    OffersFactory.logger = logger_1.default.child({ className: "OffersFactory" });
     return OffersFactory;
 }());
 exports.default = OffersFactory;

package/build/staticModels/OrdersFactory.d.ts

@@ -2,15 +2,9 @@ import { OrderInfo, OrderStatus } from "../types/Order";
 import { BlockInfo, TransactionOptions } from "../types/Web3";
 import { OrderCreatedEvent } from "../types/Events";
 declare class OrdersFactory {
-    private static contract;
-    private static activeOrders;
-    private static logger;
+    private static readonly logger;
     static orders?: string[];
     static get address(): string;
-    /**
-     * Checks if contract has been initialized, if not - initialize contract
-     */
-    private static checkInit;
     /**
      * Function for fetching list of all orders ids
      * @returns list of orders ids

package/build/staticModels/OrdersFactory.js

@@ -39,14 +39,13 @@ 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 +56,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 +63,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 +87,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 +105,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 +132,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 +150,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 +186,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 +211,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 +228,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 +256,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 +285,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 +316,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 +347,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 +379,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 +413,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 +444,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 +476,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 +511,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 +546,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 +581,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) {
@@ -624,6 +607,7 @@ var OrdersFactory = /** @class */ (function () {
         });
         return function () { return subscription.unsubscribe(); };
     };
+    OrdersFactory.logger = logger_1.default.child({ className: "OrdersFactory" });
     return OrdersFactory;
 }());
 exports.default = OrdersFactory;

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;
+    private static readonly 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
      */