@super-protocol/sdk-js 0.6.1 → 0.7.0-beta.3

package/build/models/TCB.js

@@ -40,176 +40,153 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = __importDefault(require("../logger"));
-// import TcbJSON from "../contracts/TCB.json";
-var Offers_json_1 = __importDefault(require("../contracts/Offers.json"));
+var Consensus_json_1 = __importDefault(require("../contracts/Consensus.json"));
 var store_1 = __importDefault(require("../store"));
-var TcbData_1 = require("../types/TcbData");
 var utils_1 = require("../utils");
-var Suspicious_1 = __importDefault(require("../staticModels/Suspicious"));
-var LastBlocks_1 = __importDefault(require("../staticModels/LastBlocks"));
 var utils_2 = require("ethers/lib/utils");
 var Superpro_1 = __importDefault(require("../staticModels/Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
+var Consensus_1 = require("../types/Consensus");
 var TCB = /** @class */ (function () {
     function TCB(tcbId) {
         (0, utils_1.checkIfInitialized)();
-        this.id = tcbId;
-        // this.contract = new store.web3!.eth.Contract(<AbiItem[]>TcbJSON.abi, tcbId);
-        // TODO: stub
-        this.contract = new store_1.default.web3.eth.Contract(Offers_json_1.default.abi, Superpro_1.default.address);
-        this.logger = logger_1.default.child({ className: "TCB", tcbId: tcbId });
+        this.logger = logger_1.default.child({
+            className: "TCB",
+            tcbId: tcbId,
+        });
+        this.tcbId = tcbId;
+        this.contract = new store_1.default.web3.eth.Contract(Consensus_json_1.default.abi, Superpro_1.default.address);
     }
-    /**
-     * Function for fetching number of TCB's to request for verifying from LastBlocksTable
-     */
-    TCB.prototype.needL1toCompleted = function () {
+    TCB.prototype.checkInitTcb = function (transactionOptions) {
+        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
+            (0, utils_1.checkIfInitialized)();
+            return new transactionOptions.web3.eth.Contract(Consensus_json_1.default.abi, Superpro_1.default.address);
+        }
+        return this.contract;
+    };
+    TCB.prototype.applyTcbMarks = function (marks, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var lbtSzie, l1Completed;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, LastBlocks_1.default.count()];
+                    case 0: return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.applyTcbMarks, [marks, this.tcbId], transactionOptions)];
                     case 1:
-                        lbtSzie = _a.sent();
-                        return [4 /*yield*/, this.contract.methods.needL1toCompleted(lbtSzie).call()];
-                    case 2:
-                        l1Completed = _a.sent();
-                        return [2 /*return*/, l1Completed];
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
-    /**
-     * Function for fetching number of TCB's to request for verifying from SuspiciousBlocksTable
-     */
-    TCB.prototype.needL2toCompleted = function () {
+    TCB.prototype.setTcbData = function (pb, quote, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var sbtSize, l2Completed;
+            var fromattedDeviceId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, Suspicious_1.default.count()];
-                    case 1:
-                        sbtSize = _a.sent();
-                        return [4 /*yield*/, this.contract.methods.needL2toCompleted(sbtSize).call()];
-                    case 2:
-                        l2Completed = _a.sent();
-                        return [2 /*return*/, l2Completed];
-                }
-            });
-        });
-    };
-    /**
-     * Function for fetching list of TCBs from LastBlocksTable formed for veirifying
-     */
-    TCB.prototype.getL1 = function () {
-        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*/, this.contract.methods.getL1().call()];
-                    case 1:
-                        _a.L1 = _b.sent();
-                        return [2 /*return*/, this.L1];
-                }
-            });
-        });
-    };
-    /**
-     * Function for fetching list of TCBs from SuspiciousBlocksTable formed for veirifying
-     */
-    TCB.prototype.getL2 = function () {
-        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*/, this.contract.methods.getL2().call()];
+                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+                        fromattedDeviceId = (0, utils_2.formatBytes32String)(Buffer.from(pb.deviceID, "hex").toString("base64"));
+                        return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.setTcbData, [this.tcbId, pb.benchmark, pb.properties, fromattedDeviceId, quote], transactionOptions)];
                     case 1:
