@super-protocol/sdk-js 0.11.9-beta.6 → 0.11.9-beta.9

package/build/contracts/app.json

@@ -1788,6 +1788,40 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "inputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "teeOfferId",
+                    "type": "uint256"
+                }
+            ],
+            "name": "isTcbCreationAvailable",
+            "outputs": [
+                {
+                    "internalType": "bool",
+                    "name": "offerNotBlocked",
+                    "type": "bool"
+                },
+                {
+                    "internalType": "bool",
+                    "name": "newEpochStarted",
+                    "type": "bool"
+                },
+                {
+                    "internalType": "bool",
+                    "name": "halfEpochPassed",
+                    "type": "bool"
+                },
+                {
+                    "internalType": "bool",
+                    "name": "benchmarkVerified",
+                    "type": "bool"
+                }
+            ],
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "inputs": [
                 {

package/build/staticModels/Consensus.d.ts

@@ -1,19 +1,18 @@
-import { CheckingTcbData, EpochInfo } from "../types/Consensus";
+import { EpochInfo } from "../types/Consensus";
+import { GetTcbRequest } from "@super-protocol/dto-js";
 import { TransactionOptions } from "../types/Web3";
 declare class Consensus {
     static get address(): string;
     private static initializeTcbAndAssignBlocks;
     static initializeTcb(teeOfferId: string, transactionOptions?: TransactionOptions): Promise<void>;
+    static isTcbCreationAvailable(teeOfferId: string): Promise<boolean>;
     /**
      * 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 tcbId and lists of anothers' TCB for their checking
      */
-    static getListsForVerification(teeOfferId: string, initializeTcbForce?: boolean, transactionOptions?: TransactionOptions): Promise<{
-        tcbId: string;
-        checkingTcbData: CheckingTcbData[];
-    }>;
+    static getListsForVerification(teeOfferId: string, transactionOptions?: TransactionOptions): Promise<GetTcbRequest>;
     /**
      * Function return last inited TCB of TEE offer
      * @param teeOfferId - id of TEE offer

package/build/staticModels/Consensus.js

@@ -41,7 +41,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var TCB_1 = __importDefault(require("../models/TCB"));
 var utils_1 = require("../utils");
-var constants_1 = require("../constants");
 var Superpro_1 = __importDefault(require("./Superpro"));
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
@@ -55,39 +54,25 @@ var Consensus = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Consensus.initializeTcbAndAssignBlocks = function (teeOfferId, initializeTcbForce, transactionOptions) {
+    Consensus.initializeTcbAndAssignBlocks = function (teeOfferId, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var tcbId, tcb, timeInitialized, isFirstOffersTcb, isCreatedMoreThenOneDayAgo, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.getInitializedTcbId(teeOfferId)];
+            var tcbId, tcb;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.initializeTcb(teeOfferId, transactionOptions)];
                     case 1:
-                        tcbId = _b.sent();
-                        tcb = new TCB_1.default(tcbId);
-                        return [4 /*yield*/, tcb.get()];
-                    case 2:
-                        timeInitialized = +(_b.sent()).timeInitialized;
-                        isFirstOffersTcb = timeInitialized == 0;
-                        _a = timeInitialized + constants_1.ONE_DAY;
-                        return [4 /*yield*/, (0, utils_1.getTimestamp)()];
-                    case 3:
-                        isCreatedMoreThenOneDayAgo = _a < +(_b.sent());
-                        if (!(isFirstOffersTcb || isCreatedMoreThenOneDayAgo || initializeTcbForce)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.initializeTcb(teeOfferId, transactionOptions)];
-                    case 4:
-                        _b.sent();
+                        _a.sent();
                         return [4 /*yield*/, this.getInitializedTcbId(teeOfferId)];
-                    case 5:
-                        tcbId = _b.sent();
+                    case 2:
+                        tcbId = _a.sent();
                         tcb = new TCB_1.default(tcbId);
                         return [4 /*yield*/, tcb.assignLastBlocksToCheck(transactionOptions)];
-                    case 6:
-                        _b.sent();
+                    case 3:
+                        _a.sent();
                         return [4 /*yield*/, tcb.assignSuspiciousBlocksToCheck(transactionOptions)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8: return [2 /*return*/, tcb];
+                    case 4:
+                        _a.sent();
+                        return [2 /*return*/, tcb];
                 }
             });
         });
@@ -108,27 +93,38 @@ var Consensus = /** @class */ (function () {
             });
         });
     };
+    Consensus.isTcbCreationAvailable = function (teeOfferId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var contract, _a, offerNotBlocked, newEpochStarted, halfEpochPassed, benchmarkVerified;
+            return __generator(this, function (_b) {
+                contract = BlockchainConnector_1.default.getInstance().getContract();
+                _a = contract.methods
+                    .isTcbCreationAvailable(teeOfferId)
+                    .call(), offerNotBlocked = _a[0], newEpochStarted = _a[1], halfEpochPassed = _a[2], benchmarkVerified = _a[3];
+                return [2 /*return*/, offerNotBlocked && newEpochStarted && halfEpochPassed && benchmarkVerified];
+            });
+        });
+    };
     /**
      * 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 tcbId and lists of anothers' TCB for their checking
      */
