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

package/build/staticModels/{OrdersFactory.d.ts → Orders.d.ts}

@@ -1,7 +1,7 @@
 import { OrderInfo, OrderStatus } from "../types/Order";
 import { BlockInfo, TransactionOptions } from "../types/Web3";
 import { OrderCreatedEvent } from "../types/Events";
-declare class OrdersFactory {
+declare class Orders {
     private static readonly logger;
     static orders?: string[];
     static get address(): string;
@@ -9,21 +9,11 @@ declare class OrdersFactory {
      * Function for fetching list of all orders ids
      * @returns list of orders ids
      */
-    static getAllOrders(): Promise<string[]>;
+    static getAll(): Promise<string[]>;
     /**
      * Function for fetching orders count
      */
-    static getOrdersCount(): Promise<number>;
-    /**
-     * Function for fetching order hold deposit for specific order
-     * @param orderId - order for fetching hold deposit
-     */
-    static getOrderHoldDeposit(orderId: string): Promise<string>;
-    /**
-     * Function for fetching status of order change
-     * @param orderId - order for fetching hold deposit
-     */
-    static getOrderChangeWithdrawn(orderId: string): Promise<boolean>;
+    static getCount(): Promise<number>;
     /**
      * Function for creating orders
      * @param orderInfo - order info for new order
@@ -31,8 +21,8 @@ declare class OrdersFactory {
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    static createOrder(orderInfo: OrderInfo, holdDeposit?: string, suspended?: boolean, transactionOptions?: TransactionOptions): Promise<void>;
-    static getOrder(consumer: string, externalId: string): Promise<OrderCreatedEvent>;
+    static createOrder(orderInfo: OrderInfo, deposit?: string, suspended?: boolean, transactionOptions?: TransactionOptions): Promise<void>;
+    static getByExternalId(consumer: string, externalId: string): Promise<OrderCreatedEvent>;
     /**
      * Function for create workflow
      * @param parentOrderInfo - order info for new order
@@ -41,7 +31,7 @@ declare class OrdersFactory {
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    static createWorkflow(parentOrderInfo: OrderInfo, subOrdersInfo: OrderInfo[], holdDeposit?: string, transactionOptions?: TransactionOptions): Promise<void>;
+    static createWorkflow(parentOrderInfo: OrderInfo, subOrdersInfo: OrderInfo[], workflowDeposit?: string, transactionOptions?: TransactionOptions): Promise<void>;
     /**
      * Function for cancel workflow
      * @param parentOrderId - Parent order id
@@ -66,34 +56,21 @@ declare class OrdersFactory {
      * @param callback - function for processing created order
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onWorkflowCreated(callback: onWorkflowCreatedCallback): () => void;
-    /**
-     * Function for adding event listeners on order created event in orders factory contract
-     * @param callback - function for processing created order
-     * @returns unsubscribe - unsubscribe function from event
-     */
-    static onOrderCreated(callback: onOrderCreatedCallback): () => void;
-    /**
-     * Function for adding event listeners on suborder created event in orders contract
-     * @param callback - function for processing created suborder
-     * @param parentOrderId - parent order id
-     * @return unsubscribe - unsubscribe function from event
-     */
-    static onSubOrderCreated(callback: onSubOrderCreatedCallback, parentOrderId?: string): () => void;
+    static onCreated(callback: onOrderCreatedCallback): () => void;
     /**
      * Function for adding event listeners on order started event in orders contract
      * @param callback - function for processing suborder filled event
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderStarted(callback: onOrderStartedCallback, orderId?: string): () => void;
+    static onStarted(callback: onOrderStartedCallback, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order updated status event in orders contract
      * @param callback - function for processing order updated status event
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrdersStatusUpdated(callback: onOrdersStatusUpdatedCallback, orderId?: string): () => void;
+    static onStatusUpdated(callback: onOrdersStatusUpdatedCallback, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order refilled event in orders contract
      * @param callback - function for processing order refilled event
@@ -101,21 +78,21 @@ declare class OrdersFactory {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderDepositRefilled(callback: onOrderDepositRefilledCallback, consumer?: string, orderId?: string): () => void;
+    static onDepositRefilled(callback: onOrderDepositRefilledCallback, consumer?: string, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order price updated event in orders contract
      * @param callback - function for processing order price updated event
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderPriceUpdated(callback: onOrderPriceUpdatedCallback, orderId?: string): () => void;
+    static onPriceUpdated(callback: onOrderPriceUpdatedCallback, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order changed withdrawn event in orders contract
      * @param callback - function for processing order changed withdrawn event
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderChangedWithdrawn(callback: onOrderChangedWithdrawnCallback, orderId?: string): () => void;
+    static onChangedWithdrawn(callback: onOrderChangedWithdrawnCallback, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order changed refunded event in orders contract
      * @param callback - function for processing order changed refunded event
@@ -123,7 +100,7 @@ declare class OrdersFactory {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderProfitWithdrawn(callback: onOrderProfitWithdrawnCallback, orderId?: string, tokenReceiver?: string): () => void;
+    static onProfitWithdrawn(callback: onOrderProfitWithdrawnCallback, orderId?: string, tokenReceiver?: string): () => void;
     /**
      * Function for adding event listeners on order awaiting payment event in orders contract
      * @param callback - function for processing order awaiting payment event
@@ -131,7 +108,7 @@ declare class OrdersFactory {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderAwaitingPaymentChanged(callback: onOrderAwaitingPaymentChangedCallback, consumer?: string, orderId?: string): () => void;
+    static onAwaitingPaymentChanged(callback: onOrderAwaitingPaymentChangedCallback, consumer?: string, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order deposit spent event in orders contract
      * @param callback - function for processing order deposit spent event
@@ -139,7 +116,7 @@ declare class OrdersFactory {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderDepositSpentChanged(callback: onOrderDepositSpentChangedCallback, consumer?: string, orderId?: string): () => void;
+    static onDepositSpentChanged(callback: onOrderDepositSpentChangedCallback, consumer?: string, orderId?: string): () => void;
     /**
      * Function for adding event listeners on order encrypted result updated event in orders contract
      * @param callback - function for processing order encrypted result updated event
@@ -147,18 +124,34 @@ declare class OrdersFactory {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    static onOrderEncryptedResultUpdated(callback: onOrderEncryptedResultUpdatedCallback, consumer?: string, orderId?: string): () => void;
+    static onEncryptedResultUpdated(callback: onOrderEncryptedResultUpdatedCallback, consumer?: string, orderId?: string): () => void;
+    /**
+     * Function for adding event listeners on OrderOptionsDepositSpentChanged event in orders contract
+     * @param callback - function for processing order encrypted result updated event
+     * @param consumer - order creator address
+     * @param orderId - order id
+     * @returns unsubscribe - unsubscribe function from event
+     */
+    static onOptionsDepositSpentChanged(callback: onOrderOptionsDepositSpentChangedCallback, consumer?: string, orderId?: string): () => void;
+    /**
+     * Function for adding event listeners on onOrderProfitUnlocked event in orders contract
+     * @param callback - function for processing order encrypted result updated event
+     * @param tokenReceiver - tokenReceiver
+     * @param orderId - order id
+     * @returns unsubscribe - unsubscribe function from event
+     */
+    static onOProfitUnlocked(callback: onOrderProfitUnlockedCallback, tokenReceiver?: string, orderId?: string): () => void;
 }
-export type onSubOrderCreatedCallback = (parentOrderId: string, subOrderId: string, block?: BlockInfo) => void;
 export type onOrderStartedCallback = (orderId: string, consumer: string, block?: BlockInfo) => void;
 export type onOrdersStatusUpdatedCallback = (orderId: string, status: OrderStatus, block?: BlockInfo) => void;
 export type onOrderPriceUpdatedCallback = (orderId: string, price: string, block?: BlockInfo) => void;
-export type onOrderCreatedCallback = (consumer: string, externalId: string, offerId: string, orderId: string, block?: BlockInfo) => void;
+export type onOrderCreatedCallback = (consumer: string, externalId: string, offerId: string, parentOrderId: string, orderId: string, block?: BlockInfo) => void;
 export type onOrderDepositRefilledCallback = (orderId: string, consumer: string, amount: string, block?: BlockInfo) => void;
 export type onOrderChangedWithdrawnCallback = (orderId: string, consumer: string, change: string, block?: BlockInfo) => void;
 export type onOrderProfitWithdrawnCallback = (orderId: string, tokenReceiver: string, profit: string, block?: BlockInfo) => void;
 export type onOrderDepositSpentChangedCallback = (orderId: string, consumer: string, spent: string, block?: BlockInfo) => void;
 export type onOrderAwaitingPaymentChangedCallback = (orderId: string, consumer: string, awaitingPaymentFlag: boolean, block?: BlockInfo) => void;
 export type onOrderEncryptedResultUpdatedCallback = (orderId: string, consumer: string, encryptedResult: string, block?: BlockInfo) => void;
-export type onWorkflowCreatedCallback = (consumer: string, externalId: string, offerId: string, orderId: string, block?: BlockInfo) => void;
-export default OrdersFactory;
+export type onOrderOptionsDepositSpentChangedCallback = (consumer: string, orderId: string, value: string, block?: BlockInfo) => void;
+export type onOrderProfitUnlockedCallback = (tokenReceiver: string, orderId: string, profit: string, block?: BlockInfo) => void;
+export default Orders;

package/build/staticModels/{OrdersFactory.js → Orders.js}

@@ -64,10 +64,10 @@ var Superpro_1 = __importDefault(require("./Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
 var BlockchainEventsListener_1 = __importDefault(require("../connectors/BlockchainEventsListener"));
-var OrdersFactory = /** @class */ (function () {
-    function OrdersFactory() {
+var Orders = /** @class */ (function () {
+    function Orders() {
     }
-    Object.defineProperty(OrdersFactory, "address", {
+    Object.defineProperty(Orders, "address", {
         get: function () {
             return Superpro_1.default.address;
         },
@@ -78,7 +78,7 @@ var OrdersFactory = /** @class */ (function () {
      * Function for fetching list of all orders ids
      * @returns list of orders ids
      */
-    OrdersFactory.getAllOrders = function () {
+    Orders.getAll = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var contract, ordersSet, ordersCount, orderId;
@@ -103,7 +103,7 @@ var OrdersFactory = /** @class */ (function () {
     /**
      * Function for fetching orders count
      */
-    OrdersFactory.getOrdersCount = function () {
+    Orders.getCount = function () {
         return __awaiter(this, void 0, void 0, function () {
             var contract, _a;
             return __generator(this, function (_b) {
@@ -117,40 +117,6 @@ var OrdersFactory = /** @class */ (function () {
             });
         });
     };
-    /**
-     * Function for fetching order hold deposit for specific order
-     * @param orderId - order for fetching hold deposit
-     */
-    OrdersFactory.getOrderHoldDeposit = function (orderId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var contract;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        contract = BlockchainConnector_1.default.getInstance().getContract();
-                        return [4 /*yield*/, contract.methods.getOrderHoldDeposit(orderId).call()];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    /**
-     * Function for fetching status of order change
-     * @param orderId - order for fetching hold deposit
-     */
-    OrdersFactory.getOrderChangeWithdrawn = function (orderId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var contract;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        contract = BlockchainConnector_1.default.getInstance().getContract();
-                        return [4 /*yield*/, contract.methods.getOrderChangeWithdrawn(orderId).call()];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
     /**
      * Function for creating orders
      * @param orderInfo - order info for new order
@@ -158,8 +124,8 @@ var OrdersFactory = /** @class */ (function () {
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    OrdersFactory.createOrder = function (orderInfo, holdDeposit, suspended, transactionOptions) {
-        if (holdDeposit === void 0) { holdDeposit = "0"; }
+    Orders.createOrder = function (orderInfo, deposit, suspended, transactionOptions) {
+        if (deposit === void 0) { deposit = "0"; }
         if (suspended === void 0) { suspended = false; }
         return __awaiter(this, void 0, void 0, function () {
             var contract, preparedInfo, orderInfoArguments;
@@ -170,7 +136,7 @@ var OrdersFactory = /** @class */ (function () {
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
                         preparedInfo = __assign(__assign({}, orderInfo), { externalId: (0, utils_2.formatBytes32String)(orderInfo.externalId) });
                         orderInfoArguments = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
-                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createOrder, [orderInfoArguments, holdDeposit, suspended], transactionOptions)];
+                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createOrder, [orderInfoArguments, deposit, suspended], transactionOptions)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -178,7 +144,7 @@ var OrdersFactory = /** @class */ (function () {
             });
         });
     };
-    OrdersFactory.getOrder = function (consumer, externalId) {
+    Orders.getByExternalId = function (consumer, externalId) {
         return __awaiter(this, void 0, void 0, function () {
             var contract, filter, foundIds, notFound, response;
             return __generator(this, function (_a) {
@@ -196,6 +162,7 @@ var OrdersFactory = /** @class */ (function () {
                             consumer: consumer,
                             externalId: externalId,
                             offerId: "-1",
+                            parentOrderId: "-1",
                             orderId: "-1",
                         };
                         response = foundIds.length > 0 ? foundIds[0].returnValues : notFound;
@@ -212,8 +179,8 @@ var OrdersFactory = /** @class */ (function () {
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    OrdersFactory.createWorkflow = function (parentOrderInfo, subOrdersInfo, holdDeposit, transactionOptions) {
-        if (holdDeposit === void 0) { holdDeposit = "0"; }
+    Orders.createWorkflow = function (parentOrderInfo, subOrdersInfo, workflowDeposit, transactionOptions) {
+        if (workflowDeposit === void 0) { workflowDeposit = "0"; }
         return __awaiter(this, void 0, void 0, function () {
             var contract, preparedInfo, parentOrderInfoArgs, preparedSubOrdersInfo, subOrdersInfoArgs;
             return __generator(this, function (_a) {
@@ -225,7 +192,7 @@ var OrdersFactory = /** @class */ (function () {
                         parentOrderInfoArgs = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
                         preparedSubOrdersInfo = subOrdersInfo.map(function (o) { return (__assign(__assign({}, o), { externalId: (0, utils_2.formatBytes32String)(o.externalId) })); });
                         subOrdersInfoArgs = (0, utils_1.objectToTuple)(preparedSubOrdersInfo, Order_1.OrderInfoStructureArray);
-                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createWorkflow, [parentOrderInfoArgs, holdDeposit, subOrdersInfoArgs], transactionOptions)];
+                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createWorkflow, [parentOrderInfoArgs, workflowDeposit, subOrdersInfoArgs], transactionOptions)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -238,7 +205,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param parentOrderId - Parent order id
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    OrdersFactory.cancelWorkflow = function (perentOrderId, transactionOptions) {
+    Orders.cancelWorkflow = function (perentOrderId, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
             var contract;
             return __generator(this, function (_a) {
@@ -259,7 +226,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param parentOrderId - Parent order id
      * @returns {Promise<void>} - Does not return id of created order!
      */
-    OrdersFactory.withdrawWorkflowChange = function (parentOrderId, transactionOptions) {
+    Orders.withdrawWorkflowChange = function (parentOrderId, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
             var contract;
             return __generator(this, function (_a) {
@@ -281,7 +248,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param amount - amount of tokens to refilling
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    OrdersFactory.refillOrderDeposit = function (orderId, amount, transactionOptions) {
+    Orders.refillOrderDeposit = function (orderId, amount, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
             var contract;
             return __generator(this, function (_a) {
@@ -302,35 +269,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param callback - function for processing created order
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onWorkflowCreated = function (callback) {
-        var _this = this;
-        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
-        var logger = this.logger.child({ method: "onWorkflowCreated" });
-        var subscription = contract.events
-            .WorkflowCreated()
-            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                //consumer: string, externalId: string, offerId: string, orderId: string
-                callback(event.returnValues.consumer, (0, utils_2.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
-                    index: event.blockNumber,
-                    hash: event.blockHash,
-                });
-                return [2 /*return*/];
-            });
-        }); })
-            .on("error", function (error, receipt) {
-            if (receipt)
-                return; // Used to avoid logging of transaction rejected
-            logger.warn(error);
-        });
-        return function () { return subscription.unsubscribe(); };
-    };
-    /**
-     * Function for adding event listeners on order created event in orders factory contract
-     * @param callback - function for processing created order
-     * @returns unsubscribe - unsubscribe function from event
-     */
-    OrdersFactory.onOrderCreated = function (callback) {
+    Orders.onCreated = function (callback) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderCreated" });
@@ -339,38 +278,7 @@ var OrdersFactory = /** @class */ (function () {
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 //consumer: string, externalId: string, offerId: string, orderId: string
-                callback(event.returnValues.consumer, (0, utils_2.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
-                    index: event.blockNumber,
-                    hash: event.blockHash,
-                });
-                return [2 /*return*/];
-            });
-        }); })
-            .on("error", function (error, receipt) {
-            if (receipt)
-                return; // Used to avoid logging of transaction rejected
-            logger.warn(error);
-        });
-        return function () { return subscription.unsubscribe(); };
-    };
-    /**
-     * Function for adding event listeners on suborder created event in orders contract
-     * @param callback - function for processing created suborder
-     * @param parentOrderId - parent order id
-     * @return unsubscribe - unsubscribe function from event
-     */
-    OrdersFactory.onSubOrderCreated = function (callback, parentOrderId) {
-        var _this = this;
-        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
-        var logger = this.logger.child({ method: "onSubOrderCreated" });
-        var subscription = contract.events
-            .SubOrderCreated()
-            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                if (parentOrderId && event.returnValues.parentOrderId != parentOrderId) {
-                    return [2 /*return*/];
-                }
-                callback(event.returnValues.parentOrderId, event.returnValues.subOrderId, {
+                callback(event.returnValues.consumer, (0, utils_2.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.parentOrderId, event.returnValues.orderId, {
                     index: event.blockNumber,
                     hash: event.blockHash,
                 });
@@ -390,7 +298,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderStarted = function (callback, orderId) {
+    Orders.onStarted = function (callback, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderStarted" });
@@ -421,7 +329,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrdersStatusUpdated = function (callback, orderId) {
+    Orders.onStatusUpdated = function (callback, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrdersStatusUpdated" });
@@ -453,7 +361,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderDepositRefilled = function (callback, consumer, orderId) {
+    Orders.onDepositRefilled = function (callback, consumer, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderDepositRefilled" });
@@ -487,7 +395,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderPriceUpdated = function (callback, orderId) {
+    Orders.onPriceUpdated = function (callback, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderPriceUpdated" });
@@ -518,7 +426,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderChangedWithdrawn = function (callback, orderId) {
+    Orders.onChangedWithdrawn = function (callback, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderChangedWithdrawn" });
@@ -550,7 +458,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderProfitWithdrawn = function (callback, orderId, tokenReceiver) {
+    Orders.onProfitWithdrawn = function (callback, orderId, tokenReceiver) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderProfitWithdrawn" });
@@ -585,7 +493,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderAwaitingPaymentChanged = function (callback, consumer, orderId) {
+    Orders.onAwaitingPaymentChanged = function (callback, consumer, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderAwaitingPaymentChanged" });
@@ -620,7 +528,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderDepositSpentChanged = function (callback, consumer, orderId) {
+    Orders.onDepositSpentChanged = function (callback, consumer, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderDepositSpentChanged" });
@@ -655,7 +563,7 @@ var OrdersFactory = /** @class */ (function () {
      * @param orderId - order id
      * @returns unsubscribe - unsubscribe function from event
      */
-    OrdersFactory.onOrderEncryptedResultUpdated = function (callback, consumer, orderId) {
+    Orders.onEncryptedResultUpdated = function (callback, consumer, orderId) {
         var _this = this;
         var contract = BlockchainEventsListener_1.default.getInstance().getContract();
         var logger = this.logger.child({ method: "onOrderEncryptedResultUpdated" });
@@ -683,16 +591,86 @@ var OrdersFactory = /** @class */ (function () {
         });
         return function () { return subscription.unsubscribe(); };
     };
-    OrdersFactory.logger = logger_1.default.child({ className: "OrdersFactory" });
+    /**
+     * Function for adding event listeners on OrderOptionsDepositSpentChanged event in orders contract
+     * @param callback - function for processing order encrypted result updated event
+     * @param consumer - order creator address
+     * @param orderId - order id
+     * @returns unsubscribe - unsubscribe function from event
+     */
+    Orders.onOptionsDepositSpentChanged = function (callback, consumer, orderId) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onOrderOptionsDepositSpentChanged" });
+        var subscription = contract.events
+            .OrderOptionsDepositSpentChanged()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (orderId && event.returnValues.orderId != orderId) {
+                    return [2 /*return*/];
+                }
+                if (consumer && event.returnValues.consumer != consumer) {
+                    return [2 /*return*/];
+                }
+                callback(event.returnValues.consumer, event.returnValues.orderId, event.returnValues.value, {
+                    index: event.blockNumber,
+                    hash: event.blockHash,
+                });
+                return [2 /*return*/];
+            });
+        }); })
+            .on("error", function (error, receipt) {
+            if (receipt)
+                return; // Used to avoid logging of transaction rejected
+            logger.warn(error);
+        });
+        return function () { return subscription.unsubscribe(); };
+    };
+    /**
+     * Function for adding event listeners on onOrderProfitUnlocked event in orders contract
+     * @param callback - function for processing order encrypted result updated event
+     * @param tokenReceiver - tokenReceiver
+     * @param orderId - order id
+     * @returns unsubscribe - unsubscribe function from event
+     */
+    Orders.onOProfitUnlocked = function (callback, tokenReceiver, orderId) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onOrderProfitUnlocked" });
+        var subscription = contract.events
+            .OrderProfitUnlocked()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (orderId && event.returnValues.orderId != orderId) {
+                    return [2 /*return*/];
+                }
+                if (tokenReceiver && event.returnValues.tokenReceiver != tokenReceiver) {
+                    return [2 /*return*/];
+                }
+                callback(event.returnValues.tokenReceiver, event.returnValues.orderId, event.returnValues.profit, {
+                    index: event.blockNumber,
+                    hash: event.blockHash,
+                });
+                return [2 /*return*/];
+            });
+        }); })
+            .on("error", function (error, receipt) {
+            if (receipt)
+                return; // Used to avoid logging of transaction rejected
+            logger.warn(error);
+        });
+        return function () { return subscription.unsubscribe(); };
+    };
+    Orders.logger = logger_1.default.child({ className: "Orders" });
     __decorate([
         (0, utils_1.incrementMethodCall)()
-    ], OrdersFactory, "createOrder", null);
+    ], Orders, "createOrder", null);
     __decorate([
         (0, utils_1.incrementMethodCall)()
-    ], OrdersFactory, "getOrder", null);
+    ], Orders, "getByExternalId", null);
     __decorate([
         (0, utils_1.incrementMethodCall)()
-    ], OrdersFactory, "createWorkflow", null);
-    return OrdersFactory;
+    ], Orders, "createWorkflow", null);
+    return Orders;
 }());
-exports.default = OrdersFactory;
+exports.default = Orders;

package/build/staticModels/ProviderRegistry.d.ts

@@ -40,7 +40,7 @@ declare class ProviderRegistry {
     /**
      * Function for adding event listeners on provider registered event in provider registry
      * @param callback - function for processing new provider
-     * @return unsubscribe - unsubscribe function from event
+     * @returns unsubscribe - unsubscribe function from event
      */
     static onProviderRegistered(callback: onProviderRegisteredCallback): () => void;
     /**

package/build/staticModels/ProviderRegistry.js

@@ -175,7 +175,7 @@ var ProviderRegistry = /** @class */ (function () {
     /**
      * Function for adding event listeners on provider registered event in provider registry
      * @param callback - function for processing new provider
-     * @return unsubscribe - unsubscribe function from event
+     * @returns unsubscribe - unsubscribe function from event
      */
     ProviderRegistry.onProviderRegistered = function (callback) {
         var _this = this;

package/build/staticModels/Superpro.d.ts

@@ -1,11 +1,11 @@
-import { ContractName, ParamName } from "../types/Superpro";
+import { ParamName } from "../types/Superpro";
 import { Contract } from "web3-eth-contract";
 declare class Superpro {
     static address: string;
     /**
      * Fetching address of contract by name
      */
-    static getContractAddress(name: ContractName): Promise<string>;
+    static getContractAddress(): Promise<string>;
     static getTokenAddress(contractInstance?: Contract): Promise<string>;
     /**
      * Fetching config parameter value by name

package/build/staticModels/Superpro.js

@@ -46,7 +46,7 @@ var Superpro = /** @class */ (function () {
     /**
      * Fetching address of contract by name
      */
-    Superpro.getContractAddress = function (name) {
+    Superpro.getContractAddress = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.address];