-                        _a.L2 = _b.sent();
-                        return [2 /*return*/, this.L2];
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Function for fetching the given marks for recruited TCBs from the LastBlocksTable
+     * Add data to TeeConfirmationBlock and push it to Consensus
+     * @param pb - struct of 'processed' data
+     * @param quote - data generated from Enclave
+     * @param marks - list of marks
+     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    TCB.prototype.getL1Marks = function () {
+    TCB.prototype.addToSupply = function (pb, quote, marks, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _a = this;
-                        return [4 /*yield*/, this.contract.methods.getL1Marks().call()];
+                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+                        return [4 /*yield*/, this.setTcbData(pb, quote, transactionOptions)];
                     case 1:
-                        _a.L1_statusess = _b.sent();
-                        return [2 /*return*/, this.L1_statusess];
+                        _a.sent();
+                        return [4 /*yield*/, this.applyTcbMarks(marks, transactionOptions)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.addTcbToSupply, [this.tcbId], transactionOptions)];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Function for fetching the given marks for recruited TCBs from the SuspiciousBlocksTable
+     * Assign TCB from SuspiciousBlocks table to check
+     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    TCB.prototype.getL2Marks = function () {
+    TCB.prototype.assignSuspiciousBlocksToCheck = function (transactionOptions) {
         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*/, this.contract.methods.getL2Marks().call()];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.assignSuspiciousBlocksToCheck, [this.tcbId], transactionOptions)];
                     case 1:
-                        _a.L2_statusess = _b.sent();
-                        return [2 /*return*/, this.L2_statusess];
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Function for fetching TCB status
+     * Assign TCB from LastBlocks table to check
+     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    TCB.prototype.getTcbStatus = function () {
+    TCB.prototype.assignLastBlocksToCheck = function (transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.contract.methods.getTcbStatus().call()];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.assignLastBlocksToCheck, [this.tcbId], transactionOptions)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Function for fetching calimed amount of TCB reward
+     * Function stake and lock TCB's reward
+     * @param tcbId - TEE Offer's completed and valid TCB contract
+     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    TCB.prototype.getPaidAmount = function () {
+    TCB.prototype.claimRewards = function (tcbId, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.contract.methods.getPaidAmount().call()];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0:
+                        contract = this.checkInitTcb(transactionOptions);
+                        (0, utils_1.checkIfActionAccountInitialized)();
+                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.claimRewards, [tcbId], transactionOptions)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Add processed TCB data to smart-contract
-     * @param used - struct of 'processed' data
-     * @param quote - data generated from Enclave
+     * Function unlock previously locked TCB rewards (by claimRewards)
+     * @param tcbId - TCB contract address
+     * @param unlockAmount - amount of tokens to unlock, max available amount = TeeOffer.getLockInfo(tcbAddress)
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
      */
-    TCB.prototype.addData = function (pb, quote, transactionOptions) {
+    TCB.prototype.unlockRewards = function (tcbId, unlockAmount, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var fromattedDeviceId;
+            var contract;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        fromattedDeviceId = (0, utils_2.formatBytes32String)((Buffer.from(pb.deviceID, 'hex')).toString('base64'));
-                        return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.addData, [pb.benchmark, pb.properties, fromattedDeviceId, quote], transactionOptions)];
+                        contract = this.checkInitTcb(transactionOptions);
+                        (0, utils_1.checkIfActionAccountInitialized)();
+                        return [4 /*yield*/, TxManager_1.default.execute(contract.methods.unlockRewards, [tcbId, unlockAmount], transactionOptions)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -217,36 +194,30 @@ var TCB = /** @class */ (function () {
             });
         });
     };
-    TCB.prototype.getEpochInfo = function () {
+    /**
+     * Function for fetching all TCB data
+     */
+    TCB.prototype.get = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var epoch;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.contract.methods.getEpochInfo().call()];
-                    case 1:
-                        epoch = _a.sent();
-                        this.epoch = (0, utils_1.tupleToObject)(epoch, TcbData_1.TcbEpochInfoStructure);
-                        return [2 /*return*/, this.epoch];
-                }
+                return [2 /*return*/, this.contract.methods.getTcbById(this.tcbId).call()];
             });
         });
     };
     /**
-     * Function for fetching marks of TCB (from Consensus)
+     * Function for fetching the given marks for recruited TCBs from the Tables of Consensus
      */
-    TCB.prototype.getOwnMarks = function () {
+    TCB.prototype.getCheckingBlocksMarks = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, positive, negative;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.contract.methods.getOwnMarks().call()];
+            var tcb;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.contract.methods.getTcbById(this.tcbId).call()];
                     case 1:
-                        _a = _b.sent(), positive = _a[0], negative = _a[1];
-                        this.positive = positive;
-                        this.negative = negative;
+                        tcb = _a.sent();
                         return [2 /*return*/, {
-                                positive: positive,
-                                negative: negative,
+                                blocksIds: tcb.utilData.checkingBlocks,
+                                marks: tcb.utilData.checkingBlockMarks,
                             }];
                 }
             });
@@ -263,49 +234,35 @@ var TCB = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.contract.methods.getPublicData().call()];
                     case 1:
                         publicDataParams = _a.sent();
