@super-protocol/sdk-js 0.13.0-beta.1 → 0.13.0-beta.11

package/build/connectors/BlockchainConnector.js

@@ -361,7 +361,7 @@ var BlockchainConnector = /** @class */ (function (_super) {
     BlockchainConnector.prototype.getTransactions = function (addresses, startBlock, lastBlock, batchSize) {
         if (batchSize === void 0) { batchSize = constants_1.BLOCK_SIZE_TO_FETCH_TRANSACTION; }
         return __awaiter(this, void 0, void 0, function () {
-            var blockchainLastBlock, transactionsByAddress, batch, getBlock, batchLastBlock, blockNumber, blocks;
+            var blockchainLastBlock, transactionsByAddress, validAddresses, batch, getBlock, batchLastBlock, blockNumber, blocks;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -379,7 +379,14 @@ var BlockchainConnector = /** @class */ (function (_super) {
                             startBlock = Math.max(lastBlock - 1000, 0);
                         }
                         transactionsByAddress = {};
-                        addresses.forEach(function (address) { return (transactionsByAddress[address] = []); });
+                        validAddresses = addresses.filter(function (address) { var _a; return (_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.utils.isAddress(address); });
+                        if (!validAddresses.length) {
+                            return [2 /*return*/, {
+                                    transactionsByAddress: transactionsByAddress,
+                                    lastBlock: lastBlock,
+                                }];
+                        }
+                        validAddresses.forEach(function (address) { return (transactionsByAddress[address] = []); });
                         _a.label = 2;
                     case 2:
                         if (!(startBlock <= lastBlock)) return [3 /*break*/, 4];
@@ -397,9 +404,9 @@ var BlockchainConnector = /** @class */ (function (_super) {
                                 return;
                             block.transactions.forEach(function (transaction) {
                                 var address = null;
-                                if (addresses.includes(transaction.from))
+                                if (validAddresses.includes(transaction.from))
                                     address = transaction.from;
-                                else if (transaction.to && addresses.includes(transaction.to))
+                                else if (transaction.to && validAddresses.includes(transaction.to))
                                     address = transaction.to;
                                 if (address) {
                                     transactionsByAddress[address].push(__assign(__assign({}, transaction), { timestamp: +block.timestamp * 1000, input: transaction.input }));

package/build/contracts/app.json

@@ -4213,9 +4213,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -4316,9 +4316,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -4419,9 +4419,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -4534,9 +4534,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -5246,9 +5246,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -5412,12 +5412,117 @@
                     "type": "uint256"
                 }
             ],
-            "name": "getOrderSubOrders",
+            "name": "getOrderSelectedUsage",
             "outputs": [
                 {
-                    "internalType": "uint256[]",
+                    "components": [
+                        {
+                            "components": [
+                                {
+                                    "internalType": "uint64",
+                                    "name": "cpuCores",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "ram",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "diskUsage",
+                                    "type": "uint64"
+                                }
+                            ],
+                            "internalType": "struct SlotInfo",
+                            "name": "slotInfo",
+                            "type": "tuple"
+                        },
+                        {
+                            "components": [
+                                {
+                                    "internalType": "enum PriceType",
+                                    "name": "priceType",
+                                    "type": "uint8"
+                                },
+                                {
+                                    "internalType": "uint256",
+                                    "name": "price",
+                                    "type": "uint256"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "minTimeMinutes",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "maxTimeMinutes",
+                                    "type": "uint64"
+                                }
+                            ],
+                            "internalType": "struct SlotUsage",
+                            "name": "slotUsage",
+                            "type": "tuple"
+                        },
+                        {
+                            "components": [
+                                {
+                                    "internalType": "uint64",
+                                    "name": "bandwidth",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "traffic",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "externalPort",
+                                    "type": "uint64"
+                                }
+                            ],
+                            "internalType": "struct OptionInfo[]",
+                            "name": "optionInfo",
+                            "type": "tuple[]"
+                        },
+                        {
+                            "components": [
+                                {
+                                    "internalType": "enum PriceType",
+                                    "name": "priceType",
+                                    "type": "uint8"
+                                },
+                                {
+                                    "internalType": "uint256",
+                                    "name": "price",
+                                    "type": "uint256"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "minTimeMinutes",
+                                    "type": "uint64"
+                                },
+                                {
+                                    "internalType": "uint64",
+                                    "name": "maxTimeMinutes",
+                                    "type": "uint64"
+                                }
+                            ],
+                            "internalType": "struct SlotUsage[]",
+                            "name": "optionUsage",
+                            "type": "tuple[]"
+                        },
+                        {
+                            "internalType": "uint32[]",
+                            "name": "optionsCount",
+                            "type": "uint32[]"
+                        }
+                    ],
+                    "internalType": "struct OrderUsage",
                     "name": "",
-                    "type": "uint256[]"
+                    "type": "tuple"
                 }
             ],
             "stateMutability": "view",
@@ -5431,34 +5536,12 @@
                     "type": "uint256"
                 }
             ],
-            "name": "getOrderTeeOptions",
+            "name": "getOrderSubOrders",
             "outputs": [
                 {
-                    "components": [
-                        {
-                            "internalType": "uint64",
-                            "name": "bandwidth",
-                            "type": "uint64"
-                        },
-                        {
-                            "internalType": "uint64",
-                            "name": "traffic",
-                            "type": "uint64"
-                        },
-                        {
-                            "internalType": "uint64",
-                            "name": "externalPort",
-                            "type": "uint64"
-                        }
-                    ],
-                    "internalType": "struct OptionInfo[]",
-                    "name": "",
-                    "type": "tuple[]"
-                },
-                {
-                    "internalType": "uint32[]",
+                    "internalType": "uint256[]",
                     "name": "",
-                    "type": "uint32[]"
+                    "type": "uint256[]"
                 }
             ],
             "stateMutability": "view",
@@ -7135,9 +7218,28 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "inputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "teeOfferId",
+                    "type": "uint256"
+                }
+            ],
+            "name": "getTeeOfferSlotsCount",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "inputs": [],
-            "name": "getTeeOffersSlotsCount",
+            "name": "getTeeOffersSlotsCountTotal",
             "outputs": [
                 {
                     "internalType": "uint256",
@@ -7916,9 +8018,28 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "inputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "offerId",
+                    "type": "uint256"
+                }
+            ],
+            "name": "getValueOfferSlotsCount",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "inputs": [],
-            "name": "getValueOffersSlotsCount",
+            "name": "getValueOffersSlotsCountTotal",
             "outputs": [
                 {
                     "internalType": "uint256",
@@ -8129,9 +8250,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -8208,9 +8329,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -10108,9 +10229,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -10216,9 +10337,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -10334,9 +10455,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",
@@ -10583,9 +10704,9 @@
                                     "type": "uint256[]"
                                 },
                                 {
-                                    "internalType": "uint256[]",
-                                    "name": "outputOffers",
-                                    "type": "uint256[]"
+                                    "internalType": "uint256",
+                                    "name": "outputOffer",
+                                    "type": "uint256"
                                 }
                             ],
                             "internalType": "struct OrderArgs",

package/build/index.d.ts

@@ -46,6 +46,7 @@ export * from "./types/HardwareInfo";
 export * from "./types/SlotInfo";
 export * from "./types/SlotUsage";
 export * from "./types/OptionInfo";
+export * from "./types/TeeOfferInfo";
 export * from "./types/TeeOfferOption";
 export * from "./types/TeeOfferSlot";
 export * from "./types/Provider";

package/build/index.js

@@ -96,6 +96,7 @@ __exportStar(require("./types/HardwareInfo"), exports);
 __exportStar(require("./types/SlotInfo"), exports);
 __exportStar(require("./types/SlotUsage"), exports);
 __exportStar(require("./types/OptionInfo"), exports);
+__exportStar(require("./types/TeeOfferInfo"), exports);
 __exportStar(require("./types/TeeOfferOption"), exports);
 __exportStar(require("./types/TeeOfferSlot"), exports);
 __exportStar(require("./types/Provider"), exports);

package/build/models/Offer.d.ts

@@ -67,7 +67,7 @@ declare class Offer {
     /**
      * Function for fetching offer hold deposit
      */
-    getMinDeposit(slotId: number, slotCount: number, optionsIds: number[], optionsCount: number[]): Promise<string>;
+    getMinDeposit(slotId: string): Promise<string>;
     /**
      * Function for fetching cheapest value offer from blockchain
      */
@@ -83,13 +83,17 @@ declare class Offer {
      * @param slotId - Slot ID
      */
     getSlotById(slotId: string): Promise<ValueOfferSlot>;
+    /**
+     * @returns this TEE offer slots count
+     */
+    getSlotsCount(): Promise<string>;
     /**
      * Function for fetching  offer slots info from blockchain
      * @param begin - The first element of range.
      * @param end - One past the final element in the range.
      * @returns {Promise<ValueOfferSlot[]>}
      */
-    getSlots(begin: number, end: number): Promise<ValueOfferSlot[]>;
+    getSlots(begin?: number, end?: number): Promise<ValueOfferSlot[]>;
     /**
      * Function for add slot usage to the value offer
      * @param slotInfo - slot info

package/build/models/Offer.js

@@ -254,16 +254,14 @@ var Offer = /** @class */ (function () {
     /**
      * Function for fetching offer hold deposit
      */
-    Offer.prototype.getMinDeposit = function (slotId, slotCount, optionsIds, optionsCount) {
+    Offer.prototype.getMinDeposit = function (slotId) {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this;
-                        return [4 /*yield*/, Offer.contract.methods
-                                .getOfferMinDeposit(this.id, slotId, slotCount, optionsIds, optionsCount)
-                                .call()];
+                        return [4 /*yield*/, Offer.contract.methods.getOfferMinDeposit(this.id, slotId, "0", [], []).call()];
                     case 1:
                         _a.minDeposit = _b.sent();
                         return [2 /*return*/, this.minDeposit];
@@ -332,6 +330,19 @@ var Offer = /** @class */ (function () {
             });
         });
     };
+    /**
+     * @returns this TEE offer slots count
+     */
+    Offer.prototype.getSlotsCount = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, Offer.contract.methods.getValueOfferSlotsCount().call()];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     /**
      * Function for fetching  offer slots info from blockchain
      * @param begin - The first element of range.
@@ -339,6 +350,8 @@ var Offer = /** @class */ (function () {
      * @returns {Promise<ValueOfferSlot[]>}
      */
     Offer.prototype.getSlots = function (begin, end) {
+        if (begin === void 0) { begin = 0; }
+        if (end === void 0) { end = 999999; }
         return __awaiter(this, void 0, void 0, function () {
             var slots, _i, slots_1, slot, _a, _b, _c;
             return __generator(this, function (_d) {

package/build/models/Order.d.ts

@@ -1,10 +1,10 @@
-import { OrderInfo, OrderResult, ExtendedOrderInfo, OrderStatus } from "../types/Order";
+import { OrderInfo, OrderResult, ExtendedOrderInfo, OrderStatus, OrderUsage } from "../types/Order";
 import { TransactionOptions } from "../types/Web3";
 import { Origins } from "../types/Origins";
-import { OptionInfo } from "../types/OptionInfo";
 declare class Order {
     private static contract;
     private logger;
+    selectedUsage?: OrderUsage;
     orderInfo?: OrderInfo;
     orderResult?: OrderResult;
     subOrders?: string[];
@@ -54,10 +54,7 @@ declare class Order {
     /**
      * Function for fetching order deposit spent from blockchain
      */
-    getOrderTeeOptions(): Promise<{
-        options: OptionInfo[];
-        count: number[];
-    }>;
+    getSelectedUsage(): Promise<OrderUsage>;
     /**
      * Function for fetching hold deposits sum of the order and its suborders
      */
@@ -129,11 +126,11 @@ declare class Order {
     /**
      * Function for creating sub orders for current order
      * @param subOrderInfo - order info for new subOrder
-     * @param blocking - is sub order blocking
+     * @param blockParentOrder - is sub order blocking
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     * @returns {Promise<void>} - Does not return id of created sub order!
+     * @returns Promise<void> - Does not return id of created sub order!
      */
-    createSubOrder(subOrderInfo: OrderInfo, blocking: boolean, holdSum?: string, transactionOptions?: TransactionOptions): Promise<void>;
+    createSubOrder(subOrderInfo: OrderInfo, blockParentOrder: boolean, deposit?: string, transactionOptions?: TransactionOptions): Promise<void>;
     /**
      * Function for creating pack of sub orders (wokflow) for current order
      * @param subOrdersInfo - orders info for new subOrders

package/build/models/Order.js

@@ -67,7 +67,7 @@ var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainCon
 var Superpro_1 = __importDefault(require("../staticModels/Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var BlockchainEventsListener_1 = __importDefault(require("../connectors/BlockchainEventsListener"));
-var OptionInfo_1 = require("../types/OptionInfo");
+var TeeOffers_1 = __importDefault(require("../staticModels/TeeOffers"));
 var Order = /** @class */ (function () {
     function Order(orderId) {
         this.id = orderId;
@@ -223,20 +223,25 @@ var Order = /** @class */ (function () {
     /**
      * Function for fetching order deposit spent from blockchain
      */
-    Order.prototype.getOrderTeeOptions = function () {
+    Order.prototype.getSelectedUsage = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, options, count;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, Order.contract.methods.getOrderTeeOptions(this.id).call()];
+            var _a, _b, _c, _d, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        _a = this;
+                        _b = utils_1.tupleToObject;
+                        return [4 /*yield*/, Order.contract.methods.getOrderSelectedUsage(this.id).call()];
                     case 1:
-                        _a = _b.sent(), options = _a[0], count = _a[1];
-                        options = (0, utils_1.tupleToObjectsArray)(options, OptionInfo_1.OptionInfoStructure);
-                        count = count.map(function (item) { return +item; });
-                        return [2 /*return*/, {
-                                options: options,
-                                count: count,
-                            }];
+                        _a.selectedUsage = _b.apply(void 0, [_f.sent(), Order_1.OrderUsageStructure]);
+                        this.selectedUsage.optionsCount = this.selectedUsage.optionsCount.map(function (item) { return +item; });
+                        _c = this.selectedUsage;
+                        _d = utils_1.unpackSlotInfo;
+                        _e = [this.selectedUsage.slotInfo];
+                        return [4 /*yield*/, TeeOffers_1.default.getDenominator()];
+                    case 2:
+                        _c.slotInfo = _d.apply(void 0, _e.concat([_f.sent()]));
+                        return [2 /*return*/, this.selectedUsage];
                 }
             });
         });
@@ -504,12 +509,12 @@ var Order = /** @class */ (function () {
     /**
      * Function for creating sub orders for current order
      * @param subOrderInfo - order info for new subOrder
-     * @param blocking - is sub order blocking
+     * @param blockParentOrder - is sub order blocking
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     * @returns {Promise<void>} - Does not return id of created sub order!
+     * @returns Promise<void> - Does not return id of created sub order!
      */
-    Order.prototype.createSubOrder = function (subOrderInfo, blocking, holdSum, transactionOptions) {
-        if (holdSum === void 0) { holdSum = "0"; }
+    Order.prototype.createSubOrder = function (subOrderInfo, blockParentOrder, deposit, transactionOptions) {
+        if (deposit === void 0) { deposit = "0"; }
         return __awaiter(this, void 0, void 0, function () {
             var preparedInfo, tupleSubOrder, params;
             return __generator(this, function (_a) {
@@ -520,8 +525,8 @@ var Order = /** @class */ (function () {
                         preparedInfo = __assign(__assign({}, subOrderInfo), { externalId: (0, utils_2.formatBytes32String)(subOrderInfo.externalId) });
                         tupleSubOrder = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
                         params = {
-                            blockParentOrder: blocking,
-                            holdSum: holdSum,
+                            blockParentOrder: blockParentOrder,
+                            deposit: deposit,
                         };
                         return [4 /*yield*/, TxManager_1.default.execute(Order.contract.methods.createSubOrder, [this.id, tupleSubOrder, params], transactionOptions)];
                     case 1:
@@ -553,7 +558,7 @@ var Order = /** @class */ (function () {
                                 var tupleSubOrder = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
                                 var params = {
                                     blockParentOrder: subOrderInfo.blocking,
-                                    holdSum: subOrderInfo.holdSum,
+                                    deposit: subOrderInfo.deposit,
                                 };
                                 var request = Order.contract.methods.createSubOrder(_this.id, tupleSubOrder, params).send.request({
                                     from: transactionOptions.from,
@@ -627,7 +632,7 @@ var Order = /** @class */ (function () {
     ], Order.prototype, "getOptionsDepositSpent", null);
     __decorate([
         (0, utils_1.incrementMethodCall)()
-    ], Order.prototype, "getOrderTeeOptions", null);
+    ], Order.prototype, "getSelectedUsage", null);
     __decorate([
         (0, utils_1.incrementMethodCall)()
     ], Order.prototype, "calculateTotalOrderDeposit", null);

package/build/models/TCB.d.ts

@@ -1,5 +1,5 @@
 import { TransactionOptions } from "../types/Web3";
-import { TcbData, TcbStatus, PublicData, TcbVerifiedStatus } from "../types/Consensus";
+import { TcbData, TcbStatus, TcbPublicData, TcbVerifiedStatus } from "../types/Consensus";
 declare class TCB {
     tcbId: string;
     private contract;
@@ -14,7 +14,7 @@ declare class TCB {
      * @param marks - list of marks
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    addToSupply(pb: PublicData, quote: string, marks: TcbVerifiedStatus[], transactionOptions?: TransactionOptions): Promise<void>;
+    addToSupply(pb: TcbPublicData, quote: string, marks: TcbVerifiedStatus[], transactionOptions?: TransactionOptions): Promise<void>;
     /**
      * Assign TCB from SuspiciousBlocks table to check
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)