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

package/build/utils/TxManager.js

@@ -16,7 +16,7 @@ exports.Web3TransactionRevertedByEvmError = void 0;
 const NonceTracker_1 = __importDefault(require("./NonceTracker"));
 const logger_1 = __importDefault(require("../logger"));
 const store_1 = __importDefault(require("../store"));
-const utils_1 = require("../utils");
+const helper_1 = require("./helper");
 const Superpro_1 = __importDefault(require("../staticModels/Superpro"));
 const constants_1 = require("../constants");
 const lodash_1 = __importDefault(require("lodash"));
@@ -52,21 +52,18 @@ class TxManager {
             yield this.nonceTrackers[address].initAccount();
         });
     }
-    static execute(method, args, transactionOptions, to = Superpro_1.default.address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const transaction = method(...args);
-            const txData = {
-                to,
-                data: transaction.encodeABI(),
-            };
-            return yield TxManager.publishTransaction(txData, transactionOptions, transaction);
-        });
+    static execute(transaction, transactionOptions, to = Superpro_1.default.address) {
+        const txData = {
+            to,
+            data: transaction.encodeABI(),
+        };
+        return TxManager.publishTransaction(txData, transactionOptions, transaction);
     }
     static publishTransaction(txData, transactionOptions, transactionCall) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkIfInitialized();
-            (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-            const options = yield (0, utils_1.createTransactionOptions)(Object.assign({}, transactionOptions));
+            (0, helper_1.checkIfActionAccountInitialized)(transactionOptions);
+            const options = yield (0, helper_1.createTransactionOptions)(Object.assign({}, transactionOptions));
             options.web3 = (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) || this.web3;
             if (!options.from) {
                 throw Error('From account is undefined. You should pass it to transactionOptions or init action account.');
@@ -77,20 +74,15 @@ class TxManager {
                     minTime: store_1.default.txIntervalMs,
                 });
             }
-            return this.queues[options.from].schedule(() => __awaiter(this, void 0, void 0, function* () {
-                return TxManager._publishTransaction(txData, options, transactionCall);
-            }));
+            return this.queues[options.from].schedule(() => TxManager._publishTransaction(txData, options, transactionCall));
         });
     }
