@super-protocol/sdk-js 0.15.3-beta.1 → 0.15.3-beta.2

package/build/connectors/BaseConnector.d.ts

@@ -7,6 +7,8 @@ export type Config = {
     gasLimit?: number;
     gasLimitMultiplier?: number;
     gasPriceMultiplier?: number;
+    txConcurrency?: number;
+    txIntervalMs?: number;
     reconnect?: {
         auto?: boolean;
         delay?: number;

package/build/connectors/BlockchainConnector.js

@@ -69,6 +69,10 @@ class BlockchainConnector extends BaseConnector_1.BaseConnector {
                 store_1.default.gasLimitMultiplier = config.gasLimitMultiplier;
             if (config === null || config === void 0 ? void 0 : config.gasPriceMultiplier)
                 store_1.default.gasPriceMultiplier = config.gasPriceMultiplier;
+            if (config === null || config === void 0 ? void 0 : config.txConcurrency)
+                store_1.default.txConcurrency = config.txConcurrency;
+            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 store_1.default.web3Https.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
             TxManager_1.default.init(store_1.default.web3Https);

package/build/constants.d.ts

@@ -3,6 +3,8 @@ 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;
+export declare const txIntervalMs = 500;
 export declare const ONE_DAY: number;
 export declare const BLOCK_SIZE_TO_FETCH_TRANSACTION = 500;
 export declare const POLYGON_MATIC_EVENT_PATH = "0x0000000000000000000000000000000000001010";

package/build/constants.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
+exports.BLOCKCHAIN_CALL_RETRY_INTERVAL = exports.BLOCKCHAIN_CALL_RETRY_ATTEMPTS = exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.txIntervalMs = exports.txConcurrency = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
 exports.defaultBlockchainUrl = "http://127.0.0.1:8545";
 exports.defaultGasLimit = 7000000;
 exports.defaultGasPrice = "3000000000";
 exports.defaultGasPriceMultiplier = 1;
 exports.defaultGasLimitMultiplier = 1.2;
+exports.txConcurrency = 30;
+exports.txIntervalMs = 500;
 exports.ONE_DAY = 24 * 60 * 60;
 exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = 500;
 exports.POLYGON_MATIC_EVENT_PATH = "0x0000000000000000000000000000000000001010";

package/build/store.d.ts

@@ -7,6 +7,8 @@ export type Store = {
     gasLimitMultiplier: number;
     gasPriceMultiplier: number;
     gasPrice?: string;
+    txConcurrency: number;
+    txIntervalMs: number;
     keys: Record<string, string>;
 };
 declare const store: Store;

package/build/store.js

@@ -9,6 +9,8 @@ const store = {
     gasLimitMultiplier: constants_1.defaultGasLimitMultiplier,
     gasPriceMultiplier: constants_1.defaultGasPriceMultiplier,
     gasPrice: undefined,
+    txConcurrency: constants_1.txConcurrency,
+    txIntervalMs: constants_1.txIntervalMs,
     keys: {},
 };
 exports.default = store;

package/build/types/Web3.d.ts

@@ -15,6 +15,7 @@ export type EventData = {
     name: string;
     data: any;
 };
+export type TransactionOptionsRequired = Required<TransactionOptions>;
 export type TransactionOptions = {
     from?: string;
     gas?: number;

package/build/utils/TxManager.d.ts

@@ -19,11 +19,13 @@ declare class TxManager {
     private static web3;
     private static logger;
     private static nonceTrackers;
+    private static queues;
     static init(web3: Web3): void;
     private static checkIfInitialized;
     static initAccount(address: string): Promise<void>;
     static execute(method: (...args: ArgumentsType) => MethodReturnType, args: ArgumentsType, transactionOptions?: TransactionOptions, to?: string): Promise<TransactionReceipt>;
+    static publishTransaction(txData: Record<string, any>, transactionOptions?: TransactionOptions, transactionCall?: MethodReturnType): Promise<any>;
     static dryRun(method: (...args: ArgumentsType) => MethodReturnType, args: ArgumentsType, transactionOptions?: TransactionOptions): Promise<any>;
-    static publishTransaction(txData: Record<string, any>, transactionOptions?: TransactionOptions, transactionCall?: MethodReturnType): Promise<TransactionReceipt>;
+    private static _publishTransaction;
 }
 export default TxManager;

package/build/utils/TxManager.js

@@ -20,6 +20,7 @@ const utils_1 = require("../utils");
 const Superpro_1 = __importDefault(require("../staticModels/Superpro"));
 const constants_1 = require("../constants");
 const lodash_1 = __importDefault(require("lodash"));
+const bottleneck_1 = __importDefault(require("bottleneck"));
 class Web3TransactionError extends Error {
     constructor(originalError, message) {
         super(message);
@@ -61,6 +62,24 @@ class TxManager {
             return yield 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));
+            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.");
+            }
+            if (!this.queues[options.from]) {
+                this.queues[options.from] = new bottleneck_1.default({
+                    maxConcurrent: store_1.default.txConcurrency,
+                    minTime: store_1.default.txIntervalMs,
+                });
+            }
+            return this.queues[options.from].schedule(() => __awaiter(this, void 0, void 0, function* () { return TxManager._publishTransaction(txData, options, transactionCall); }));
+        });
+    }
     static dryRun(method, args, transactionOptions) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -77,17 +96,11 @@ class TxManager {
             }
         });
     }
