@atomiqlabs/chain-evm 1.0.0-dev.46 → 1.0.0-dev.48
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/evm/chain/modules/EVMTransactions.js +6 -1
- package/dist/evm/spv_swap/EVMSpvVaultContract.js +2 -2
- package/dist/evm/swaps/modules/EVMSwapClaim.js +1 -1
- package/dist/evm/swaps/modules/EVMSwapRefund.js +1 -1
- package/package.json +1 -1
- package/src/evm/chain/modules/EVMTransactions.ts +7 -1
- package/src/evm/spv_swap/EVMSpvVaultContract.ts +2 -2
- package/src/evm/swaps/modules/EVMSwapClaim.ts +1 -1
- package/src/evm/swaps/modules/EVMSwapRefund.ts +1 -1
|
@@ -4,6 +4,7 @@ exports.EVMTransactions = void 0;
|
|
|
4
4
|
const EVMModule_1 = require("../EVMModule");
|
|
5
5
|
const ethers_1 = require("ethers");
|
|
6
6
|
const Utils_1 = require("../../../utils/Utils");
|
|
7
|
+
const MAX_UNCONFIRMED_TXNS = 10;
|
|
7
8
|
class EVMTransactions extends EVMModule_1.EVMModule {
|
|
8
9
|
constructor() {
|
|
9
10
|
super(...arguments);
|
|
@@ -116,7 +117,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
|
|
|
116
117
|
" waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
|
|
117
118
|
const txIds = [];
|
|
118
119
|
if (parallel) {
|
|
119
|
-
|
|
120
|
+
let promises = [];
|
|
120
121
|
for (let i = 0; i < txs.length; i++) {
|
|
121
122
|
let tx;
|
|
122
123
|
if (signer.isBrowserWallet) {
|
|
@@ -131,6 +132,10 @@ class EVMTransactions extends EVMModule_1.EVMModule {
|
|
|
131
132
|
promises.push(this.confirmTransaction(tx, abortSignal));
|
|
132
133
|
txIds.push(tx.hash);
|
|
133
134
|
this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + tx.hash);
|
|
135
|
+
if (promises.length >= MAX_UNCONFIRMED_TXNS) {
|
|
136
|
+
await Promise.all(promises);
|
|
137
|
+
promises = [];
|
|
138
|
+
}
|
|
134
139
|
}
|
|
135
140
|
if (promises.length > 0)
|
|
136
141
|
await Promise.all(promises);
|
|
@@ -468,11 +468,11 @@ EVMSpvVaultContract.GasCosts = {
|
|
|
468
468
|
DEPOSIT_ERC20: 40000,
|
|
469
469
|
OPEN: 80000 + 21000,
|
|
470
470
|
CLAIM_BASE: 85000 + 21000,
|
|
471
|
-
CLAIM_NATIVE_TRANSFER:
|
|
471
|
+
CLAIM_NATIVE_TRANSFER: 35000,
|
|
472
472
|
CLAIM_ERC20_TRANSFER: 40000,
|
|
473
473
|
CLAIM_EXECUTION_SCHEDULE: 30000,
|
|
474
474
|
FRONT_BASE: 75000 + 21000,
|
|
475
|
-
FRONT_NATIVE_TRANSFER:
|
|
475
|
+
FRONT_NATIVE_TRANSFER: 35000,
|
|
476
476
|
FRONT_ERC20_TRANSFER: 40000,
|
|
477
477
|
FRONT_EXECUTION_SCHEDULE: 30000
|
|
478
478
|
};
|
package/package.json
CHANGED
|
@@ -18,6 +18,8 @@ export type EVMTxTrace = {
|
|
|
18
18
|
type: "CREATE" | "CALL" | "STATICCALL"
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
+
const MAX_UNCONFIRMED_TXNS = 10;
|
|
22
|
+
|
|
21
23
|
export class EVMTransactions extends EVMModule<any> {
|
|
22
24
|
|
|
23
25
|
private readonly latestConfirmedNonces: {[address: string]: number} = {};
|
|
@@ -140,7 +142,7 @@ export class EVMTransactions extends EVMModule<any> {
|
|
|
140
142
|
|
|
141
143
|
const txIds: string[] = [];
|
|
142
144
|
if(parallel) {
|
|
143
|
-
|
|
145
|
+
let promises: Promise<void>[] = [];
|
|
144
146
|
for(let i=0;i<txs.length;i++) {
|
|
145
147
|
let tx: {nonce: number, from: string, hash: string};
|
|
146
148
|
if(signer.isBrowserWallet) {
|
|
@@ -153,6 +155,10 @@ export class EVMTransactions extends EVMModule<any> {
|
|
|
153
155
|
if(waitForConfirmation) promises.push(this.confirmTransaction(tx, abortSignal));
|
|
154
156
|
txIds.push(tx.hash);
|
|
155
157
|
this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+signedTxs.length+"): "+tx.hash);
|
|
158
|
+
if(promises.length >= MAX_UNCONFIRMED_TXNS) {
|
|
159
|
+
await Promise.all(promises);
|
|
160
|
+
promises = [];
|
|
161
|
+
}
|
|
156
162
|
}
|
|
157
163
|
if(promises.length>0) await Promise.all(promises);
|
|
158
164
|
} else {
|
|
@@ -61,12 +61,12 @@ export class EVMSpvVaultContract<ChainId extends string>
|
|
|
61
61
|
OPEN: 80_000 + 21_000,
|
|
62
62
|
|
|
63
63
|
CLAIM_BASE: 85_000 + 21_000,
|
|
64
|
-
CLAIM_NATIVE_TRANSFER:
|
|
64
|
+
CLAIM_NATIVE_TRANSFER: 35_000,
|
|
65
65
|
CLAIM_ERC20_TRANSFER: 40_000,
|
|
66
66
|
CLAIM_EXECUTION_SCHEDULE: 30_000,
|
|
67
67
|
|
|
68
68
|
FRONT_BASE: 75_000 + 21_000,
|
|
69
|
-
FRONT_NATIVE_TRANSFER:
|
|
69
|
+
FRONT_NATIVE_TRANSFER: 35_000,
|
|
70
70
|
FRONT_ERC20_TRANSFER: 40_000,
|
|
71
71
|
FRONT_EXECUTION_SCHEDULE: 30_000
|
|
72
72
|
};
|