-    static dryRun(method, args, transactionOptions) {
+    static dryRun(transaction, transactionOptions) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const transaction = method(...args);
             const from = (_a = transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.from) !== null && _a !== void 0 ? _a : store_1.default.actionAccount;
-            let result;
             try {
-                result = yield transaction.call({ from });
-                return result;
+                return yield transaction.call({ from });
             }
             catch (e) {
                 e.txErrorMsg =
@@ -116,8 +108,7 @@ class TxManager {
                     TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
                     estimatedGas = constants_1.defaultGasLimit;
                 }
-                txData.gas = estimatedGas;
-                txData.gas = Math.ceil(txData.gas * store_1.default.gasLimitMultiplier);
+                txData.gas = (0, helper_1.multiplyBigIntByNumber)(estimatedGas, store_1.default.gasLimitMultiplier);
                 // defaultGasLimit is max gas limit
                 txData.gas = txData.gas < constants_1.defaultGasLimit ? txData.gas : constants_1.defaultGasLimit;
                 if (transactionOptions.gas) {
@@ -129,11 +120,11 @@ class TxManager {
                     }
                     txData.gas = transactionOptions.gas;
                 }
-                txData.gasPrice = Math.ceil(txData.gasPrice * store_1.default.gasPriceMultiplier);
+                txData.gasPrice = (0, helper_1.multiplyBigIntByNumber)(txData.gasPrice, store_1.default.gasPriceMultiplier);
             }
             let nonceTracker;
             // TODO: Consider a better way to organize different strategies for publishing transactions.
-            if (!(0, utils_1.checkForUsingExternalTxManager)(transactionOptions) &&
+            if (!(0, helper_1.checkForUsingExternalTxManager)(transactionOptions) &&
                 this.nonceTrackers[transactionOptions.from]) {
                 nonceTracker = this.nonceTrackers[transactionOptions.from];
                 yield nonceTracker.onTransactionStartPublishing();
@@ -187,4 +178,4 @@ TxManager.logger = logger_1.default.child({ className: 'TxManager' });
 TxManager.nonceTrackers = {};
 TxManager.queues = {};
 exports.default = TxManager;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHhNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL1R4TWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFFQSxrRUFBMEM7QUFDMUMsdURBQW1DO0FBQ25DLHFEQUE2QjtBQUU3QixvQ0FJa0I7QUFDbEIsd0VBQWdEO0FBQ2hELDRDQUErQztBQUMvQyxvREFBNEI7QUFFNUIsNERBQW9DO0FBUXBDLE1BQU0sb0JBQXFCLFNBQVEsS0FBSztJQUVwQyxZQUFZLGFBQXNCLEVBQUUsT0FBZTtRQUMvQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO1FBQ25DLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3ZDLENBQUM7Q0FDSjtBQUVELE1BQWEsaUNBQWtDLFNBQVEsb0JBQW9CO0lBQ3ZFLFlBQVksYUFBc0IsRUFBRSxPQUFlO1FBQy9DLEtBQUssQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxtQ0FBbUMsQ0FBQztJQUNwRCxDQUFDO0NBQ0o7QUFMRCw4RUFLQztBQVVELE1BQU0sU0FBUztJQUtKLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBVTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNyQixDQUFDO0lBRU8sTUFBTSxDQUFDLGtCQUFrQjtRQUM3QixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNaLE1BQU0sS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7U0FDaEU7SUFDTCxDQUFDO0lBRU0sTUFBTSxDQUFPLFdBQVcsQ0FBQyxPQUFlOztZQUMzQyxJQUFJLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDO2dCQUFFLE9BQU87WUFDeEMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsR0FBRyxJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHhNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL1R4TWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFDQSxrRUFBMEM7QUFDMUMsdURBQW1DO0FBQ25DLHFEQUE2QjtBQUU3QixxQ0FLa0I7QUFDbEIsd0VBQWdEO0FBQ2hELDRDQUErQztBQUMvQyxvREFBNEI7QUFFNUIsNERBQW9DO0FBU3BDLE1BQU0sb0JBQXFCLFNBQVEsS0FBSztJQUVwQyxZQUFZLGFBQXNCLEVBQUUsT0FBZTtRQUMvQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO1FBQ25DLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3ZDLENBQUM7Q0FDSjtBQUVELE1BQWEsaUNBQWtDLFNBQVEsb0JBQW9CO0lBQ3ZFLFlBQVksYUFBc0IsRUFBRSxPQUFlO1FBQy9DLEtBQUssQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxtQ0FBbUMsQ0FBQztJQUNwRCxDQUFDO0NBQ0o7QUFMRCw4RUFLQztBQUVELE1BQU0sU0FBUztJQUtKLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBVTtRQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNyQixDQUFDO0lBRU8sTUFBTSxDQUFDLGtCQUFrQjtRQUM3QixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNaLE1BQU0sS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7U0FDaEU7SUFDTCxDQUFDO0lBRU0sTUFBTSxDQUFPLFdBQVcsQ0FBQyxPQUFlOztZQUMzQyxJQUFJLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDO2dCQUFFLE9BQU87WUFDeEMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsR0FBRyxJ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

package/build/{utils.d.ts → utils/helper.d.ts}

@@ -1,6 +1,7 @@
-import { TransactionOptions } from './types/Web3';
-import Web3 from 'web3';
-import { SlotInfo } from './types/SlotInfo';
+import { TransactionOptions } from '../types/Web3';
+import Web3, { DecodedParams } from 'web3';
+import { Web3BatchRequest } from 'web3-core';
+import { SlotInfo } from '../types/SlotInfo';
 /**
  * Function for checking if provider action account initialized (required for set methods)
  * Used in all set methods
@@ -13,27 +14,21 @@ export declare const checkForUsingExternalTxManager: (transactionOptions?: Trans
 /**
  * Updates gas price determined by the last few blocks median
  */
-export declare const getGasPrice: (web3: Web3) => Promise<string>;
+export declare const getGasPrice: (web3: Web3) => Promise<bigint>;
+export declare const multiplyBigIntByNumber: (big: bigint, num: number) => bigint;
 /**
  * Merge transaction options from arguments and from store
  * Used in all set methods
  */
 export declare const createTransactionOptions: (options?: TransactionOptions) => Promise<TransactionOptions>;
 export declare const isNodeJS: () => boolean;
-type FormatFunctions = {
-    $obj?: (value: unknown) => unknown;
-    $tuple?: (value: unknown) => unknown;
-};
-type FormatItem = Format | Object | ((value: unknown) => unknown) | null | FormatFunctions;
-type Format = FormatItem[] | {
-    [key: string]: FormatItem;
-};
-export declare const tupleToObject: <T>(data: unknown[], format: Format) => T;
-export declare const tupleToObjectsArray: <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 incrementMethodCall(): (_target: unknown, propertyName: string, propertyDescriptor: PropertyDescriptor) => PropertyDescriptor;
 export declare function packDevicId(hexedDeviceId: string): string;
 export declare function unpackDeviceId(bytes32: string): string;
 export declare function unpackSlotInfo(slotInfo: SlotInfo, cpuDenominator: number): SlotInfo;
 export declare function packSlotInfo(slotInfo: SlotInfo, cpuDenominator: number): SlotInfo;
-export {};
+export declare function isValidBytes32Hex(data: string): boolean;
+export declare const cleanEventData: (data: DecodedParams) => {
+    [key: string]: unknown;
+};
+export declare const executeBatchAsync: (batch: Web3BatchRequest) => Promise<unknown[]>;

package/build/utils/helper.js

@@ -0,0 +1,159 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeBatchAsync = exports.cleanEventData = exports.isValidBytes32Hex = exports.packSlotInfo = exports.unpackSlotInfo = exports.unpackDeviceId = exports.packDevicId = exports.incrementMethodCall = exports.isNodeJS = exports.createTransactionOptions = exports.multiplyBigIntByNumber = exports.getGasPrice = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
+const store_1 = __importDefault(require("../store"));
+const Monitoring_1 = require("./Monitoring");
+/**
+ * Function for checking if provider action account initialized (required for set methods)
+ * Used in all set methods
+ */
+const checkIfActionAccountInitialized = (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().initializeActionAccount(SECRET_KEY)' first");
+};
+exports.checkIfActionAccountInitialized = checkIfActionAccountInitialized;
+/**
+ * Function for checking if current configuration supposed to use external transaction manager like MetaMask and etc.
+ */
+const checkForUsingExternalTxManager = (transactionOptions) => {
+    // TODO: Agree on more proper way of signaling, that we use an external transaction manager, than just passing a web3 instance.
+    return !!(transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3);
+};
+exports.checkForUsingExternalTxManager = checkForUsingExternalTxManager;
+/**
+ * Updates gas price determined by the last few blocks median
+ */
+const getGasPrice = (web3) => {
+    return web3.eth.getGasPrice();
+};
+exports.getGasPrice = getGasPrice;
+const multiplyBigIntByNumber = (big, num) => {
+    const factor = BigInt(Math.pow(10, (num.toString().split('.')[1] || '').length));
+    const result = big * BigInt(Math.round(num * Number(factor)));
+    return result / factor;
+};
+exports.multiplyBigIntByNumber = multiplyBigIntByNumber;
+/**
+ * Merge transaction options from arguments and from store
+ * Used in all set methods
+ */
+const createTransactionOptions = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!options)
+        options = {};
+    if (!options.from)
+        options.from = store_1.default.actionAccount;
+    if (!options.gas)
+        options.gas = store_1.default.gasLimit;
+    if (!options.gasPriceMultiplier)
+        options.gasPriceMultiplier = store_1.default.gasPriceMultiplier;
+    if (!options.gasPrice) {
+        const web3 = options.web3 || store_1.default.web3Https;
+        if (web3) {
+            try {
+                options.gasPrice = yield (0, exports.getGasPrice)(web3);
+            }
+            catch (e) {
+                options.gasPrice = store_1.default.gasPrice;
+            }
+        }
+        else {
+            throw Error('web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.');
+        }
+    }
+    delete options.web3;
+    return options;
+});
+exports.createTransactionOptions = createTransactionOptions;
+const isNodeJS = () => {
+    return typeof window === 'undefined';
+};
+exports.isNodeJS = isNodeJS;
+function incrementMethodCall() {
+    return function (_target, propertyName, propertyDescriptor) {
+        const monitoring = Monitoring_1.Monitoring.getInstance();
+        const method = propertyDescriptor.value;
+        propertyDescriptor.value = function (...args) {
+            monitoring.incrementCall(propertyName);
+            return method.apply(this, args);
+        };
+        return propertyDescriptor;
+    };
+}
+exports.incrementMethodCall = incrementMethodCall;
+function packDevicId(hexedDeviceId) {
+    const hexRegex = /^[0-9a-fA-F]+$/;
+    if (hexedDeviceId.length !== 64) {
+        throw new Error('DeviceId must be equal 64 hex symbols');
+    }
+    if (!hexRegex.test(hexedDeviceId)) {
+        throw new Error('DeviceId must be a hexedecimal');
+    }
+    return '0x' + hexedDeviceId;
+}
+exports.packDevicId = packDevicId;
+function unpackDeviceId(bytes32) {
+    if (bytes32.length !== 66) {
+        throw new Error('DeviceId bytes must be equal 66 symbols');
+    }
+    // removes '0x'
+    return bytes32.slice(2, 66);
+}
+exports.unpackDeviceId = unpackDeviceId;
+function unpackSlotInfo(slotInfo, cpuDenominator) {
+    return {
+        cpuCores: slotInfo.cpuCores / cpuDenominator,
+        ram: slotInfo.ram,
+        diskUsage: slotInfo.diskUsage,
+    };
+}
+exports.unpackSlotInfo = unpackSlotInfo;
+function packSlotInfo(slotInfo, cpuDenominator) {
+    return {
+        cpuCores: slotInfo.cpuCores * cpuDenominator,
+        ram: slotInfo.ram,
+        diskUsage: slotInfo.diskUsage,
+    };
+}
+exports.packSlotInfo = packSlotInfo;
+function isValidBytes32Hex(data) {
+    const regex = /^0x[a-fA-F0-9]{64}$/;
+    return regex.test(data);
+}
+exports.isValidBytes32Hex = isValidBytes32Hex;
+const cleanEventData = (data) => {
+    var _a;
+    const result = Object.assign({}, data);
+    delete result.__length__;
+    for (let i = 0; i < ((_a = data.__length__) !== null && _a !== void 0 ? _a : 0); i++) {
+        delete result[i.toString()];
+    }
+    return result;
+};
+exports.cleanEventData = cleanEventData;
+const executeBatchAsync = (batch) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = [];
+    const responses = yield batch.execute();
+    for (const response of responses) {
+        if ('error' in response) {
+            throw new Error(response.error.message);
+        }
+        else {
+            result.push(response.result);
+        }
+    }
+    return result;
+});
+exports.executeBatchAsync = executeBatchAsync;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxREFBNkI7QUFJN0IsNkNBQTBDO0FBRzFDOzs7R0FHRztBQUNJLE1BQU0sK0JBQStCLEdBQUcsQ0FBQyxrQkFBdUMsRUFBUSxFQUFFO0lBQzdGLElBQUksQ0FBQyxlQUFLLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQSxrQkFBa0IsYUFBbEIsa0JBQWtCLHVCQUFsQixrQkFBa0IsQ0FBRSxJQUFJLENBQUE7UUFDakQsTUFBTSxJQUFJLEtBQUssQ0FDWCx3SUFBd0ksQ0FDM0ksQ0FBQztBQUNWLENBQUMsQ0FBQztBQUxXLFFBQUEsK0JBQStCLG1DQUsxQztBQUVGOztHQUVHO0FBQ0ksTUFBTSw4QkFBOEIsR0FBRyxDQUMxQyxrQkFBdUMsRUFDaEMsRUFBRTtJQUNULCtIQUErSDtJQUMvSCxPQUFPLENBQUMsQ0FBQyxDQUFBLGtCQUFrQixhQUFsQixrQkFBa0IsdUJBQWxCLGtCQUFrQixDQUFFLElBQUksQ0FBQSxDQUFDO0FBQ3RDLENBQUMsQ0FBQztBQUxXLFFBQUEsOEJBQThCLGtDQUt6QztBQUVGOztHQUVHO0FBQ0ksTUFBTSxXQUFXLEdBQUcsQ0FBQyxJQUFVLEVBQW1CLEVBQUU7SUFDdkQsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO0FBQ2xDLENBQUMsQ0FBQztBQUZXLFFBQUEsV0FBVyxlQUV0QjtBQUVLLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxHQUFXLEVBQUUsR0FBVyxFQUFVLEVBQUU7SUFDdkUsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENB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

