@super-protocol/sdk-js 0.10.2-beta.4 → 0.10.7-beta.0

package/build/BlockchainConnector.d.ts

@@ -6,6 +6,7 @@ declare class BlockchainConnector {
     private static logger;
     private static contract;
     private static provider?;
+    private static providerHttps?;
     static defaultActionAccount?: string;
     private static initContracts;
     static getContractInstance(transactionOptions?: TransactionOptions): Contract;
@@ -54,6 +55,7 @@ declare class BlockchainConnector {
      */
     static getTransactionCount(address: string, status?: string): Promise<number>;
     static getAddressByKey(pk: string): string;
+    private static executeBatchAsync;
     /**
      * Fetch transactions for specific addresses starting with specific block until last block
      * @param addresses - array of addresses to fetch transactions (from these addresses and to these addresses)
@@ -68,10 +70,10 @@ declare class BlockchainConnector {
     static getTransactions(addresses: string[], startBlock?: number, lastBlock?: number, batchSize?: number): Promise<BlockchainTransaction>;
     static disconnect(): void;
 }
-export declare type onNewBlockCallback = (blockInfo: BlockInfo) => void;
 export declare type Config = {
     contractAddress: string;
     blockchainUrl?: string;
+    blockchainHttpsUrl?: string;
     gasPrice?: string;
     gasLimit?: number;
     gasLimitMultiplier?: number;

package/build/BlockchainConnector.js

@@ -52,6 +52,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = __importDefault(require("./logger"));
 var web3_1 = __importDefault(require("web3"));
+var web3_core_helpers_1 = require("web3-core-helpers");
 var store_1 = __importDefault(require("./store"));
 var constants_1 = require("./constants");
 var utils_1 = require("./utils");
@@ -60,6 +61,7 @@ var SuperproToken_1 = __importDefault(require("./staticModels/SuperproToken"));
 var TxManager_1 = __importDefault(require("./utils/TxManager"));
 var app_json_1 = __importDefault(require("./contracts/app.json"));
 var ethers_1 = require("ethers");
+var Jsonrpc = require('web3-core-requestmanager/src/jsonrpc');
 var BlockchainConnector = /** @class */ (function () {
     function BlockchainConnector() {
     }
@@ -90,6 +92,10 @@ var BlockchainConnector = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         url = (config === null || config === void 0 ? void 0 : config.blockchainUrl) || constants_1.defaultBlockchainUrl;
+                        if (config === null || config === void 0 ? void 0 : config.blockchainHttpsUrl) {
+                            this.providerHttps = new web3_1.default.providers.HttpProvider(config === null || config === void 0 ? void 0 : config.blockchainHttpsUrl);
+                            store_1.default.web3Https = new web3_1.default(this.providerHttps);
+                        }
                         if (this.provider) {
                             if (this.provider instanceof web3_1.default.providers.WebsocketProvider) {
                                 this.provider.reset();
@@ -308,6 +314,32 @@ var BlockchainConnector = /** @class */ (function () {
     BlockchainConnector.getAddressByKey = function (pk) {
         return new ethers_1.Wallet(pk).address;
     };
+    BlockchainConnector.executeBatchAsync = function (batch) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        var requests = batch.requests;
+                        batch.requestManager.sendBatch(requests, function (error, results) {
+                            if (error)
+                                return reject(error);
+                            results = results || [];
+                            var response = requests.map(function (request, index) {
+                                return results[index] || {};
+                            }).map(function (result, index) {
+                                if (result && result.error) {
+                                    return web3_core_helpers_1.errors.ErrorResponse(result);
+                                }
+                                if (!Jsonrpc.isValidResponse(result)) {
+                                    return web3_core_helpers_1.errors.InvalidResponse(result);
+                                }
+                                return requests[index].format ? requests[index].format(result.result) : result.result;
+                            });
+                            resolve(response);
+                        });
+                    })];
+            });
+        });
+    };
     /**
      * Fetch transactions for specific addresses starting with specific block until last block
      * @param addresses - array of addresses to fetch transactions (from these addresses and to these addresses)
@@ -322,69 +354,56 @@ var BlockchainConnector = /** @class */ (function () {
     BlockchainConnector.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 endBlock, _a, blocksNumbersToFetch, activeStep, i, transactionsByAddress, i;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var blockchainLastBlock, transactionsByAddress, batch, getBlock, batchLastBlock, blockNumber, blocks;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        if (!lastBlock) return [3 /*break*/, 1];
-                        _a = lastBlock;
-                        return [3 /*break*/, 3];
-                    case 1: return [4 /*yield*/, store_1.default.web3.eth.getBlockNumber()];
-                    case 2:
-                        _a = _b.sent();
-                        _b.label = 3;
-                    case 3:
-                        endBlock = _a;
-                        if (!startBlock)
-                            startBlock = Math.max(endBlock - 1000, 0);
-                        blocksNumbersToFetch = [[]];
-                        activeStep = blocksNumbersToFetch[0];
-                        for (i = startBlock; i <= endBlock; i++) {
-                            activeStep.push(i);
-                            if (activeStep.length >= batchSize) {
-                                blocksNumbersToFetch.push([]);
-                                activeStep = blocksNumbersToFetch[blocksNumbersToFetch.length - 1];
-                            }
+                        (0, utils_1.checkIfHttpsInitialized)();
+                        return [4 /*yield*/, store_1.default.web3Https.eth.getBlockNumber()];
+                    case 1:
+                        blockchainLastBlock = _a.sent();
+                        if (lastBlock) {
+                            lastBlock = Math.min(lastBlock, blockchainLastBlock);
+                        }
+                        else {
+                            lastBlock = blockchainLastBlock;
+                        }
+                        if (!startBlock) {
+                            startBlock = Math.max(lastBlock - 1000, 0);
                         }
                         transactionsByAddress = {};
                         addresses.forEach(function (address) { return (transactionsByAddress[address] = []); });
-                        i = 0;
-                        _b.label = 4;
-                    case 4:
-                        if (!(i < blocksNumbersToFetch.length)) return [3 /*break*/, 7];
-                        return [4 /*yield*/, Promise.all(blocksNumbersToFetch[i].map(function (blockNumber) { return __awaiter(_this, void 0, void 0, function () {
-                                var block;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, store_1.default.web3.eth.getBlock(blockNumber, true)];
-                                        case 1:
-                                            block = _a.sent();
-                                            if (block && block.transactions) {
-                                                block.transactions.forEach(function (transaction) {
-                                                    var address = null;
-                                                    if (addresses.includes(transaction.from))
-                                                        address = transaction.from;
-                                                    else if (transaction.to && addresses.includes(transaction.to))
-                                                        address = transaction.to;
-                                                    if (address) {
-                                                        transactionsByAddress[address].push(__assign(__assign({}, transaction), { timestamp: +block.timestamp * 1000, input: transaction.input }));
-                                                    }
-                                                });
-                                            }
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); }))];
-                    case 5:
-                        _b.sent();
-                        _b.label = 6;
-                    case 6:
-                        i++;
-                        return [3 /*break*/, 4];
-                    case 7: return [2 /*return*/, {
+                        _a.label = 2;
+                    case 2:
+                        if (!(startBlock <= lastBlock)) return [3 /*break*/, 4];
+                        batch = new store_1.default.web3Https.eth.BatchRequest();
+                        getBlock = store_1.default.web3Https.eth.getBlock;
+                        batchLastBlock = Math.min(startBlock + batchSize - 1, lastBlock);
+                        for (blockNumber = startBlock; blockNumber <= batchLastBlock; blockNumber++) {
+                            batch.add(getBlock.request(blockNumber, true));
+                        }
+                        return [4 /*yield*/, this.executeBatchAsync(batch)];
+                    case 3:
+                        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))
+                                    address = transaction.from;
+                                else if (transaction.to && addresses.includes(transaction.to))
+                                    address = transaction.to;
+                                if (address) {
+                                    transactionsByAddress[address].push(__assign(__assign({}, transaction), { timestamp: +block.timestamp * 1000, input: transaction.input }));
+                                }
+                            });
+                        });
+                        startBlock = batchLastBlock + 1;
+                        return [3 /*break*/, 2];
+                    case 4: return [2 /*return*/, {
                             transactionsByAddress: transactionsByAddress,
-                            lastBlock: endBlock,
+                            lastBlock: lastBlock,
                         }];
                 }
             });
