@super-protocol/sdk-js 2.1.2-fix.0 → 2.1.2-fix.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/utils/TxManager.js +29 -20
- package/package.json +1 -1
package/build/utils/TxManager.js
CHANGED
|
@@ -98,8 +98,8 @@ class TxManager {
|
|
|
98
98
|
gas,
|
|
99
99
|
gasPrice,
|
|
100
100
|
gasPriceMultiplier });
|
|
101
|
+
let estimatedGas;
|
|
101
102
|
if (transactionCall) {
|
|
102
|
-
let estimatedGas;
|
|
103
103
|
try {
|
|
104
104
|
estimatedGas = yield transactionCall.estimateGas(txData);
|
|
105
105
|
}
|
|
@@ -107,27 +107,36 @@ class TxManager {
|
|
|
107
107
|
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
108
108
|
estimatedGas = constants_1.defaultGasLimit;
|
|
109
109
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
if (transactionOptions.gas < estimatedGas) {
|
|
115
|
-
TxManager.logger.warn({
|
|
116
|
-
estimated: estimatedGas,
|
|
117
|
-
specified: transactionOptions.gas,
|
|
118
|
-
}, 'Fail to calculate estimated gas');
|
|
119
|
-
}
|
|
120
|
-
txData.gas = transactionOptions.gas;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
try {
|
|
113
|
+
estimatedGas = yield store_1.default.web3Https.eth.estimateGas(txData);
|
|
121
114
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
txData.gasPrice = maxGasPrice;
|
|
126
|
-
}
|
|
115
|
+
catch (e) {
|
|
116
|
+
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
117
|
+
estimatedGas = constants_1.defaultGasLimit;
|
|
127
118
|
}
|
|
128
|
-
|
|
129
|
-
|
|
119
|
+
}
|
|
120
|
+
txData.gas = (0, helper_1.multiplyBigIntByNumber)(estimatedGas, store_1.default.gasLimitMultiplier);
|
|
121
|
+
// defaultGasLimit is max gas limit
|
|
122
|
+
txData.gas = txData.gas < constants_1.defaultGasLimit ? txData.gas : constants_1.defaultGasLimit;
|
|
123
|
+
if (transactionOptions.gas) {
|
|
124
|
+
if (transactionOptions.gas < estimatedGas) {
|
|
125
|
+
TxManager.logger.warn({
|
|
126
|
+
estimated: estimatedGas,
|
|
127
|
+
specified: transactionOptions.gas,
|
|
128
|
+
}, 'Overriding gas is lower than estimated');
|
|
130
129
|
}
|
|
130
|
+
txData.gas = transactionOptions.gas;
|
|
131
|
+
}
|
|
132
|
+
if (store_1.default.chainId === constants_1.POLYGON_AMOY_CHAINID) {
|
|
133
|
+
const maxGasPrice = constants_1.AMOY_TX_COST_LIMIT / BigInt(txData.gas);
|
|
134
|
+
if (maxGasPrice < txData.gasPrice) {
|
|
135
|
+
txData.gasPrice = maxGasPrice;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
txData.gasPrice = (0, helper_1.multiplyBigIntByNumber)(txData.gasPrice, store_1.default.gasPriceMultiplier);
|
|
131
140
|
}
|
|
132
141
|
let nonceTracker;
|
|
133
142
|
// TODO: Consider a better way to organize different strategies for publishing transactions.
|
|
@@ -184,4 +193,4 @@ TxManager.logger = logger_1.default.child({ className: 'TxManager' });
|
|
|
184
193
|
TxManager.nonceTrackers = {};
|
|
185
194
|
TxManager.queues = {};
|
|
186
195
|
exports.default = TxManager;
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHhNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL1R4TWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFDQSxrRUFBMEM7QUFDMUMsdURBQW1DO0FBQ25DLHFEQUE2QjtBQVE3QixxQ0FLa0I7QUFDbEIsd0VBQWdEO0FBQ2hELDRDQUF5RjtBQUN6RixvREFBNEI7QUFFNUIsNERBQW9DO0FBU3BDLE1BQU0sb0JBQXFCLFNBQVEsS0FBSztJQUV0QyxZQUFZLGFBQXNCLEVBQUUsT0FBZTtRQUNqRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO1FBQ25DLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3JDLENBQUM7Q0FDRjtBQUVELE1BQWEsaUNBQWtDLFNBQVEsb0JBQW9CO0lBQ3pFLFlBQVksYUFBc0IsRUFBRSxPQUFlO1FBQ2pELEtBQUssQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxtQ0FBbUMsQ0FBQztJQUNsRCxDQUFDO0NBQ0Y7QUFMRCw4RUFLQztBQUlELE1BQU0sU0FBUztJQUtOLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBVTtRQUMzQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNuQixDQUFDO0lBRU8sTUFBTSxDQUFDLGtCQUFrQjtRQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNkLE1BQU0sS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7U0FDOUQ7SUFDSCxDQUFDO0lBRU0sTUFBTSxDQUFPLFdBQVcsQ0FBQyxPQUFlOztZQUM3QyxJQUFJLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDO2dCQUFFLE9BQU87WUFDeEMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsR0FBRyxJ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
|