package/build/utils/helpers/tryWithInterval.js

@@ -13,15 +13,11 @@ exports.tryWithInterval = void 0;
 const tryWithInterval = (params) => __awaiter(void 0, void 0, void 0, function* () {
     let checkedTimes = 0;
     const { handler, checkResult, checkError, startDelay = 0, retryInterval, retryMax } = params;
+    const reachedMaxRetries = () => checkedTimes >= retryMax;
     return yield new Promise((resolve, reject) => {
-        const checkTimes = () => {
+        const scheduleNewIteration = (delay) => {
             checkedTimes += 1;
-            if (checkedTimes >= retryMax) {
-                reject(new Error(`checkWithInterval: MaxCheck count reached!}`));
-            }
-            else {
-                setTimeout(timeoutFn, retryInterval);
-            }
+            setTimeout(timeoutFn, delay);
         };
         const timeoutFn = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -31,19 +27,22 @@ const tryWithInterval = (params) => __awaiter(void 0, void 0, void 0, function*
                     resolve(result);
                     return;
                 }
-                checkTimes();
+                if (reachedMaxRetries()) {
+                    reject(new Error(`${exports.tryWithInterval.name}: MaxCheck count reached!`));
+                    return;
+                }
             }
             catch (err) {
                 const isErrorRetryable = checkError ? checkError(err).retryable : true;
-                if (!isErrorRetryable) {
+                if (!isErrorRetryable || reachedMaxRetries()) {
                     reject(err);
                     return;
                 }
-                checkTimes();
             }
+            scheduleNewIteration(retryInterval);
         });
-        setTimeout(timeoutFn, startDelay);
+        scheduleNewIteration(startDelay);
     });
 });
 exports.tryWithInterval = tryWithInterval;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ5V2l0aEludGVydmFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvdHJ5V2l0aEludGVydmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQVNPLE1BQU0sZUFBZSxHQUFHLENBQVUsTUFBZ0MsRUFBYyxFQUFFO0lBQ3JGLElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQztJQUNyQixNQUFNLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsVUFBVSxHQUFHLENBQUMsRUFBRSxhQUFhLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBRTdGLE9BQU8sTUFBTSxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUN6QyxNQUFNLFVBQVUsR0FBRyxHQUFTLEVBQUU7WUFDMUIsWUFBWSxJQUFJLENBQUMsQ0FBQztZQUNsQixJQUFJLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQzFCLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDLENBQUM7YUFDcEU7aUJBQU07Z0JBQ0gsVUFBVSxDQUFDLFNBQVMsRUFBRSxhQUFhLENBQUMsQ0FBQzthQUN4QztRQUNMLENBQUMsQ0FBQztRQUVGLE1BQU0sU0FBUyxHQUFHLEdBQXdCLEVBQUU7WUFDeEMsSUFBSTtnQkFDQSxNQUFNLE1BQU0sR0FBRyxNQUFNLE9BQU8sRUFBRSxDQUFDO2dCQUMvQixNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDdkUsSUFBSSxVQUFVLEVBQUU7b0JBQ1osT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUVoQixPQUFPO2lCQUNWO2dCQUNELFVBQVUsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxHQUFHLEVBQUU7Z0JBQ1YsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDdkUsSUFBSSxDQUFDLGdCQUFnQixFQUFFO29CQUNuQixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBRVosT0FBTztpQkFDVjtnQkFDRCxVQUFVLEVBQUUsQ0FBQzthQUNoQjtRQUNMLENBQUMsQ0FBQSxDQUFDO1FBRUYsVUFBVSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUN0QyxDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQSxDQUFDO0FBckNXLFFBQUEsZUFBZSxtQkFxQzFCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ5V2l0aEludGVydmFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2hlbHBlcnMvdHJ5V2l0aEludGVydmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQVNPLE1BQU0sZUFBZSxHQUFHLENBQVUsTUFBZ0MsRUFBYyxFQUFFO0lBQ3JGLElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQztJQUNyQixNQUFNLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsVUFBVSxHQUFHLENBQUMsRUFBRSxhQUFhLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBRTdGLE1BQU0saUJBQWlCLEdBQUcsR0FBWSxFQUFFLENBQUMsWUFBWSxJQUFJLFFBQVEsQ0FBQztJQUVsRSxPQUFPLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDekMsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEtBQWEsRUFBUSxFQUFFO1lBQ2pELFlBQVksSUFBSSxDQUFDLENBQUM7WUFDbEIsVUFBVSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNqQyxDQUFDLENBQUM7UUFFRixNQUFNLFNBQVMsR0FBRyxHQUF3QixFQUFFO1lBQ3hDLElBQUk7Z0JBQ0EsTUFBTSxNQUFNLEdBQUcsTUFBTSxPQUFPLEVBQUUsQ0FBQztnQkFDL0IsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ3ZFLElBQUksVUFBVSxFQUFFO29CQUNaLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFFaEIsT0FBTztpQkFDVjtnQkFDRCxJQUFJLGlCQUFpQixFQUFFLEVBQUU7b0JBQ3JCLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxHQUFHLHVCQUFlLENBQUMsSUFBSSwyQkFBMkIsQ0FBQyxDQUFDLENBQUM7b0JBRXRFLE9BQU87aUJBQ1Y7YUFDSjtZQUFDLE9BQU8sR0FBRyxFQUFFO2dCQUNWLE1BQU0sZ0JBQWdCLEdBQUcsVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ3ZFLElBQUksQ0FBQyxnQkFBZ0IsSUFBSSxpQkFBaUIsRUFBRSxFQUFFO29CQUMxQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBRVosT0FBTztpQkFDVjthQUNKO1lBRUQsb0JBQW9CLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEMsQ0FBQyxDQUFBLENBQUM7UUFFRixvQkFBb0IsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNyQyxDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQSxDQUFDO0FBeENXLFFBQUEsZUFBZSxtQkF3QzFCIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.16.0-beta.2",