@@ -393,6 +412,8 @@ var BlockchainConnector = /** @class */ (function () {
     BlockchainConnector.disconnect = function () {
         var _a;
         (_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect(0, "");
+        if (this.providerHttps)
+            this.providerHttps.disconnect();
         store_1.default.isInitialized = false;
         store_1.default.web3 = undefined;
     };

package/build/TIIGenerator.js

@@ -82,7 +82,7 @@ var TIIGenerator = /** @class */ (function () {
                         mac = encryption.authTag || encryption.mac;
                         rawTri = {
                             solutionHashes: solutionHashes.map(function (hash) { return ({
-                                type: hash.algo,
+                                algo: hash.algo,
                                 hash: Buffer.from(hash.hash, hash.encoding),
                             }); }),
                             mrenclave: Buffer.from(linkage.mrenclave, linkage.encoding),

package/build/proto/Compression.d.ts

@@ -1,4 +1,4 @@
-import * as _m0 from "protobufjs/minimal";
+import _m0 from "protobufjs/minimal";
 export declare const protobufPackage = "";
 export interface Compression {
     type: Compression_TYPE;
@@ -20,7 +20,7 @@ export declare const Compression: {
     } & {
         type?: Compression_TYPE | undefined;
         data?: Uint8Array | undefined;
-    } & Record<Exclude<keyof I, keyof Compression>, never>>(object: I): Compression;
+    } & { [K in Exclude<keyof I, keyof Compression>]: never; }>(object: I): Compression;
 };
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare type DeepPartial<T> = T extends Builtin ? T : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
@@ -29,5 +29,7 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Array<inf
 declare type KeysOfUnion<T> = T extends T ? keyof T : never;
 export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
-} & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
+} & {
+    [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+};
 export {};

package/build/proto/Compression.js

@@ -1,35 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Compression = exports.compression_TYPEToJSON = exports.compression_TYPEFromJSON = exports.Compression_TYPE = exports.protobufPackage = void 0;
 /* eslint-disable */
-var long_1 = __importDefault(require("long"));
-var _m0 = __importStar(require("protobufjs/minimal"));
+var minimal_1 = __importDefault(require("protobufjs/minimal"));
 exports.protobufPackage = "";
 var Compression_TYPE;
 (function (Compression_TYPE) {
@@ -59,7 +35,7 @@ function createBaseCompression() {
 }
 exports.Compression = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
         if (message.type !== 0) {
             writer.uint32(8).int32(message.type);
         }
@@ -69,7 +45,7 @@ exports.Compression = {
         return writer;
     },
     decode: function (input, length) {
-        var reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        var reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         var end = length === undefined ? reader.len : reader.pos + length;
         var message = createBaseCompression();
         while (reader.pos < end) {
@@ -120,26 +96,30 @@ var globalThis = (function () {
         return global;
     throw "Unable to locate global object";
 })();
-var atob = globalThis.atob || (function (b64) { return globalThis.Buffer.from(b64, "base64").toString("binary"); });
 function bytesFromBase64(b64) {
-    var bin = atob(b64);
-    var arr = new Uint8Array(bin.length);
-    for (var i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
+    if (globalThis.Buffer) {
+        return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+    }
+    else {
+        var bin = globalThis.atob(b64);
+        var arr = new Uint8Array(bin.length);
+        for (var i = 0; i < bin.length; ++i) {
+            arr[i] = bin.charCodeAt(i);
+        }
+        return arr;
     }
-    return arr;
 }
-var btoa = globalThis.btoa || (function (bin) { return globalThis.Buffer.from(bin, "binary").toString("base64"); });
 function base64FromBytes(arr) {
-    var bin = [];
-    arr.forEach(function (byte) {
-        bin.push(String.fromCharCode(byte));
-    });
-    return btoa(bin.join(""));
-}
-if (_m0.util.Long !== long_1.default) {
-    _m0.util.Long = long_1.default;
-    _m0.configure();
+    if (globalThis.Buffer) {
+        return globalThis.Buffer.from(arr).toString("base64");
+    }
+    else {
+        var bin_1 = [];
+        arr.forEach(function (byte) {
+            bin_1.push(String.fromCharCode(byte));
+        });
+        return globalThis.btoa(bin_1.join(""));
+    }
 }
 function isSet(value) {
     return value !== null && value !== undefined;

package/build/proto/TRI.d.ts

@@ -1,4 +1,4 @@
-import * as _m0 from "protobufjs/minimal";
+import _m0 from "protobufjs/minimal";
 export declare const protobufPackage = "";
 export interface Encryption {
     algo: string;
@@ -10,7 +10,7 @@ export interface Encryption {
     encoding: string;
 }
 export interface Hash {
-    type: string;
+    algo: string;
     hash: Uint8Array;
 }
 export interface TRI {
@@ -40,7 +40,7 @@ export declare const Encryption: {
         iv?: Uint8Array | undefined;
         mac?: Uint8Array | undefined;
         encoding?: string | undefined;
-    } & Record<Exclude<keyof I, keyof Encryption>, never>>(object: I): Encryption;
+    } & { [K in Exclude<keyof I, keyof Encryption>]: never; }>(object: I): Encryption;
 };
 export declare const Hash: {
     encode(message: Hash, writer?: _m0.Writer): _m0.Writer;
@@ -48,12 +48,12 @@ export declare const Hash: {
     fromJSON(object: any): Hash;
     toJSON(message: Hash): unknown;
     fromPartial<I extends {
-        type?: string | undefined;
+        algo?: string | undefined;
         hash?: Uint8Array | undefined;
     } & {
-        type?: string | undefined;
+        algo?: string | undefined;
         hash?: Uint8Array | undefined;
-    } & Record<Exclude<keyof I, keyof Hash>, never>>(object: I): Hash;
+    } & { [K in Exclude<keyof I, keyof Hash>]: never; }>(object: I): Hash;
 };
 export declare const TRI: {
     encode(message: TRI, writer?: _m0.Writer): _m0.Writer;
@@ -62,7 +62,7 @@ export declare const TRI: {
     toJSON(message: TRI): unknown;
     fromPartial<I extends {
         solutionHashes?: {
-            type?: string | undefined;
+            algo?: string | undefined;
             hash?: Uint8Array | undefined;
         }[] | undefined;
         mrenclave?: Uint8Array | undefined;
@@ -78,18 +78,18 @@ export declare const TRI: {
         } | undefined;
     } & {
         solutionHashes?: ({
-            type?: string | undefined;
+            algo?: string | undefined;
             hash?: Uint8Array | undefined;
         }[] & ({
-            type?: string | undefined;
+            algo?: string | undefined;
             hash?: Uint8Array | undefined;
         } & {
-            type?: string | undefined;
+            algo?: string | undefined;
             hash?: Uint8Array | undefined;
-        } & Record<Exclude<keyof I["solutionHashes"][number], keyof Hash>, never>)[] & Record<Exclude<keyof I["solutionHashes"], keyof {
-            type?: string | undefined;
+        } & { [K in Exclude<keyof I["solutionHashes"][number], keyof Hash>]: never; })[] & { [K_1 in Exclude<keyof I["solutionHashes"], keyof {
+            algo?: string | undefined;
             hash?: Uint8Array | undefined;
-        }[]>, never>) | undefined;
+        }[]>]: never; }) | undefined;
         mrenclave?: Uint8Array | undefined;
         args?: string | undefined;
         encryption?: ({
@@ -108,8 +108,8 @@ export declare const TRI: {
             iv?: Uint8Array | undefined;
             mac?: Uint8Array | undefined;
             encoding?: string | undefined;
-        } & Record<Exclude<keyof I["encryption"], keyof Encryption>, never>) | undefined;
-    } & Record<Exclude<keyof I, keyof TRI>, never>>(object: I): TRI;
+        } & { [K_2 in Exclude<keyof I["encryption"], keyof Encryption>]: never; }) | undefined;
+    } & { [K_3 in Exclude<keyof I, keyof TRI>]: never; }>(object: I): TRI;
 };
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare type DeepPartial<T> = T extends Builtin ? T : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
@@ -118,5 +118,7 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Array<inf
 declare type KeysOfUnion<T> = T extends T ? keyof T : never;
 export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
-} & Record<Exclude<keyof I, KeysOfUnion<P>>, never>;
+} & {
+    [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+};
 export {};

package/build/proto/TRI.js

@@ -1,35 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRI = exports.Hash = exports.Encryption = exports.protobufPackage = void 0;
 /* eslint-disable */
-var long_1 = __importDefault(require("long"));
-var _m0 = __importStar(require("protobufjs/minimal"));
+var minimal_1 = __importDefault(require("protobufjs/minimal"));
 exports.protobufPackage = "";
 function createBaseEncryption() {
     return {
@@ -44,7 +20,7 @@ function createBaseEncryption() {
 }
 exports.Encryption = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
         if (message.algo !== "") {
             writer.uint32(10).string(message.algo);
         }
@@ -69,7 +45,7 @@ exports.Encryption = {
         return writer;
     },
     decode: function (input, length) {
-        var reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        var reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         var end = length === undefined ? reader.len : reader.pos + length;
         var message = createBaseEncryption();
         while (reader.pos < end) {
@@ -140,13 +116,13 @@ exports.Encryption = {
     },
 };
 function createBaseHash() {
-    return { type: "", hash: new Uint8Array() };
+    return { algo: "", hash: new Uint8Array() };
 }
 exports.Hash = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = _m0.Writer.create(); }
-        if (message.type !== "") {
-            writer.uint32(10).string(message.type);
+        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (message.algo !== "") {
+            writer.uint32(10).string(message.algo);
         }
         if (message.hash.length !== 0) {
             writer.uint32(18).bytes(message.hash);
@@ -154,14 +130,14 @@ exports.Hash = {
         return writer;
     },
     decode: function (input, length) {
-        var reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        var reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         var end = length === undefined ? reader.len : reader.pos + length;
         var message = createBaseHash();
         while (reader.pos < end) {
             var tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.type = reader.string();
+                    message.algo = reader.string();
                     break;
                 case 2:
                     message.hash = reader.bytes();
@@ -175,13 +151,13 @@ exports.Hash = {
     },
     fromJSON: function (object) {
         return {
-            type: isSet(object.type) ? String(object.type) : "",
+            algo: isSet(object.algo) ? String(object.algo) : "",
             hash: isSet(object.hash) ? bytesFromBase64(object.hash) : new Uint8Array(),
         };
     },
     toJSON: function (message) {
         var obj = {};
-        message.type !== undefined && (obj.type = message.type);
+        message.algo !== undefined && (obj.algo = message.algo);
         message.hash !== undefined &&
             (obj.hash = base64FromBytes(message.hash !== undefined ? message.hash : new Uint8Array()));
         return obj;
@@ -189,7 +165,7 @@ exports.Hash = {
     fromPartial: function (object) {
         var _a, _b;
         var message = createBaseHash();
-        message.type = (_a = object.type) !== null && _a !== void 0 ? _a : "";
+        message.algo = (_a = object.algo) !== null && _a !== void 0 ? _a : "";
         message.hash = (_b = object.hash) !== null && _b !== void 0 ? _b : new Uint8Array();
         return message;
     },
@@ -199,7 +175,7 @@ function createBaseTRI() {
 }
 exports.TRI = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = _m0.Writer.create(); }
+        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
         for (var _i = 0, _a = message.solutionHashes; _i < _a.length; _i++) {
             var v = _a[_i];
             exports.Hash.encode(v, writer.uint32(10).fork()).ldelim();
@@ -216,7 +192,7 @@ exports.TRI = {
         return writer;
     },
     decode: function (input, length) {
-        var reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        var reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         var end = length === undefined ? reader.len : reader.pos + length;
         var message = createBaseTRI();
         while (reader.pos < end) {
@@ -290,26 +266,30 @@ var globalThis = (function () {
         return global;
     throw "Unable to locate global object";
 })();
-var atob = globalThis.atob || (function (b64) { return globalThis.Buffer.from(b64, "base64").toString("binary"); });
 function bytesFromBase64(b64) {
-    var bin = atob(b64);
-    var arr = new Uint8Array(bin.length);
-    for (var i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
+    if (globalThis.Buffer) {
+        return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+    }
+    else {
+        var bin = globalThis.atob(b64);
+        var arr = new Uint8Array(bin.length);
+        for (var i = 0; i < bin.length; ++i) {
+            arr[i] = bin.charCodeAt(i);
+        }
+        return arr;
     }
-    return arr;
 }
-var btoa = globalThis.btoa || (function (bin) { return globalThis.Buffer.from(bin, "binary").toString("base64"); });
 function base64FromBytes(arr) {
-    var bin = [];
-    arr.forEach(function (byte) {
-        bin.push(String.fromCharCode(byte));
-    });
-    return btoa(bin.join(""));
-}
-if (_m0.util.Long !== long_1.default) {
-    _m0.util.Long = long_1.default;
-    _m0.configure();
+    if (globalThis.Buffer) {
+        return globalThis.Buffer.from(arr).toString("base64");
+    }
+    else {
+        var bin_1 = [];
+        arr.forEach(function (byte) {
+            bin_1.push(String.fromCharCode(byte));
+        });
+        return globalThis.btoa(bin_1.join(""));
+    }
 }
 function isSet(value) {
     return value !== null && value !== undefined;