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

package/build/TIIGenerator.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { Encryption, Hash, Resource, TeeRunInfo } from '@super-protocol/dto-js';
 declare class TIIGenerator {
-    static generateByOffer(offerId: bigint, solutionHashes: Hash[], linkageString: string | undefined, resource: Resource, args: any, encryption: Encryption): Promise<string>;
-    static generate(orderId: bigint, resource: Resource, args: any, encryption: Encryption): Promise<string>;
-    static getSolutionHashesAndLinkage(inputOffers: bigint[]): Promise<{
+    static generateByOffer(offerId: string, solutionHashes: Hash[], linkageString: string | undefined, resource: Resource, args: any, encryption: Encryption): Promise<string>;
+    static generate(orderId: string, resource: Resource, args: any, encryption: Encryption): Promise<string>;
+    static getSolutionHashesAndLinkage(inputOffers: string[]): Promise<{
         hashes: Hash[];
         linkage?: string;
     }>;

package/build/connectors/BaseConnector.d.ts

@@ -1,10 +1,10 @@
-import abi from '../contracts/abi';
-import { Contract } from 'web3';
+import { HttpProviderBase, WebsocketProviderBase } from 'web3-core-helpers';
+import { Contract } from 'web3-eth-contract';
 export type Config = {
     contractAddress: string;
     blockchainUrl?: string;
-    gasPrice?: bigint;
-    gasLimit?: bigint;
+    gasPrice?: string;
+    gasLimit?: number;
     gasLimitMultiplier?: number;
     gasPriceMultiplier?: number;
     txConcurrency?: number;
@@ -22,19 +22,20 @@ export declare class BaseConnector {
         level: string;
         enabled: boolean;
     } & import("pino").default.ChildLoggerOptions>;
-    protected contract?: Contract<typeof abi>;
+    protected contract?: Contract;
+    protected provider?: WebsocketProviderBase | HttpProviderBase;
     isInitialized(): boolean;
     checkIfInitialized(): void;
     /**
      *
      * @returns initialized contract
      */
-    getContract(): Contract<typeof abi>;
+    getContract(): Contract;
     /**
      * Function for connecting to blockchain
      * Used to setting up settings for blockchain connector
      * Needs to run this function before using blockchain connector
      */
-    initialize(_config: Config): Promise<void>;
+    initialize(config: Config): Promise<void>;
     shutdown(): void;
 }

package/build/connectors/BaseConnector.js

@@ -39,15 +39,17 @@ class BaseConnector {
      * Used to setting up settings for blockchain connector
      * Needs to run this function before using blockchain connector
      */
-    initialize(_config) {
+    initialize(config) {
         return __awaiter(this, void 0, void 0, function* () { });
     }
     shutdown() {
+        var _a;
         if (this.initialized) {
+            (_a = this.provider) === null || _a === void 0 ? void 0 : _a.disconnect(0, '');
             this.initialized = false;
             this.logger.trace(`${this.constructor['name']} was shutdown`);
         }
     }
 }
 exports.BaseConnector = BaseConnector;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25uZWN0b3JzL0Jhc2VDb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsdURBQW1DO0FBcUJuQyxNQUFhLGFBQWE7SUFBMUI7UUFDYyxnQkFBVyxHQUFHLEtBQUssQ0FBQztRQUNwQixXQUFNLEdBQUcsZ0JBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7SUFxQ2pGLENBQUM7SUFsQ1UsYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDNUIsQ0FBQztJQUVNLGtCQUFrQjtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FDWCxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLHNDQUFzQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyw0QkFBNEIsQ0FDeEgsQ0FBQztJQUNWLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXO1FBQ2QsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFMUIsT0FBTyxJQUFJLENBQUMsUUFBUyxDQUFDO0lBQzFCLENBQUM7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQWU7OERBQWtCLENBQUM7S0FBQTtJQUVuRCxRQUFRO1FBQ1gsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2xCLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO1lBQ3pCLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsZUFBZSxDQUFDLENBQUM7U0FDakU7SUFDTCxDQUFDO0NBQ0o7QUF2Q0Qsc0NBdUNDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25uZWN0b3JzL0Jhc2VDb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQW1DO0FBcUJuQyxNQUFhLGFBQWE7SUFBMUI7UUFDYyxnQkFBVyxHQUFHLEtBQUssQ0FBQztRQUNwQixXQUFNLEdBQUcsZ0JBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7SUF1Q2pGLENBQUM7SUFuQ1UsYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDNUIsQ0FBQztJQUVNLGtCQUFrQjtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDakIsTUFBTSxJQUFJLEtBQUssQ0FDWCxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLHNDQUFzQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyw0QkFBNEIsQ0FDeEgsQ0FBQztJQUNWLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXO1FBQ2QsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFMUIsT0FBTyxJQUFJLENBQUMsUUFBUyxDQUFDO0lBQzFCLENBQUM7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE1BQWM7OERBQWtCLENBQUM7S0FBQTtJQUVsRCxRQUFROztRQUNYLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRTtZQUNsQixNQUFBLElBQUksQ0FBQyxRQUFRLDBDQUFFLFVBQVUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDakMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUM7WUFDekIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQztTQUNqRTtJQUNMLENBQUM7Q0FDSjtBQXpDRCxzQ0F5Q0MifQ==

package/build/connectors/BlockchainConnector.d.ts

@@ -1,12 +1,13 @@
 import { BaseConnector, Config } from './BaseConnector';
-import { TransactionReceipt } from 'web3';
 import { TransactionOptions, EventData, BlockInfo } from '../types/Web3';
 import BlockchainTransaction from '../types/blockchainConnector/StorageAccess';
+import { TransactionReceipt } from 'web3-core';
 declare class BlockchainConnector extends BaseConnector {
     private defaultActionAccount?;
     private static instance;
     private constructor();
     static getInstance(): BlockchainConnector;
+    getContract(transactionOptions?: TransactionOptions): import("web3-eth-contract").Contract;
     /**
      * Function for connecting to blockchain
      * Used to setting up settings for blockchain connector
@@ -21,8 +22,8 @@ declare class BlockchainConnector extends BaseConnector {
     /**
      * Returns balance of blockchain platform tokens in wei
      */
-    getBalance(address: string): Promise<bigint>;
-    getTimestamp(): Promise<bigint>;
+    getBalance(address: string): Promise<string>;
+    getTimestamp(): Promise<number | string>;
     /**
      * Returns transactions events info
      * @param txHash - transaction hash
@@ -44,17 +45,18 @@ declare class BlockchainConnector extends BaseConnector {
     /**
      * Returns balance of blockchain platform tokens in wei
      */
-    transfer(to: string, amount: bigint, transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
+    transfer(to: string, amount: string, transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
     /**
      * Returns transactions count
      * @param address - wallet address
      * @returns {Promise<number>} - Transactions count
      */
-    getTransactionCount(address: string, status?: string): Promise<bigint>;
+    getTransactionCount(address: string, status?: string): Promise<number>;
     getAddressByKey(pk: string): string;
+    private executeBatchAsync;
     /**
      * Fetch transactions for specific addresses starting with specific block until last block
-     * @param addresses - array of addresses IN LOWER CASE to fetch transactions (from these addresses and to these addresses)
+     * @param addresses - array of addresses to fetch transactions (from these addresses and to these addresses)
      * @param startBlock - number of block to start fetching transactions (if empty fetch only for last block)
      * @param lastBlock - number of block to last fetching transactions (if empty fetch only for last block)
      * @param batchSize - block size for asynchronous transaction loading

package/build/connectors/BlockchainConnector.js

@@ -1,33 +1,10 @@
 "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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -45,13 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseConnector_1 = require("./BaseConnector");
-const web3_1 = __importStar(require("web3"));
-const web3_eth_abi_1 = require("web3-eth-abi");
+const web3_1 = __importDefault(require("web3"));
+const web3_core_helpers_1 = require("web3-core-helpers");
 const constants_1 = require("../constants");
-const helper_1 = require("../utils/helper");
+const utils_1 = require("../utils");
 const TxManager_1 = __importDefault(require("../utils/TxManager"));
-const abi_1 = require("../contracts/abi");
+const app_json_1 = __importDefault(require("../contracts/app.json"));
 const ethers_1 = require("ethers");
+const Jsonrpc = require('web3-core-requestmanager/src/jsonrpc');
 // TODO: remove this dependencies
 const store_1 = __importDefault(require("../store"));
 const Superpro_1 = __importDefault(require("../staticModels/Superpro"));
@@ -67,6 +45,14 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
         }
         return BlockchainConnector.instance;
     }
+    // TODO: remove this
+    getContract(transactionOptions) {
+        this.checkIfInitialized();
+        if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
+            return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
+        }
+        return super.getContract();
+    }
     /**
      * Function for connecting to blockchain
      * Used to setting up settings for blockchain connector
@@ -77,11 +63,8 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.trace(config, 'Initializing');
             const url = (config === null || config === void 0 ? void 0 : config.blockchainUrl) || constants_1.defaultBlockchainUrl;
-            store_1.default.web3Https = new web3_1.default(url);
-            const web3Context = new web3_1.Web3Context({
-                provider: store_1.default.web3Https.currentProvider,
-                config: { contractDataInputFill: 'data' },
-            });
+            this.provider = new web3_1.default.providers.HttpProvider(url);
+            store_1.default.web3Https = new web3_1.default(this.provider);
             store_1.default.gasPrice = (_a = config === null || config === void 0 ? void 0 : config.gasPrice) !== null && _a !== void 0 ? _a : constants_1.defaultGasPrice;
             if (config === null || config === void 0 ? void 0 : config.gasLimit)
                 store_1.default.gasLimit = config.gasLimit;
@@ -94,7 +77,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
             if (config === null || config === void 0 ? void 0 : config.txIntervalMs)
                 store_1.default.txIntervalMs = config.txIntervalMs;
             Superpro_1.default.address = config.contractAddress;
-            this.contract = new web3_1.Contract(abi_1.abi, Superpro_1.default.address, web3Context);
+            this.contract = new store_1.default.web3Https.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
             TxManager_1.default.init(store_1.default.web3Https);
             SuperproToken_1.default.addressHttps = yield Superpro_1.default.getTokenAddress(this.contract);
             Monitoring_1.Monitoring.getInstance().initializeLogging();
@@ -109,8 +92,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
     initializeActionAccount(actionAccountKey, manageNonce = true) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkIfInitialized();
-            store_1.default.web3Https.eth.accounts.wallet.add(actionAccountKey);
-            const actionAccount = store_1.default.web3Https.eth.accounts.privateKeyToAccount(actionAccountKey).address;
+            const actionAccount = store_1.default.web3Https.eth.accounts.wallet.add(actionAccountKey).address;
             if (!store_1.default.actionAccount)
                 store_1.default.actionAccount = actionAccount;
             if (!store_1.default.keys[actionAccount])
@@ -127,8 +109,10 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
      * Returns balance of blockchain platform tokens in wei
      */
     getBalance(address) {
-        this.checkIfInitialized();
-        return store_1.default.web3Https.eth.getBalance(address);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkIfInitialized();
+            return store_1.default.web3Https.eth.getBalance(address);
+        });
     }
     getTimestamp() {
         var _a;
@@ -146,24 +130,28 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
     getTransactionEvents(txHash) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkIfInitialized();
+            const parseReceiptEvents = require('web3-parse-receipt-events');
             const receipt = yield store_1.default.web3Https.eth.getTransactionReceipt(txHash);
+            const tokenEvents = parseReceiptEvents(app_json_1.default.abi, SuperproToken_1.default.addressHttps, receipt);
+            parseReceiptEvents(app_json_1.default.abi, Superpro_1.default.address, receipt); // don't remove
+            const events = Object.values(tokenEvents.events || {});
             const eventData = [];
-            const eventsDescriptor = abi_1.abi
-                .filter((desc) => desc.type === 'event')
-                .map((desc) => (Object.assign(Object.assign({}, desc), { signature: (0, web3_eth_abi_1.encodeEventSignature)(desc) })));
-            for (const log of receipt.logs) {
-                if (!log.address || log.address === constants_1.POLYGON_MATIC_EVENT_PATH) {
+            for (const event of events) {
+                if (event.address === constants_1.POLYGON_MATIC_EVENT_PATH || !event.event) {
                     continue;
                 }
-                const descriptor = eventsDescriptor.find((desc) => { var _a; return desc.signature === ((_a = log.topics) === null || _a === void 0 ? void 0 : _a[0]); });
-                if (descriptor) {
-                    const decodedParams = (0, web3_eth_abi_1.decodeLog)(descriptor.inputs, log.data, log.topics.slice(1));
-                    eventData.push({
-                        contract: log.address,
-                        name: descriptor.name || 'UknownEvenet',
-                        data: (0, helper_1.cleanEventData)(decodedParams),
-                    });
+                const data = event.returnValues;
+                const dataValues = Object.values(data);
+                if (dataValues.length !== 0) {
+                    for (let i = 0; i < dataValues.length / 2; i++) {
+                        delete data[i];
+                    }
                 }
+                eventData.push({
+                    contract: event.address,
+                    name: event.event,
+                    data,
+                });
             }
             return eventData;
         });
@@ -190,20 +178,24 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
      * @returns {Promise<TransactionReceipt>} - Transaction reciept
      */
     getTransactionReceipt(txHash) {
-        this.checkIfInitialized();
-        return store_1.default.web3Https.eth.getTransactionReceipt(txHash);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkIfInitialized();
+            return store_1.default.web3Https.eth.getTransactionReceipt(txHash);
+        });
     }
     /**
      * Returns balance of blockchain platform tokens in wei
      */
     transfer(to, amount, transactionOptions) {
-        this.checkIfInitialized();
-        (0, helper_1.checkIfActionAccountInitialized)(transactionOptions);
-        const transaction = {
-            to,
-            value: amount,
-        };
-        return TxManager_1.default.publishTransaction(transaction, transactionOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkIfInitialized();
+            (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+            const transaction = {
+                to,
+                value: amount,
+            };
+            return TxManager_1.default.publishTransaction(transaction, transactionOptions);
+        });
     }
     /**
      * Returns transactions count
@@ -211,20 +203,50 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
      * @returns {Promise<number>} - Transactions count
      */
     getTransactionCount(address, status) {
-        this.checkIfInitialized();
-        if (status) {
-            return store_1.default.web3Https.eth.getTransactionCount(address, status);
-        }
-        else {
-            return store_1.default.web3Https.eth.getTransactionCount(address);
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkIfInitialized();
+            if (status) {
+                return store_1.default.web3Https.eth.getTransactionCount(address, status);
+            }
+            else {
+                return store_1.default.web3Https.eth.getTransactionCount(address);
+            }
+        });
     }
     getAddressByKey(pk) {
         return new ethers_1.Wallet(pk).address;
     }
+    executeBatchAsync(batch) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const requests = batch.requests;
+                batch.requestManager.sendBatch(requests, (error, results) => {
+                    if (error)
+                        return reject(error);
+                    results = results || [];
+                    const response = requests
+                        .map((request, index) => {
+                        return results[index] || {};
+                    })
+                        .map((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 IN LOWER CASE to fetch transactions (from these addresses and to these addresses)
+     * @param addresses - array of addresses to fetch transactions (from these addresses and to these addresses)
      * @param startBlock - number of block to start fetching transactions (if empty fetch only for last block)
      * @param lastBlock - number of block to last fetching transactions (if empty fetch only for last block)
      * @param batchSize - block size for asynchronous transaction loading
@@ -236,7 +258,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
     getTransactions(addresses, startBlock, lastBlock, batchSize = constants_1.BLOCK_SIZE_TO_FETCH_TRANSACTION) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkIfInitialized();
-            const blockchainLastBlock = Number(yield store_1.default.web3Https.eth.getBlockNumber());
+            const blockchainLastBlock = yield store_1.default.web3Https.eth.getBlockNumber();
             if (lastBlock) {
                 lastBlock = Math.min(lastBlock, blockchainLastBlock);
             }
@@ -247,15 +269,7 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
                 startBlock = Math.max(lastBlock - 1000, 0);
             }
             const transactionsByAddress = {};
-            const validAddresses = addresses
-                .filter((address) => { var _a; return (_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.utils.isAddress(address); })
-                .map((address) => {
-                const lowerCaseAddress = address.toLowerCase();
-                if (address !== lowerCaseAddress) {
-                    this.logger.warn({ address }, `Must use adresses in lower case fomat! ${address} -> ${lowerCaseAddress}`);
-                }
-                return lowerCaseAddress;
-            });
+            const validAddresses = addresses.filter((address) => { var _a; return (_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.utils.isAddress(address); });
             if (!validAddresses.length) {
                 return {
                     transactionsByAddress,
@@ -264,33 +278,24 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
             }
             validAddresses.forEach((address) => (transactionsByAddress[address] = []));
             while (startBlock <= lastBlock) {
-                const batch = new store_1.default.web3Https.BatchRequest();
+                const batch = new store_1.default.web3Https.eth.BatchRequest();
+                const getBlock = store_1.default.web3Https.eth.getBlock;
                 const batchLastBlock = Math.min(startBlock + batchSize - 1, lastBlock);
                 for (let blockNumber = startBlock; blockNumber <= batchLastBlock; blockNumber++) {
-                    const hexedBlockNumber = '0x' + blockNumber.toString(16);
-                    batch
-                        .add({
-                        jsonrpc: '2.0',
-                        method: 'eth_getBlockByNumber',
-                        params: [hexedBlockNumber, true],
-                    })
-                        .catch((err) => this.logger.error(err));
+                    batch.add(getBlock.request(blockNumber, true));
                 }
-                const blocks = yield (0, helper_1.executeBatchAsync)(batch);
+                const blocks = (yield this.executeBatchAsync(batch));
                 blocks.forEach((block) => {
                     if (!(block === null || block === void 0 ? void 0 : block.transactions))
                         return;
                     block.transactions.forEach((transaction) => {
-                        if (typeof transaction === 'string') {
-                            return;
-                        }
                         let address = null;
                         if (validAddresses.includes(transaction.from))
                             address = transaction.from;
                         else if (transaction.to && validAddresses.includes(transaction.to))
                             address = transaction.to;
                         if (address) {
-                            transactionsByAddress[address].push(Object.assign(Object.assign({}, transaction), { timestamp: Number(block.timestamp) * 1000, input: transaction.input }));
+                            transactionsByAddress[address].push(Object.assign(Object.assign({}, transaction), { timestamp: +block.timestamp * 1000, input: transaction.input }));
                         }
                     });
                 });
@@ -309,28 +314,28 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
     }
 }
 __decorate([
-    (0, helper_1.incrementMethodCall)(),
+    (0, utils_1.incrementMethodCall)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], BlockchainConnector.prototype, "getBalance", null);
 __decorate([
-    (0, helper_1.incrementMethodCall)(),
+    (0, utils_1.incrementMethodCall)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], BlockchainConnector.prototype, "getTransactionEvents", null);
 __decorate([
-    (0, helper_1.incrementMethodCall)(),
+    (0, utils_1.incrementMethodCall)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, typeof BigInt === "function" ? BigInt : Object, Object]),
+    __metadata("design:paramtypes", [String, String, Object]),
     __metadata("design:returntype", Promise)
 ], BlockchainConnector.prototype, "transfer", null);
 __decorate([
-    (0, helper_1.incrementMethodCall)(),
+    (0, utils_1.incrementMethodCall)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array, Number, Number, Number]),
     __metadata("design:returntype", Promise)
 ], BlockchainConnector.prototype, "getTransactions", null);
 exports.default = BlockchainConnector;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainConnector.js","sourceRoot":"","sources":["../../src/connectors/BlockchainConnector.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainConnector.js","sourceRoot":"","sources":["../../src/connectors/BlockchainConnector.ts"],"names":[],"mappings":"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"}

package/build/connectors/BlockchainEventsListener.d.ts

@@ -1,10 +1,10 @@
 import { BaseConnector, Config } from './BaseConnector';
-import { WebSocketProvider } from 'web3';
+import { WebsocketProviderBase } from 'web3-core-helpers';
 declare class BlockchainEventsListener extends BaseConnector {
     private static instance;
     private constructor();
     static getInstance(): BlockchainEventsListener;
-    getProvider(): WebSocketProvider | undefined;
+    getProvider(): WebsocketProviderBase | undefined;
     /**
      * Function for connecting to blockchain using web socket
      * Needs to run this function before using events

package/build/connectors/BlockchainEventsListener.js

@@ -1,27 +1,4 @@
 "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 __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) {
@@ -36,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseConnector_1 = require("./BaseConnector");
-const web3_1 = __importStar(require("web3"));
-const abi_1 = require("../contracts/abi");
+const web3_1 = __importDefault(require("web3"));
+const app_json_1 = __importDefault(require("../contracts/app.json"));
 // TODO: remove this dependencies
 const store_1 = __importDefault(require("../store"));
 const Superpro_1 = __importDefault(require("../staticModels/Superpro"));
@@ -53,8 +30,7 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
         return BlockchainEventsListener.instance;
     }
     getProvider() {
-        var _a;
-        return (_a = store_1.default.web3Wss) === null || _a === void 0 ? void 0 : _a.provider;
+        return this.provider;
     }
     /**
      * Function for connecting to blockchain using web socket
@@ -63,19 +39,20 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
     initialize(config) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.trace(config, 'Initializing');
+            if (this.provider) {
+                this.provider.reset();
+            }
             const reconnectOptions = Object.assign({
                 auto: true,
                 delay: 5000,
                 maxAttempts: 5,
                 onTimeout: false,
             }, config.reconnect);
-            const provider = new web3_1.WebSocketProvider(config.blockchainUrl, {}, reconnectOptions);
-            store_1.default.web3Wss = new web3_1.default(provider);
-            const web3Context = new web3_1.Web3Context({
-                provider: store_1.default.web3Wss.currentProvider,
-                config: { contractDataInputFill: 'data' },
+            this.provider = new web3_1.default.providers.WebsocketProvider(config.blockchainUrl, {
+                reconnect: reconnectOptions,
             });
-            this.contract = new store_1.default.web3Wss.eth.Contract(abi_1.abi, config.contractAddress, web3Context);
+            store_1.default.web3Wss = new web3_1.default(this.provider);
+            this.contract = new store_1.default.web3Wss.eth.Contract(app_json_1.default.abi, config.contractAddress);
             Superpro_1.default.address = config.contractAddress;
             SuperproToken_1.default.addressWss = yield Superpro_1.default.getTokenAddress(this.contract);
             this.initialized = true;
@@ -83,11 +60,9 @@ class BlockchainEventsListener extends BaseConnector_1.BaseConnector {
         });
     }
     shutdown() {
-        var _a, _b;
         super.shutdown();
-        (_b = (_a = store_1.default.web3Wss) === null || _a === void 0 ? void 0 : _a.provider) === null || _b === void 0 ? void 0 : _b.disconnect(0, '');
         store_1.default.web3Wss = undefined;
     }
 }
 exports.default = BlockchainEventsListener;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nvbm5lY3RvcnMvQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFBd0Q7QUFDeEQsNkNBQTREO0FBQzVELDBDQUF1QztBQUV2QyxpQ0FBaUM7QUFDakMscURBQTZCO0FBQzdCLHdFQUFnRDtBQUNoRCxrRkFBMEQ7QUFFMUQsTUFBTSx3QkFBeUIsU0FBUSw2QkFBYTtJQUloRDtRQUNJLEtBQUssRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVNLE1BQU0sQ0FBQyxXQUFXO1FBQ3JCLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxRQUFRLEVBQUU7WUFDcEMsd0JBQXdCLENBQUMsUUFBUSxHQUFHLElBQUksd0JBQXdCLEVBQUUsQ0FBQztTQUN0RTtRQUVELE9BQU8sd0JBQXdCLENBQUMsUUFBUSxDQUFDO0lBQzdDLENBQUM7SUFFTSxXQUFXOztRQUNkLE9BQTBCLE1BQUEsZUFBSyxDQUFDLE9BQU8sMENBQUUsUUFBUSxDQUFDO0lBQ3RELENBQUM7SUFFRDs7O09BR0c7SUFDVSxVQUFVLENBQUMsTUFBYzs7WUFDbEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLGNBQWMsQ0FBQyxDQUFDO1lBRTFDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDbEM7Z0JBQ0ksSUFBSSxFQUFFLElBQUk7Z0JBQ1YsS0FBSyxFQUFFLElBQUk7Z0JBQ1gsV0FBVyxFQUFFLENBQUM7Z0JBQ2QsU0FBUyxFQUFFLEtBQUs7YUFDbkIsRUFDRCxNQUFNLENBQUMsU0FBUyxDQUNuQixDQUFDO1lBRUYsTUFBTSxRQUFRLEdBQUcsSUFBSSx3QkFBaUIsQ0FBQyxNQUFNLENBQUMsYUFBYyxFQUFFLEVBQUUsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ3BGLGVBQUssQ0FBQyxPQUFPLEdBQUcsSUFBSSxjQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDbkMsTUFBTSxXQUFXLEdBQUcsSUFBSSxrQkFBVyxDQUFDO2dCQUNoQyxRQUFRLEVBQUUsZUFBSyxDQUFDLE9BQU8sQ0FBQyxlQUFlO2dCQUN2QyxNQUFNLEVBQUUsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLEVBQUU7YUFDNUMsQ0FBQyxDQUFDO1lBRUgsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLGVBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxTQUFHLEVBQUUsTUFBTSxDQUFDLGVBQWUsRUFBRSxXQUFXLENBQUMsQ0FBQztZQUN6RixrQkFBUSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsZUFBZSxDQUFDO1lBQzFDLHVCQUFhLENBQUMsVUFBVSxHQUFHLE1BQU0sa0JBQVEsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRXpFLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDO1lBRXhCLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3JDLENBQUM7S0FBQTtJQUVNLFFBQVE7O1FBQ1gsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2pCLE1BQUEsTUFBQSxlQUFLLENBQUMsT0FBTywwQ0FBRSxRQUFRLDBDQUFFLFVBQVUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDM0MsZUFBSyxDQUFDLE9BQU8sR0FBRyxTQUFTLENBQUM7SUFDOUIsQ0FBQztDQUNKO0FBRUQsa0JBQWUsd0JBQXdCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nvbm5lY3RvcnMvQmxvY2tjaGFpbkV2ZW50c0xpc3RlbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbURBQXdEO0FBQ3hELGdEQUF3QjtBQUN4QixxRUFBNEM7QUFJNUMsaUNBQWlDO0FBQ2pDLHFEQUE2QjtBQUM3Qix3RUFBZ0Q7QUFDaEQsa0ZBQTBEO0FBRTFELE1BQU0sd0JBQXlCLFNBQVEsNkJBQWE7SUFJaEQ7UUFDSSxLQUFLLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFTSxNQUFNLENBQUMsV0FBVztRQUNyQixJQUFJLENBQUMsd0JBQXdCLENBQUMsUUFBUSxFQUFFO1lBQ3BDLHdCQUF3QixDQUFDLFFBQVEsR0FBRyxJQUFJLHdCQUF3QixFQUFFLENBQUM7U0FDdEU7UUFFRCxPQUFPLHdCQUF3QixDQUFDLFFBQVEsQ0FBQztJQUM3QyxDQUFDO0lBRU0sV0FBVztRQUNkLE9BQTBDLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDNUQsQ0FBQztJQUVEOzs7T0FHRztJQUNVLFVBQVUsQ0FBQyxNQUFjOztZQUNsQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsY0FBYyxDQUFDLENBQUM7WUFFMUMsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO2dCQUNkLElBQUksQ0FBQyxRQUFrQyxDQUFDLEtBQUssRUFBRSxDQUFDO2FBQ3BEO1lBRUQsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUNsQztnQkFDSSxJQUFJLEVBQUUsSUFBSTtnQkFDVixLQUFLLEVBQUUsSUFBSTtnQkFDWCxXQUFXLEVBQUUsQ0FBQztnQkFDZCxTQUFTLEVBQUUsS0FBSzthQUNuQixFQUNELE1BQU0sQ0FBQyxTQUFTLENBQ25CLENBQUM7WUFFRixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksY0FBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsYUFBYyxFQUFFO2dCQUN4RSxTQUFTLEVBQUUsZ0JBQWdCO2FBQzlCLENBQUMsQ0FBQztZQUNILGVBQUssQ0FBQyxPQUFPLEdBQUcsSUFBSSxjQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRXhDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxlQUFLLENBQUMsT0FBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQ2hDLGtCQUFPLENBQUMsR0FBRyxFQUN0QixNQUFNLENBQUMsZUFBZSxDQUN6QixDQUFDO1lBQ0Ysa0JBQVEsQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDLGVBQWUsQ0FBQztZQUMxQyx1QkFBYSxDQUFDLFVBQVUsR0FBRyxNQUFNLGtCQUFRLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUV6RSxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztZQUV4QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNyQyxDQUFDO0tBQUE7SUFFTSxRQUFRO1FBQ1gsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2pCLGVBQUssQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDO0lBQzlCLENBQUM7Q0FDSjtBQUVELGtCQUFlLHdCQUF3QixDQUFDIn0=

package/build/constants.d.ts

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