@super-protocol/sdk-js 0.12.9-beta.0 → 0.12.9-beta.3

package/build/connectors/BlockchainConnector.js

@@ -359,7 +359,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:
@@ -377,7 +377,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];
@@ -389,15 +396,15 @@ var BlockchainConnector = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.executeBatchAsync(batch)];
                     case 3:
-                        blocks = _a.sent();
+                        blocks = (_a.sent());
                         blocks.forEach(function (block) {
                             if (!(block === null || block === void 0 ? void 0 : block.transactions))
                                 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/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const defaultBlockchainUrl = "http://127.0.0.1:8545";
 export declare const defaultGasLimit = 7000000;
-export declare const defaultGasPrice = "3000000000";
+export declare const defaultGasPrice = "30000000000";
 export declare const defaultGasPriceMultiplier = 1;
 export declare const defaultGasLimitMultiplier = 1.2;
 export declare const ONE_DAY: number;

package/build/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
 exports.defaultBlockchainUrl = "http://127.0.0.1:8545";
 exports.defaultGasLimit = 7000000;
-exports.defaultGasPrice = "3000000000";
+exports.defaultGasPrice = "30000000000";
 exports.defaultGasPriceMultiplier = 1;
 exports.defaultGasLimitMultiplier = 1.2;
 exports.ONE_DAY = 24 * 60 * 60;

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)

package/build/staticModels/Consensus.d.ts

@@ -1,12 +1,19 @@
 import { EpochInfo } from "../types/Consensus";
 import { GetTcbRequest } from "@super-protocol/dto-js";
-import { TransactionOptions } from "../types/Web3";
+import { TransactionOptions, BlockInfo } from "../types/Web3";
 import { ConsensusConstants } from "../types/Consensus";
 declare class Consensus {
+    private static readonly logger;
+    private static tcbIds;
     static get address(): string;
     private static initializeTcbAndAssignBlocks;
     static initializeTcb(teeOfferId: string, transactionOptions?: TransactionOptions): Promise<void>;
     static isTcbCreationAvailable(teeOfferId: string): Promise<boolean>;
+    /**
+     * Function for fetching list of all tcb ids
+     * @returns list of tcb ids
+     */
+    static getAllTcbs(): Promise<string[]>;
     /**
      * Function initialize TCB and returns list of anothers' TCB for their checking
      * @param teeOfferId - id of TEE offer
@@ -31,5 +38,15 @@ declare class Consensus {
     static getLastBlockTable(): Promise<string[]>;
     static getLastBlockTableSize(): Promise<string[]>;
     static getConstants(): Promise<ConsensusConstants>;
+    static onTcbBanned(callback: onTcbBannedCallback): () => void;
+    static onTcbCompleted(callback: onTcbCompletedCallback): () => void;
+    static onTcbInitialized(callback: onTcbInitializedCallback): () => void;
+    static onTcbBenchmarkChanged(callback: onTcbBenchmarkChangedCallback): () => void;
+    static onRewardsClaimed(callback: onRewardsClaimedCallback): () => void;
 }
+export type onRewardsClaimedCallback = (tcbId: string, amount: string, claimer: string, block?: BlockInfo) => void;
+export type onTcbBenchmarkChangedCallback = (tcbId: string, provider: string, block?: BlockInfo) => void;
+export type onTcbInitializedCallback = (tcbId: string, provider: string, block?: BlockInfo) => void;
+export type onTcbCompletedCallback = (tcbId: string, provider: string, block?: BlockInfo) => void;
+export type onTcbBannedCallback = (tcbId: string, provider: string, block?: BlockInfo) => void;
 export default Consensus;

package/build/staticModels/Consensus.js

@@ -40,9 +40,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var TCB_1 = __importDefault(require("../models/TCB"));
+var logger_1 = __importDefault(require("../logger"));
 var utils_1 = require("../utils");
 var Superpro_1 = __importDefault(require("./Superpro"));
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
+var BlockchainEventsListener_1 = __importDefault(require("../connectors/BlockchainEventsListener"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var Consensus_1 = require("../types/Consensus");
 var Consensus = /** @class */ (function () {
@@ -111,6 +113,31 @@ var Consensus = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Function for fetching list of all tcb ids
+     * @returns list of tcb ids
+     */
+    Consensus.getAllTcbs = function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var contract, tcbSet, tcbsCount, tcbId;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        contract = BlockchainConnector_1.default.getInstance().getContract();
+                        tcbSet = new Set((_a = this.tcbIds) !== null && _a !== void 0 ? _a : []);
+                        return [4 /*yield*/, contract.methods.getTcbsCount().call()];
+                    case 1:
+                        tcbsCount = _b.sent();
+                        for (tcbId = tcbSet.size + 1; tcbId <= tcbsCount; tcbId++) {
+                            tcbSet.add(tcbId.toString());
+                        }
+                        this.tcbIds = Array.from(tcbSet);
+                        return [2 /*return*/, this.tcbIds];
+                }
+            });
+        });
+    };
     /**
      * Function initialize TCB and returns list of anothers' TCB for their checking
      * @param teeOfferId - id of TEE offer
@@ -265,6 +292,119 @@ var Consensus = /** @class */ (function () {
             });
         });
     };