+  "version": "1.0.0-beta.0",
   "main": "build/index.js",
   "license": "MIT",
   "files": [
@@ -35,7 +35,7 @@
     "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.176",
     "@types/lru-cache": "^7.10.10",
-    "@types/node": "^17.0.0",
+    "@types/node": "^20.7.0",
     "@types/node-forge": "^1.3.1",
     "@types/node-gzip": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
@@ -52,8 +52,8 @@
     "ts-jest": "^27.0.7",
     "ts-proto": "^1.110.4",
     "ts-protoc-gen": "^0.15.0",
-    "typedoc": "^0.22.11",
-    "typedoc-plugin-markdown": "^3.11.12",
+    "typedoc": "^0.24.0",
+    "typedoc-plugin-markdown": "^3.16.0",
     "typescript": "^4.4.4"
   },
   "dependencies": {
@@ -73,8 +73,11 @@
     "p-queue": "6.6.2",
     "pino": "^7.2.0",
     "protobufjs": "^6.11.2",
-    "web3": "^1.7.1",
-    "web3-parse-receipt-events": "^1.0.2"
+    "web3": "^4.1.2",
+    "web3-core-requestmanager": "^1.10.0",
+    "web3-eth-contract": "^4.0.4",
+    "web3-parse-receipt-events": "^1.0.2",
+    "web3-types": "^1.1.0"
   },
   "repository": "git://github.com/Super-Protocol/sdk-js.git",
   "resolutions": {

package/readme.md

@@ -3,7 +3,7 @@
 ## Installation
 
 ```
-yarn add @super-protocol/sdk-js
+npm install @super-protocol/sdk-js
 ```
 
 ## Prepare protobuf
@@ -12,25 +12,24 @@ yarn add @super-protocol/sdk-js
 
 2. Install protobuf (http://google.github.io/proto-lens/installing-protoc.html)
 
-3. yarn dto::update
+3. npm run dto::update
 
 ## Local Dev Setup
-1. npm install uplink-nodejs
+1. npm install
 
-2. Just run ```yarn```
+2. Just run ```npm run build```
 
 ## Scripts
 
-`yarn prettier` - run auto code style fixing
+`npm run prettier` - run auto code style fixing
 
-`yarn build` - create production build (in build folder)
+`npm run build` - create production build (in build folder)
 
-`yarn dto:update` - generate TypeScript classes based on DTO submodule
+`npm run dto:update` - generate TypeScript classes based on DTO submodule
 
 ## Dependencies
 - NodeJS v16.8.0
 - NPM v7.21.0
-- yarn v1.22.11
 
 ## Apple M1 instructions
 Some dependencies is not supported arm64 architecture. You can face with error like `dyld[12398]: missing symbol called`. To install everything correctly, do next: