@super-protocol/sdk-js 2.1.7 → 2.1.8-beta.0
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/dist/cjs/utils/TxManager.js +29 -20
- package/dist/mjs/utils/TxManager.js +29 -20
- package/package.json +1 -1
|
@@ -92,8 +92,8 @@ class TxManager {
|
|
|
92
92
|
gasPrice,
|
|
93
93
|
gasPriceMultiplier,
|
|
94
94
|
};
|
|
95
|
+
let estimatedGas;
|
|
95
96
|
if (transactionCall) {
|
|
96
|
-
let estimatedGas;
|
|
97
97
|
try {
|
|
98
98
|
estimatedGas = await transactionCall.estimateGas(txData);
|
|
99
99
|
}
|
|
@@ -101,27 +101,36 @@ class TxManager {
|
|
|
101
101
|
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
102
102
|
estimatedGas = constants_js_1.defaultGasLimit;
|
|
103
103
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (transactionOptions.gas < estimatedGas) {
|
|
109
|
-
TxManager.logger.warn({
|
|
110
|
-
estimated: estimatedGas,
|
|
111
|
-
specified: transactionOptions.gas,
|
|
112
|
-
}, 'Fail to calculate estimated gas');
|
|
113
|
-
}
|
|
114
|
-
txData.gas = transactionOptions.gas;
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
try {
|
|
107
|
+
estimatedGas = await store_js_1.default.web3Https.eth.estimateGas(txData);
|
|
115
108
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
txData.gasPrice = maxGasPrice;
|
|
120
|
-
}
|
|
109
|
+
catch (e) {
|
|
110
|
+
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
111
|
+
estimatedGas = constants_js_1.defaultGasLimit;
|
|
121
112
|
}
|
|
122
|
-
|
|
123
|
-
|
|
113
|
+
}
|
|
114
|
+
txData.gas = (0, helper_js_1.multiplyBigIntByNumber)(estimatedGas, store_js_1.default.gasLimitMultiplier);
|
|
115
|
+
// defaultGasLimit is max gas limit
|
|
116
|
+
txData.gas = txData.gas < constants_js_1.defaultGasLimit ? txData.gas : constants_js_1.defaultGasLimit;
|
|
117
|
+
if (transactionOptions.gas) {
|
|
118
|
+
if (transactionOptions.gas < estimatedGas) {
|
|
119
|
+
TxManager.logger.warn({
|
|
120
|
+
estimated: estimatedGas,
|
|
121
|
+
specified: transactionOptions.gas,
|
|
122
|
+
}, 'Overriding gas is lower than estimated');
|
|
124
123
|
}
|
|
124
|
+
txData.gas = transactionOptions.gas;
|
|
125
|
+
}
|
|
126
|
+
if (store_js_1.default.chainId === constants_js_1.POLYGON_AMOY_CHAIN_ID) {
|
|
127
|
+
const maxGasPrice = constants_js_1.AMOY_TX_COST_LIMIT / BigInt(txData.gas);
|
|
128
|
+
if (maxGasPrice < txData.gasPrice) {
|
|
129
|
+
txData.gasPrice = maxGasPrice;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
txData.gasPrice = (0, helper_js_1.multiplyBigIntByNumber)(txData.gasPrice, store_js_1.default.gasPriceMultiplier);
|
|
125
134
|
}
|
|
126
135
|
let nonceTracker;
|
|
127
136
|
// TODO: Consider a better way to organize different strategies for publishing transactions.
|
|
@@ -174,4 +183,4 @@ class TxManager {
|
|
|
174
183
|
}
|
|
175
184
|
}
|
|
176
185
|
exports.default = TxManager;
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
186
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TxManager.js","sourceRoot":"","sources":["../../../src/utils/TxManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,8 +85,8 @@ class TxManager {
|
|
|
85
85
|
gasPrice,
|
|
86
86
|
gasPriceMultiplier,
|
|
87
87
|
};
|
|
88
|
+
let estimatedGas;
|
|
88
89
|
if (transactionCall) {
|
|
89
|
-
let estimatedGas;
|
|
90
90
|
try {
|
|
91
91
|
estimatedGas = await transactionCall.estimateGas(txData);
|
|
92
92
|
}
|
|
@@ -94,27 +94,36 @@ class TxManager {
|
|
|
94
94
|
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
95
95
|
estimatedGas = defaultGasLimit;
|
|
96
96
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
if (transactionOptions.gas < estimatedGas) {
|
|
102
|
-
TxManager.logger.warn({
|
|
103
|
-
estimated: estimatedGas,
|
|
104
|
-
specified: transactionOptions.gas,
|
|
105
|
-
}, 'Fail to calculate estimated gas');
|
|
106
|
-
}
|
|
107
|
-
txData.gas = transactionOptions.gas;
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
try {
|
|
100
|
+
estimatedGas = await store.web3Https.eth.estimateGas(txData);
|
|
108
101
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
txData.gasPrice = maxGasPrice;
|
|
113
|
-
}
|
|
102
|
+
catch (e) {
|
|
103
|
+
TxManager.logger.debug({ error: e }, 'Fail to calculate estimated gas');
|
|
104
|
+
estimatedGas = defaultGasLimit;
|
|
114
105
|
}
|
|
115
|
-
|
|
116
|
-
|
|
106
|
+
}
|
|
107
|
+
txData.gas = multiplyBigIntByNumber(estimatedGas, store.gasLimitMultiplier);
|
|
108
|
+
// defaultGasLimit is max gas limit
|
|
109
|
+
txData.gas = txData.gas < defaultGasLimit ? txData.gas : defaultGasLimit;
|
|
110
|
+
if (transactionOptions.gas) {
|
|
111
|
+
if (transactionOptions.gas < estimatedGas) {
|
|
112
|
+
TxManager.logger.warn({
|
|
113
|
+
estimated: estimatedGas,
|
|
114
|
+
specified: transactionOptions.gas,
|
|
115
|
+
}, 'Overriding gas is lower than estimated');
|
|
117
116
|
}
|
|
117
|
+
txData.gas = transactionOptions.gas;
|
|
118
|
+
}
|
|
119
|
+
if (store.chainId === POLYGON_AMOY_CHAIN_ID) {
|
|
120
|
+
const maxGasPrice = AMOY_TX_COST_LIMIT / BigInt(txData.gas);
|
|
121
|
+
if (maxGasPrice < txData.gasPrice) {
|
|
122
|
+
txData.gasPrice = maxGasPrice;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
txData.gasPrice = multiplyBigIntByNumber(txData.gasPrice, store.gasPriceMultiplier);
|
|
118
127
|
}
|
|
119
128
|
let nonceTracker;
|
|
120
129
|
// TODO: Consider a better way to organize different strategies for publishing transactions.
|
|
@@ -167,4 +176,4 @@ class TxManager {
|
|
|
167
176
|
}
|
|
168
177
|
}
|
|
169
178
|
export default TxManager;
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TxManager.js","sourceRoot":"","sources":["../../../src/utils/TxManager.ts"],"names":[],"mappings":"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"}
|