-                        publicData = (0, utils_1.tupleToObject)(publicDataParams, TcbData_1.PublicDataStructure);
-                        publicData.deviceID = (Buffer.from((0, utils_2.parseBytes32String)(publicData.deviceID), 'base64')).toString('hex');
+                        publicData = (0, utils_1.tupleToObject)(publicDataParams, Consensus_1.PublicDataStructure);
+                        publicData.deviceID = Buffer.from((0, utils_2.parseBytes32String)(publicData.deviceID), "base64").toString("hex");
                         return [2 /*return*/, publicData];
                 }
             });
         });
     };
     /**
-     * Function for fetching stored TCB data
+     * Function for fetching TCB status
      */
-    TCB.prototype.getQuote = function () {
+    TCB.prototype.getStatus = function () {
         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*/, this.contract.methods.getQuote().call()];
-                    case 1:
-                        _a.quote = _b.sent();
-                        return [2 /*return*/, this.quote];
-                }
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.contract.methods.getTcbStatus().call()];
             });
         });
     };
     /**
-     * Append marks for selected TCBs
-     * @param lType - type of appending marks
-     * @param marks - list of marks
-     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
+     * Function for fetching TCB status
      */
-    TCB.prototype.addMarks = function (lType, marks, transactionOptions) {
+    TCB.prototype.getEpochInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var epoch;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        if (!(marks.length > 0)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.addMarks, [lType, marks], transactionOptions)];
+                    case 0: return [4 /*yield*/, this.contract.methods.getEpochInfo().call()];
                     case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
+                        epoch = _a.sent();
+                        return [2 /*return*/, (0, utils_1.tupleToObject)(epoch, Consensus_1.TcbEpochInfoStructure)];
                 }
             });
         });

package/build/staticModels/Consensus.d.ts

@@ -1,63 +1,32 @@
-import TCB from "../models/TCB";
-import { PublicData } from "../types/TcbData";
+import { CheckingTcbData } from "../types/Consensus";
 import { TransactionOptions } from "../types/Web3";
 declare class Consensus {
     static address: string;
     private static contract;
     private static logger;
-    static LEnough: (tcb: TCB) => Promise<boolean>;
-    static offers?: string[];
     /**
      * Checks if contract has been initialized, if not - initialize contract
      */
     private static checkInit;
-    private static initTcb;
-    private static addToSupply;
-    private static addMarks;
+    private static initializeTcb;
     /**
-     * Function initialize TCB and returns two lists of anothers' TCB ids for their checking
-     * @param teeOfferId
+     * Function initialize TCB and returns list of anothers' TCB for their checking
+     * @param teeOfferId - id of TEE offer
      * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     * @returns two lists of anothers' TCB ids for their checking
+     * @returns tcbId and lists of anothers' TCB for their checking
      */
     static getListsForVerification(teeOfferId: string, transactionOptions?: TransactionOptions): Promise<{
-        L1: string[];
-        L2: string[];
+        tcbId: string;
+        checkingTcbData: CheckingTcbData[];
     }>;
-    /**
-     * Add data to TeeConfirmationBlock and push it to Consensus
-     * @param teeOfferId - TCB's device offer, as key
-     * @param L1Marks - marks of LastBlocks
-     * @param L2Marks - marks of SuspiciousBlocks
-     * @param tcbData - TEE generated
-     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     */
-    static addTCB(teeOfferId: string, L1Marks: number[], L2Marks: number[], tcbData: {
-        publicData: PublicData;
-        quote: string;
-    }, transactionOptions?: TransactionOptions): Promise<void>;
-    /**
-     * Function stake and lock TCB's reward
-     * @param tcbId - TEE Offer's completed and valid TCB contract
-     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     */
-    static claimRewards(tcbId: string, transactionOptions?: TransactionOptions): Promise<void>;
-    /**
-     * Function unlock previously locked TCB rewards (by claimRewards)
-     * @param tcbId - TCB id
-     * @param unlockAmount - amount of tokens to unlock, max available amount = TeeOffer.getLockInfo(tcbId)
-     * @param transactionOptions - object what contains alternative action account or gas limit (optional)
-     */
-    static unlockRewards(tcbId: string, unlockAmount: number, transactionOptions?: TransactionOptions): Promise<void>;
-    /**
-     * Function return last inited TCB of TEE offer
-     * @param teeOfferId
-     * */
-    static getInitedTcb(teeOfferId: string): Promise<string>;
     /**
      * Function return last inited TCB of TEE offer
-     * @param teeOfferId
+     * @param teeOfferId - id of TEE offer
      * */
-    static getTimeInited(teeOfferId: string): Promise<number>;
+    static getInitializedTcbId(teeOfferId: string): Promise<string>;
+    static getEpochIndex(): Promise<number>;
+    static getActualTcbId(teeOfferId: string): Promise<string>;
+    static getSuspiciousBlockTable(): Promise<string[]>;
+    static getLastBlockTable(): Promise<string[]>;
 }
 export default Consensus;