-    static publishTransaction(txData, transactionOptions, transactionCall) {
+    static _publishTransaction(txData, transactionOptions, transactionCall) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.checkIfInitialized();
-            (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-            const web3 = (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) || this.web3;
-            const options = yield (0, utils_1.createTransactionOptions)(Object.assign({}, transactionOptions));
-            if (!options.from) {
-                throw Error("From account is undefined. You should pass it to transactionOptions or init action account.");
-            }
-            txData = Object.assign(Object.assign({}, options), txData);
+            const { web3 } = transactionOptions;
+            txData = Object.assign(Object.assign({}, transactionOptions), txData);
             if (transactionCall) {
                 let estimatedGas;
                 try {
@@ -101,25 +114,25 @@ class TxManager {
                 txData.gas = Math.ceil(txData.gas * store_1.default.gasLimitMultiplier);
                 // defaultGasLimit is max gas limit
                 txData.gas = txData.gas < constants_1.defaultGasLimit ? txData.gas : constants_1.defaultGasLimit;
-                if (options.gas) {
-                    if (options.gas < estimatedGas) {
+                if (transactionOptions.gas) {
+                    if (transactionOptions.gas < estimatedGas) {
                         TxManager.logger.warn({
                             estimated: estimatedGas,
-                            specified: options.gas,
+                            specified: transactionOptions.gas,
                         }, "Fail to calculate estimated gas");
                     }
-                    txData.gas = options.gas;
+                    txData.gas = transactionOptions.gas;
                 }
                 txData.gasPrice = Math.ceil(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) && this.nonceTrackers[options.from]) {
-                nonceTracker = this.nonceTrackers[options.from];
+            if (!(0, utils_1.checkForUsingExternalTxManager)(transactionOptions) && this.nonceTrackers[transactionOptions.from]) {
+                nonceTracker = this.nonceTrackers[transactionOptions.from];
                 yield nonceTracker.onTransactionStartPublishing();
                 txData.nonce = nonceTracker.consumeNonce();
             }
-            const signingKey = store_1.default.keys[options.from];
+            const signingKey = store_1.default.keys[transactionOptions.from];
             try {
                 let transactionResultData;
                 if (signingKey) {
@@ -165,4 +178,5 @@ class TxManager {
 }
 TxManager.logger = logger_1.default.child({ className: "TxManager" });
 TxManager.nonceTrackers = {};
+TxManager.queues = {};
 exports.default = TxManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.15.3-beta.1",
+  "version": "0.15.3-beta.2",
   "main": "build/index.js",
   "license": "MIT",
   "files": [
@@ -57,6 +57,7 @@
     "@super-protocol/tee-lib": "^0.1.2",
     "@super-protocol/uplink-nodejs": "1.2.16",
     "aws-sdk": "^2.1418.0",
+    "bottleneck": "^2.19.5",
     "ethers": "^5.5.3",
     "hybrid-crypto-js": "^0.2.4",
     "lodash": "^4.17.21",