+    // TODO: get locked rewards info
+    // TODO: claim avaliable rewards
+    Consensus.onTcbBanned = function (callback) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onTcbBanned" });
+        var subscription = contract.events
+            .TcbBanned()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                callback(event.returnValues.tcbId, event.returnValues.provider, {
+                    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(); };
+    };
+    Consensus.onTcbCompleted = function (callback) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onTcbCompleted" });
+        var subscription = contract.events
+            .TcbCompleted()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                callback(event.returnValues.tcbId, event.returnValues.provider, {
+                    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(); };
+    };
+    Consensus.onTcbInitialized = function (callback) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onTcbInitialized" });
+        var subscription = contract.events
+            .TcbInitialized()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                callback(event.returnValues.tcbId, event.returnValues.provider, {
+                    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(); };
+    };
+    Consensus.onTcbBenchmarkChanged = function (callback) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onTcbBenchmarkChanged" });
+        var subscription = contract.events
+            .TcbBenchmarkChanged()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                callback(event.returnValues.tcbId, event.returnValues.provider, {
+                    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(); };
+    };
+    Consensus.onRewardsClaimed = function (callback) {
+        var _this = this;
+        var contract = BlockchainEventsListener_1.default.getInstance().getContract();
+        var logger = this.logger.child({ method: "onRewardsClaimed" });
+        var subscription = contract.events
+            .RewardsClaimed()
+            .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                callback(event.returnValues.tcbId, event.returnValues.amount, event.returnValues.claimer, {
+                    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(); };
+    };
+    Consensus.logger = logger_1.default.child({ className: "Consensus" });
     return Consensus;
 }());
 exports.default = Consensus;

package/build/staticModels/OrdersFactory.js

@@ -201,6 +201,7 @@ var OrdersFactory = /** @class */ (function () {
                         foundIds = _a.sent();
                         notFound = __assign(__assign({}, filter), { offerId: "-1", orderId: "-1" });
                         response = foundIds.length > 0 ? foundIds[0].returnValues : notFound;
+                        response.externalId = (0, utils_1.parseBytes32String)(response.externalId);
                         return [2 /*return*/, response];
                 }
             });

package/build/types/Consensus.d.ts

@@ -10,7 +10,7 @@ export declare const PublicDataStructure: {
     benchmark: NumberConstructor;
     properties: StringConstructor;
 };
-export type PublicData = {
+export type TcbPublicData = {
     teeOffer?: string;
     deviceID: string;
     benchmark: number;
@@ -30,7 +30,7 @@ export declare const UtilityDataStructure: {
     checked: BooleanConstructor;
     rewardClaimed: BooleanConstructor;
 };
-export type UtilityData = {
+export type TcbUtilityData = {
     checkingBlocks: [string];
     checkingBlockMarks: [TcbVerifiedStatus];
     lastBlocksTakenAmount: number;
@@ -90,8 +90,8 @@ export type TcbData = {
     quote: string;
     timeInitialized: number;
     timeAdded: number;
-    publicData: PublicData;
-    utilData: UtilityData;
+    publicData: TcbPublicData;
+    utilData: TcbUtilityData;
     status: TcbStatus;
 };
 export type EpochInfo = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.12.9-beta.0",
+  "version": "0.12.9-beta.3",
   "main": "build/index.js",
   "license": "MIT",
   "files": [