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

package/build/models/TCB.js

@@ -41,7 +41,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var app_json_1 = __importDefault(require("../contracts/app.json"));
 var utils_1 = require("../utils");
-var utils_2 = require("ethers/lib/utils");
 var Superpro_1 = __importDefault(require("../staticModels/Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
@@ -76,7 +75,7 @@ var TCB = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        fromattedDeviceId = (0, utils_2.formatBytes32String)(Buffer.from(pb.deviceID).toString("base64"));
+                        fromattedDeviceId = (0, utils_1.formatHexStringToBytes32)(pb.deviceID);
                         return [4 /*yield*/, TxManager_1.default.execute(this.contract.methods.setTcbData, [this.tcbId, pb.benchmark, pb.properties, fromattedDeviceId, quote], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -192,13 +191,15 @@ var TCB = /** @class */ (function () {
      */
     TCB.prototype.get = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var tcb;
+            var tcb, tcbObject;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.contract.methods.getTcbById(this.tcbId).call()];
                     case 1:
                         tcb = _a.sent();
-                        return [2 /*return*/, (0, utils_1.tupleToObject)(tcb, Consensus_1.TcbStructure)];
+                        tcbObject = (0, utils_1.tupleToObject)(tcb, Consensus_1.TcbStructure);
+                        tcbObject.publicData.deviceID = (0, utils_1.parseBytes32toHexString)(tcbObject.publicData.deviceID);
+                        return [2 /*return*/, tcbObject];
                 }
             });
         });

package/build/staticModels/Consensus.js

@@ -141,7 +141,7 @@ var Consensus = /** @class */ (function () {
                         tcbInfo = _a.sent();
                         tcbsForVerification.push({
                             tcbId: blocksIds[blockIndex].toString(),
-                            deviceId: tcbInfo.publicData.deviceID,
+                            deviceId: (0, utils_1.parseBytes32toHexString)(tcbInfo.publicData.deviceID),
                             properties: tcbInfo.publicData.properties,
                             benchmark: tcbInfo.publicData.benchmark,
                             quote: tcbInfo.quote,

package/build/staticModels/TeeOffersFactory.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = __importDefault(require("../logger"));
 var utils_1 = require("../utils");
 var utils_2 = require("ethers/lib/utils");
+var utils_3 = require("../utils");
 var TeeOffer_1 = require("../types/TeeOffer");
 var Offer_1 = require("../types/Offer");
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
@@ -152,7 +153,8 @@ var TeeOffersFactory = /** @class */ (function () {
      */
     TeeOffersFactory.getByDeviceId = function (deviceId) {
         var contract = BlockchainConnector_1.default.getInstance().getContract();
-        return contract.methods.getTeeOfferByDeviceId(deviceId).call();
+        var fromattedDeviceId = (0, utils_3.formatHexStringToBytes32)(deviceId);
+        return contract.methods.getTeeOfferByDeviceId(fromattedDeviceId).call();
     };
     /**
      * Function for adding event listeners on TEE offer created event in TEE offers factory contract

package/build/utils.d.ts

@@ -1,5 +1,6 @@
 import { TransactionOptions } from "./types/Web3";
 import Web3 from "web3";
+import { BytesLike } from "@ethersproject/bytes";
 /**
  * Function for checking if provider action account initialized (required for set methods)
  * Used in all set methods
@@ -30,4 +31,6 @@ type Format = FormatItem[] | {
 export declare const tupleToObject: <T>(data: unknown[], format: Format) => T;
 export declare const objectToTuple: (data: unknown, format: Format) => unknown[];
 export declare function incrementMethodCall(): (_target: any, propertyName: string, propertyDescriptor: PropertyDescriptor) => PropertyDescriptor;
+export declare function formatHexStringToBytes32(text: string): string;
+export declare function parseBytes32toHexString(bytes: BytesLike): string;
 export {};

package/build/utils.js

@@ -39,10 +39,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.incrementMethodCall = exports.objectToTuple = exports.tupleToObject = exports.isNodeJS = exports.createTransactionOptions = exports.getGasPrice = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
+exports.parseBytes32toHexString = exports.formatHexStringToBytes32 = exports.incrementMethodCall = exports.objectToTuple = exports.tupleToObject = exports.isNodeJS = exports.createTransactionOptions = exports.getGasPrice = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
 var store_1 = __importDefault(require("./store"));
 var lodash_1 = require("lodash");
 var Monitoring_1 = require("./utils/Monitoring");
+var utils_1 = require("ethers/lib/utils");
+var bytes_1 = require("@ethersproject/bytes");
+var constants_1 = require("@ethersproject/constants");
 /**
  * Function for checking if provider action account initialized (required for set methods)
  * Used in all set methods
@@ -172,9 +175,6 @@ var objectToTuple = function (data, format) {
 exports.objectToTuple = objectToTuple;
 function incrementMethodCall() {
     return function (_target, propertyName, propertyDescriptor) {
-        if (!(0, exports.isNodeJS)()) {
-            return propertyDescriptor;
-        }
         var monitoring = Monitoring_1.Monitoring.getInstance();
         var method = propertyDescriptor.value;
         propertyDescriptor.value = function () {
@@ -193,3 +193,37 @@ function incrementMethodCall() {
     };
 }
 exports.incrementMethodCall = incrementMethodCall;
+var hexRegex = /^[0-9a-fA-F]+$/;
+function formatHexStringToBytes32(text) {
+    if (!hexRegex.test(text)) {
+        throw new Error("formatted value - is not a hex");
+    }
+    // Get the bytes
+    var bytes = (0, utils_1.toUtf8Bytes)(text);
+    // Check we have room for null-termination
+    if (bytes.length > 32) {
+        throw new Error("bytes32 string must be less or equal than 32 bytes");
+    }
+    // Zero-pad (implicitly null-terminates)
+    return (0, bytes_1.hexlify)((0, bytes_1.concat)([bytes, constants_1.HashZero]).slice(0, 32));
+}
+exports.formatHexStringToBytes32 = formatHexStringToBytes32;
+function parseBytes32toHexString(bytes) {
+    var data = (0, bytes_1.arrayify)(bytes);
+    // Must be 32 bytes
+    if (data.length !== 32) {
+        throw new Error("invalid bytes32 - not 32 bytes long");
+    }
+    // Find the null termination
+    var length = 32;
+    while (data[length - 1] === 0) {
+        length--;
+    }
+    // Determine the string value
+    var decodedValue = (0, utils_1.toUtf8String)(data.slice(0, length));
+    if (!hexRegex.test(decodedValue)) {
+        throw new Error("parsed value - is not a hex");
+    }
+    return decodedValue;
+}
+exports.parseBytes32toHexString = parseBytes32toHexString;

package/package.json

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