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

package/build/models/TCB.js

@@ -75,7 +75,7 @@ var TCB = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        fromattedDeviceId = (0, utils_1.formatHexStringToBytes32)(pb.deviceID);
+                        fromattedDeviceId = (0, utils_1.packDevicId)(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();
@@ -198,7 +198,7 @@ var TCB = /** @class */ (function () {
                     case 1:
                         tcb = _a.sent();
                         tcbObject = (0, utils_1.tupleToObject)(tcb, Consensus_1.TcbStructure);
-                        tcbObject.publicData.deviceID = (0, utils_1.parseBytes32toHexString)(tcbObject.publicData.deviceID);
+                        tcbObject.publicData.deviceID = (0, utils_1.unpackDeviceId)(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: (0, utils_1.parseBytes32toHexString)(tcbInfo.publicData.deviceID),
+                            deviceId: (0, utils_1.unpackDeviceId)(tcbInfo.publicData.deviceID),
                             properties: tcbInfo.publicData.properties,
                             benchmark: tcbInfo.publicData.benchmark,
                             quote: tcbInfo.quote,

package/build/staticModels/TeeOffersFactory.js

@@ -153,7 +153,7 @@ var TeeOffersFactory = /** @class */ (function () {
      */
     TeeOffersFactory.getByDeviceId = function (deviceId) {
         var contract = BlockchainConnector_1.default.getInstance().getContract();
-        var fromattedDeviceId = (0, utils_3.formatHexStringToBytes32)(deviceId);
+        var fromattedDeviceId = (0, utils_3.packDevicId)(deviceId);
         return contract.methods.getTeeOfferByDeviceId(fromattedDeviceId).call();
     };
     /**

package/build/utils.d.ts

@@ -1,6 +1,5 @@
 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
@@ -31,6 +30,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 declare function packDevicId(hexedDeviceId: string): string;
+export declare function unpackDeviceId(bytes32: string): string;
 export {};

package/build/utils.js

@@ -39,13 +39,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseBytes32toHexString = exports.formatHexStringToBytes32 = exports.incrementMethodCall = exports.objectToTuple = exports.tupleToObject = exports.isNodeJS = exports.createTransactionOptions = exports.getGasPrice = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
+exports.unpackDeviceId = exports.packDevicId = 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
@@ -194,36 +191,20 @@ 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");
+function packDevicId(hexedDeviceId) {
+    if (hexedDeviceId.length !== 64) {
+        throw new Error("DeviceId must be equal 64 hex symbols");
     }
-    // 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");
+    if (!hexRegex.test(hexedDeviceId)) {
+        throw new Error("DeviceId must be a hexedecimal");
     }
-    // Zero-pad (implicitly null-terminates)
-    return (0, bytes_1.hexlify)((0, bytes_1.concat)([bytes, constants_1.HashZero]).slice(0, 32));
+    return "0x" + hexedDeviceId;
 }
-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");
+exports.packDevicId = packDevicId;
+function unpackDeviceId(bytes32) {
+    if (bytes32.length == 66) {
+        throw new Error("DeviceId bytes must be equal 66 symbols");
     }
-    // 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;
+    return bytes32.slice(0, 64);
 }
-exports.parseBytes32toHexString = parseBytes32toHexString;
+exports.unpackDeviceId = unpackDeviceId;

package/package.json

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