-    Consensus.getListsForVerification = function (teeOfferId, initializeTcbForce, transactionOptions) {
-        if (initializeTcbForce === void 0) { initializeTcbForce = false; }
+    Consensus.getListsForVerification = function (teeOfferId, transactionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var tcb, blocksIds, checkingTcbData, blockIndex, tcb_1, tcbInfo;
+            var tcb, blocksIds, tcbsForVerification, blockIndex, tcb_1, tcbInfo;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         (0, utils_1.checkIfActionAccountInitialized)();
-                        return [4 /*yield*/, this.initializeTcbAndAssignBlocks(teeOfferId, initializeTcbForce, transactionOptions)];
+                        return [4 /*yield*/, this.initializeTcbAndAssignBlocks(teeOfferId, transactionOptions)];
                     case 1:
                         tcb = _a.sent();
                         return [4 /*yield*/, tcb.getCheckingBlocksMarks()];
                     case 2:
                         blocksIds = (_a.sent()).blocksIds;
-                        checkingTcbData = [];
+                        tcbsForVerification = [];
                         blockIndex = 0;
                         _a.label = 3;
                     case 3:
@@ -137,12 +133,14 @@ var Consensus = /** @class */ (function () {
                         return [4 /*yield*/, tcb_1.get()];
                     case 4:
                         tcbInfo = _a.sent();
-                        checkingTcbData.push({
-                            deviceID: tcbInfo.publicData.deviceID,
+                        tcbsForVerification.push({
+                            tcbId: blocksIds[blockIndex].toString(),
+                            deviceId: tcbInfo.publicData.deviceID,
                             properties: tcbInfo.publicData.properties,
                             benchmark: tcbInfo.publicData.benchmark,
-                            tcbQuote: tcbInfo.quote,
-                            tcbMarks: tcbInfo.utilData.checkingBlockMarks,
+                            quote: tcbInfo.quote,
+                            marks: tcbInfo.utilData.checkingBlockMarks,
+                            checkingBlocks: tcbInfo.utilData.checkingBlocks,
                         });
                         _a.label = 5;
                     case 5:
@@ -150,7 +148,7 @@ var Consensus = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 6: return [2 /*return*/, {
                             tcbId: tcb.tcbId,
-                            checkingTcbData: checkingTcbData,
+                            tcbsForVerification: tcbsForVerification,
                         }];
                 }
             });
@@ -171,18 +169,18 @@ var Consensus = /** @class */ (function () {
     };
     Consensus.getEpochTime = function (time) {
         return __awaiter(this, void 0, void 0, function () {
-            var contract, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var contract, _a, epochStart, epochEnd, epochIndex;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract();
                         return [4 /*yield*/, contract.methods.getEpochTime(time).call()];
                     case 1:
-                        result = _a.sent();
+                        _a = _b.sent(), epochStart = _a[0], epochEnd = _a[1], epochIndex = _a[2];
                         return [2 /*return*/, {
-                                epochStart: result[0],
-                                epochEnd: result[1],
-                                epochIndex: result[2],
+                                epochStart: epochStart,
+                                epochEnd: epochEnd,
+                                epochIndex: epochIndex,
                             }];
                 }
             });

package/build/types/Consensus.d.ts

@@ -1,8 +1,8 @@
 export declare enum TcbVerifiedStatus {
-    Valid = "0",
-    InvalidQuote = "1",
-    InvalidMrEnclave = "2",
-    InvalidBcbHash = "3"
+    Valid = 0,
+    InvalidQuote = 1,
+    InvalidMrEnclave = 2,
+    InvalidBcbHash = 3
 }
 export declare const PublicDataStructure: {
     teeOffer: StringConstructor;
@@ -11,19 +11,19 @@ export declare const PublicDataStructure: {
     properties: StringConstructor;
 };
 export declare type PublicData = {
-    teeOffer: string;
+    teeOffer?: string;
     deviceID: string;
     benchmark: number;
     properties: string;
 };
 export declare const UtilityDataStructure: {
-    checkingBlocks: NumberConstructor[];
+    checkingBlocks: StringConstructor[];
     checkingBlockMarks: (typeof TcbVerifiedStatus)[];
     lastBlocksTakenAmount: NumberConstructor;
     suspiciousBlocksTakenAmount: NumberConstructor;
     negative: NumberConstructor;
     positive: NumberConstructor;
-    previousTcb: NumberConstructor;
+    previousTcb: StringConstructor;
     lastBlocksTaken: BooleanConstructor;
     suspiciousBlocksTaken: BooleanConstructor;
     assignedToEpoch: BooleanConstructor;
@@ -31,13 +31,13 @@ export declare const UtilityDataStructure: {
     rewardClaimed: BooleanConstructor;
 };
 export declare type UtilityData = {
-    checkingBlocks: [number];
+    checkingBlocks: [string];
     checkingBlockMarks: [TcbVerifiedStatus];
     lastBlocksTakenAmount: number;
     suspiciousBlocksTakenAmount: number;
     negative: number;
     positive: number;
-    previousTcb: number;
+    previousTcb: string;
     lastBlocksTaken: boolean;
     suspiciousBlocksTaken: boolean;
     assignedToEpoch: boolean;
@@ -71,13 +71,13 @@ export declare const TcbStructure: {
         properties: StringConstructor;
     };
     utilData: {
-        checkingBlocks: NumberConstructor[];
+        checkingBlocks: StringConstructor[];
         checkingBlockMarks: (typeof TcbVerifiedStatus)[];
         lastBlocksTakenAmount: NumberConstructor;
         suspiciousBlocksTakenAmount: NumberConstructor;
         negative: NumberConstructor;
         positive: NumberConstructor;
-        previousTcb: NumberConstructor;
+        previousTcb: StringConstructor;
         lastBlocksTaken: BooleanConstructor;
         suspiciousBlocksTaken: BooleanConstructor;
         assignedToEpoch: BooleanConstructor;
@@ -99,10 +99,3 @@ export declare type EpochInfo = {
     benchmark: number;
     penaltyBenchmark: number;
 };
-export declare type CheckingTcbData = {
-    deviceID: string;
-    properties: string;
-    benchmark: number;
-    tcbQuote: string;
-    tcbMarks: [TcbVerifiedStatus];
-};

package/build/types/Consensus.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TcbStructure = exports.TcbStatus = exports.EpochStructure = exports.UtilityDataStructure = exports.PublicDataStructure = exports.TcbVerifiedStatus = void 0;
 var TcbVerifiedStatus;
 (function (TcbVerifiedStatus) {
-    TcbVerifiedStatus["Valid"] = "0";
-    TcbVerifiedStatus["InvalidQuote"] = "1";
-    TcbVerifiedStatus["InvalidMrEnclave"] = "2";
-    TcbVerifiedStatus["InvalidBcbHash"] = "3";
+    TcbVerifiedStatus[TcbVerifiedStatus["Valid"] = 0] = "Valid";
+    TcbVerifiedStatus[TcbVerifiedStatus["InvalidQuote"] = 1] = "InvalidQuote";
+    TcbVerifiedStatus[TcbVerifiedStatus["InvalidMrEnclave"] = 2] = "InvalidMrEnclave";
+    TcbVerifiedStatus[TcbVerifiedStatus["InvalidBcbHash"] = 3] = "InvalidBcbHash";
 })(TcbVerifiedStatus = exports.TcbVerifiedStatus || (exports.TcbVerifiedStatus = {}));
 // Order of keys and type conversion functions for this object in blockchain contract
 exports.PublicDataStructure = {
@@ -16,13 +16,13 @@ exports.PublicDataStructure = {
     properties: String,
 };
 exports.UtilityDataStructure = {
-    checkingBlocks: [Number],
+    checkingBlocks: [String],
     checkingBlockMarks: [TcbVerifiedStatus],
     lastBlocksTakenAmount: Number,
     suspiciousBlocksTakenAmount: Number,
     negative: Number,
     positive: Number,
-    previousTcb: Number,
+    previousTcb: String,
     lastBlocksTaken: Boolean,
     suspiciousBlocksTaken: Boolean,
     assignedToEpoch: Boolean,

package/build/utils.js

@@ -48,7 +48,7 @@ var lodash_1 = require("lodash");
  */
 var checkIfActionAccountInitialized = function (transactionOptions) {
     if (!store_1.default.actionAccount && !(transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3))
-        throw new Error("Provider action account is not initialized, needs to run 'BlockchainConnector.getInstance().initActionAccount(SECRET_KEY)' first");
+        throw new Error("Provider action account is not initialized, needs to run 'BlockchainConnector.getInstance().initializeActionAccount(SECRET_KEY)' first");
 };
 exports.checkIfActionAccountInitialized = checkIfActionAccountInitialized;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.11.9-beta.6",
+  "version": "0.11.9-beta.9",
   "main": "build/index.js",
   "license": "MIT",
   "files": [
@@ -53,7 +53,7 @@
     "typescript": "^4.4.4"
   },
   "dependencies": {
-    "@super-protocol/dto-js": "0.0.14",
+    "@super-protocol/dto-js": "0.0.22",
     "@super-protocol/tee-lib": "^0.1.2",
     "@super-protocol/uplink-nodejs": "1.2.12",
     "eccrypto": "^1.1.6",