@atomiqlabs/chain-evm 1.0.0-dev.75 → 1.0.0-dev.77

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.
Files changed (185) hide show
  1. package/LICENSE +201 -201
  2. package/dist/chains/botanix/BotanixChainType.d.ts +13 -13
  3. package/dist/chains/botanix/BotanixChainType.js +2 -2
  4. package/dist/chains/botanix/BotanixInitializer.d.ts +30 -30
  5. package/dist/chains/botanix/BotanixInitializer.js +122 -122
  6. package/dist/chains/citrea/CitreaBtcRelay.d.ts +21 -21
  7. package/dist/chains/citrea/CitreaBtcRelay.js +43 -43
  8. package/dist/chains/citrea/CitreaChainType.d.ts +13 -13
  9. package/dist/chains/citrea/CitreaChainType.js +2 -2
  10. package/dist/chains/citrea/CitreaFees.d.ts +29 -29
  11. package/dist/chains/citrea/CitreaFees.js +67 -67
  12. package/dist/chains/citrea/CitreaInitializer.d.ts +30 -30
  13. package/dist/chains/citrea/CitreaInitializer.js +129 -129
  14. package/dist/chains/citrea/CitreaSpvVaultContract.d.ts +15 -15
  15. package/dist/chains/citrea/CitreaSpvVaultContract.js +74 -74
  16. package/dist/chains/citrea/CitreaSwapContract.d.ts +22 -22
  17. package/dist/chains/citrea/CitreaSwapContract.js +96 -96
  18. package/dist/chains/citrea/CitreaTokens.d.ts +9 -9
  19. package/dist/chains/citrea/CitreaTokens.js +20 -20
  20. package/dist/evm/btcrelay/BtcRelayAbi.d.ts +198 -198
  21. package/dist/evm/btcrelay/BtcRelayAbi.js +261 -261
  22. package/dist/evm/btcrelay/BtcRelayTypechain.d.ts +172 -172
  23. package/dist/evm/btcrelay/BtcRelayTypechain.js +2 -2
  24. package/dist/evm/btcrelay/EVMBtcRelay.d.ts +197 -197
  25. package/dist/evm/btcrelay/EVMBtcRelay.js +435 -435
  26. package/dist/evm/btcrelay/headers/EVMBtcHeader.d.ts +33 -33
  27. package/dist/evm/btcrelay/headers/EVMBtcHeader.js +84 -84
  28. package/dist/evm/btcrelay/headers/EVMBtcStoredHeader.d.ts +56 -56
  29. package/dist/evm/btcrelay/headers/EVMBtcStoredHeader.js +123 -123
  30. package/dist/evm/chain/EVMChainInterface.d.ts +51 -51
  31. package/dist/evm/chain/EVMChainInterface.js +89 -89
  32. package/dist/evm/chain/EVMModule.d.ts +9 -9
  33. package/dist/evm/chain/EVMModule.js +13 -13
  34. package/dist/evm/chain/modules/ERC20Abi.d.ts +168 -168
  35. package/dist/evm/chain/modules/ERC20Abi.js +225 -225
  36. package/dist/evm/chain/modules/EVMAddresses.d.ts +10 -10
  37. package/dist/evm/chain/modules/EVMAddresses.js +30 -30
  38. package/dist/evm/chain/modules/EVMBlocks.d.ts +20 -20
  39. package/dist/evm/chain/modules/EVMBlocks.js +64 -64
  40. package/dist/evm/chain/modules/EVMEvents.d.ts +36 -36
  41. package/dist/evm/chain/modules/EVMEvents.js +122 -122
  42. package/dist/evm/chain/modules/EVMFees.d.ts +36 -36
  43. package/dist/evm/chain/modules/EVMFees.js +74 -74
  44. package/dist/evm/chain/modules/EVMSignatures.d.ts +29 -29
  45. package/dist/evm/chain/modules/EVMSignatures.js +68 -68
  46. package/dist/evm/chain/modules/EVMTokens.d.ts +70 -70
  47. package/dist/evm/chain/modules/EVMTokens.js +142 -142
  48. package/dist/evm/chain/modules/EVMTransactions.d.ts +94 -94
  49. package/dist/evm/chain/modules/EVMTransactions.js +286 -286
  50. package/dist/evm/contract/EVMContractBase.d.ts +22 -22
  51. package/dist/evm/contract/EVMContractBase.js +34 -34
  52. package/dist/evm/contract/EVMContractModule.d.ts +8 -8
  53. package/dist/evm/contract/EVMContractModule.js +11 -11
  54. package/dist/evm/contract/modules/EVMContractEvents.d.ts +42 -42
  55. package/dist/evm/contract/modules/EVMContractEvents.js +75 -75
  56. package/dist/evm/events/EVMChainEvents.d.ts +22 -22
  57. package/dist/evm/events/EVMChainEvents.js +69 -69
  58. package/dist/evm/events/EVMChainEventsBrowser.d.ts +102 -102
  59. package/dist/evm/events/EVMChainEventsBrowser.js +413 -404
  60. package/dist/evm/providers/JsonRpcProviderWithRetries.d.ts +15 -15
  61. package/dist/evm/providers/JsonRpcProviderWithRetries.js +19 -19
  62. package/dist/evm/providers/ReconnectingWebSocketProvider.d.ts +22 -22
  63. package/dist/evm/providers/ReconnectingWebSocketProvider.js +87 -87
  64. package/dist/evm/providers/SocketProvider.d.ts +111 -111
  65. package/dist/evm/providers/SocketProvider.js +334 -334
  66. package/dist/evm/providers/WebSocketProviderWithRetries.d.ts +17 -17
  67. package/dist/evm/providers/WebSocketProviderWithRetries.js +19 -19
  68. package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts +79 -79
  69. package/dist/evm/spv_swap/EVMSpvVaultContract.js +482 -482
  70. package/dist/evm/spv_swap/EVMSpvVaultData.d.ts +39 -39
  71. package/dist/evm/spv_swap/EVMSpvVaultData.js +0 -180
  72. package/dist/evm/spv_swap/EVMSpvWithdrawalData.d.ts +19 -19
  73. package/dist/evm/spv_swap/EVMSpvWithdrawalData.js +55 -55
  74. package/dist/evm/spv_swap/SpvVaultContractAbi.d.ts +91 -91
  75. package/dist/evm/spv_swap/SpvVaultContractAbi.js +849 -849
  76. package/dist/evm/spv_swap/SpvVaultContractTypechain.d.ts +450 -450
  77. package/dist/evm/spv_swap/SpvVaultContractTypechain.js +2 -2
  78. package/dist/evm/swaps/EVMSwapContract.d.ts +193 -193
  79. package/dist/evm/swaps/EVMSwapContract.js +378 -378
  80. package/dist/evm/swaps/EVMSwapData.d.ts +66 -66
  81. package/dist/evm/swaps/EVMSwapData.js +260 -260
  82. package/dist/evm/swaps/EVMSwapModule.d.ts +9 -9
  83. package/dist/evm/swaps/EVMSwapModule.js +11 -11
  84. package/dist/evm/swaps/EscrowManagerAbi.d.ts +120 -120
  85. package/dist/evm/swaps/EscrowManagerAbi.js +985 -985
  86. package/dist/evm/swaps/EscrowManagerTypechain.d.ts +475 -475
  87. package/dist/evm/swaps/EscrowManagerTypechain.js +2 -2
  88. package/dist/evm/swaps/handlers/IHandler.d.ts +13 -13
  89. package/dist/evm/swaps/handlers/IHandler.js +2 -2
  90. package/dist/evm/swaps/handlers/claim/ClaimHandlers.d.ts +10 -10
  91. package/dist/evm/swaps/handlers/claim/ClaimHandlers.js +13 -13
  92. package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.d.ts +20 -20
  93. package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.js +39 -39
  94. package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts +24 -24
  95. package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js +59 -59
  96. package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts +25 -25
  97. package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js +51 -51
  98. package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts +21 -21
  99. package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js +28 -28
  100. package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.d.ts +48 -48
  101. package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.js +63 -63
  102. package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.d.ts +17 -17
  103. package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.js +28 -28
  104. package/dist/evm/swaps/modules/EVMLpVault.d.ts +69 -69
  105. package/dist/evm/swaps/modules/EVMLpVault.js +134 -134
  106. package/dist/evm/swaps/modules/EVMSwapClaim.d.ts +54 -54
  107. package/dist/evm/swaps/modules/EVMSwapClaim.js +137 -137
  108. package/dist/evm/swaps/modules/EVMSwapInit.d.ts +88 -88
  109. package/dist/evm/swaps/modules/EVMSwapInit.js +274 -274
  110. package/dist/evm/swaps/modules/EVMSwapRefund.d.ts +62 -62
  111. package/dist/evm/swaps/modules/EVMSwapRefund.js +167 -167
  112. package/dist/evm/typechain/common.d.ts +50 -50
  113. package/dist/evm/typechain/common.js +2 -2
  114. package/dist/evm/wallet/EVMBrowserSigner.d.ts +5 -5
  115. package/dist/evm/wallet/EVMBrowserSigner.js +11 -11
  116. package/dist/evm/wallet/EVMPersistentSigner.d.ts +29 -29
  117. package/dist/evm/wallet/EVMPersistentSigner.js +222 -222
  118. package/dist/evm/wallet/EVMSigner.d.ts +11 -11
  119. package/dist/evm/wallet/EVMSigner.js +24 -24
  120. package/dist/index.d.ts +44 -44
  121. package/dist/index.js +60 -60
  122. package/dist/utils/Utils.d.ts +17 -17
  123. package/dist/utils/Utils.js +81 -81
  124. package/package.json +39 -39
  125. package/src/chains/botanix/BotanixChainType.ts +28 -28
  126. package/src/chains/botanix/BotanixInitializer.ts +171 -171
  127. package/src/chains/citrea/CitreaBtcRelay.ts +57 -57
  128. package/src/chains/citrea/CitreaChainType.ts +28 -28
  129. package/src/chains/citrea/CitreaFees.ts +77 -77
  130. package/src/chains/citrea/CitreaInitializer.ts +178 -178
  131. package/src/chains/citrea/CitreaSpvVaultContract.ts +75 -75
  132. package/src/chains/citrea/CitreaSwapContract.ts +102 -102
  133. package/src/chains/citrea/CitreaTokens.ts +21 -21
  134. package/src/evm/btcrelay/BtcRelayAbi.ts +258 -258
  135. package/src/evm/btcrelay/BtcRelayTypechain.ts +371 -371
  136. package/src/evm/btcrelay/EVMBtcRelay.ts +537 -537
  137. package/src/evm/btcrelay/headers/EVMBtcHeader.ts +109 -109
  138. package/src/evm/btcrelay/headers/EVMBtcStoredHeader.ts +152 -152
  139. package/src/evm/chain/EVMChainInterface.ts +155 -155
  140. package/src/evm/chain/EVMModule.ts +21 -21
  141. package/src/evm/chain/modules/ERC20Abi.ts +222 -222
  142. package/src/evm/chain/modules/EVMAddresses.ts +28 -28
  143. package/src/evm/chain/modules/EVMBlocks.ts +75 -75
  144. package/src/evm/chain/modules/EVMEvents.ts +139 -139
  145. package/src/evm/chain/modules/EVMFees.ts +104 -104
  146. package/src/evm/chain/modules/EVMSignatures.ts +76 -76
  147. package/src/evm/chain/modules/EVMTokens.ts +155 -155
  148. package/src/evm/chain/modules/EVMTransactions.ts +325 -325
  149. package/src/evm/contract/EVMContractBase.ts +63 -63
  150. package/src/evm/contract/EVMContractModule.ts +16 -16
  151. package/src/evm/contract/modules/EVMContractEvents.ts +102 -102
  152. package/src/evm/events/EVMChainEvents.ts +82 -82
  153. package/src/evm/events/EVMChainEventsBrowser.ts +534 -525
  154. package/src/evm/providers/JsonRpcProviderWithRetries.ts +24 -24
  155. package/src/evm/providers/ReconnectingWebSocketProvider.ts +101 -101
  156. package/src/evm/providers/SocketProvider.ts +368 -368
  157. package/src/evm/providers/WebSocketProviderWithRetries.ts +27 -27
  158. package/src/evm/spv_swap/EVMSpvVaultContract.ts +615 -615
  159. package/src/evm/spv_swap/EVMSpvVaultData.ts +224 -224
  160. package/src/evm/spv_swap/EVMSpvWithdrawalData.ts +70 -70
  161. package/src/evm/spv_swap/SpvVaultContractAbi.ts +846 -846
  162. package/src/evm/spv_swap/SpvVaultContractTypechain.ts +685 -685
  163. package/src/evm/swaps/EVMSwapContract.ts +600 -600
  164. package/src/evm/swaps/EVMSwapData.ts +378 -378
  165. package/src/evm/swaps/EVMSwapModule.ts +16 -16
  166. package/src/evm/swaps/EscrowManagerAbi.ts +982 -982
  167. package/src/evm/swaps/EscrowManagerTypechain.ts +723 -723
  168. package/src/evm/swaps/handlers/IHandler.ts +17 -17
  169. package/src/evm/swaps/handlers/claim/ClaimHandlers.ts +20 -20
  170. package/src/evm/swaps/handlers/claim/HashlockClaimHandler.ts +46 -46
  171. package/src/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.ts +82 -82
  172. package/src/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.ts +76 -76
  173. package/src/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.ts +46 -46
  174. package/src/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts +115 -115
  175. package/src/evm/swaps/handlers/refund/TimelockRefundHandler.ts +37 -37
  176. package/src/evm/swaps/modules/EVMLpVault.ts +154 -154
  177. package/src/evm/swaps/modules/EVMSwapClaim.ts +172 -172
  178. package/src/evm/swaps/modules/EVMSwapInit.ts +328 -328
  179. package/src/evm/swaps/modules/EVMSwapRefund.ts +229 -229
  180. package/src/evm/typechain/common.ts +131 -131
  181. package/src/evm/wallet/EVMBrowserSigner.ts +11 -11
  182. package/src/evm/wallet/EVMPersistentSigner.ts +298 -298
  183. package/src/evm/wallet/EVMSigner.ts +31 -31
  184. package/src/index.ts +53 -53
  185. package/src/utils/Utils.ts +92 -92
@@ -1,29 +1,29 @@
1
- import { Signer, TransactionRequest, TransactionResponse } from "ethers";
2
- import { EVMBlockTag } from "../chain/modules/EVMBlocks";
3
- import { EVMChainInterface } from "../chain/EVMChainInterface";
4
- import { EVMSigner } from "./EVMSigner";
5
- export declare class EVMPersistentSigner extends EVMSigner {
6
- readonly safeBlockTag: EVMBlockTag;
7
- private pendingTxs;
8
- private confirmedNonce;
9
- private pendingNonce;
10
- private feeBumper;
11
- private stopped;
12
- private readonly directory;
13
- private readonly waitBeforeBump;
14
- private readonly minFeeIncreaseAbsolute;
15
- private readonly minFeeIncreasePpm;
16
- private readonly chainInterface;
17
- private readonly logger;
18
- constructor(account: Signer, address: string, chainInterface: EVMChainInterface, directory: string, minFeeIncreaseAbsolute?: bigint, minFeeIncreasePpm?: bigint, waitBeforeBumpMillis?: number);
19
- private load;
20
- private priorSavePromise;
21
- private saveCount;
22
- private save;
23
- private checkPastTransactions;
24
- private startFeeBumper;
25
- init(): Promise<void>;
26
- stop(): Promise<void>;
27
- private readonly sendTransactionQueue;
28
- sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse>;
29
- }
1
+ import { Signer, TransactionRequest, TransactionResponse } from "ethers";
2
+ import { EVMBlockTag } from "../chain/modules/EVMBlocks";
3
+ import { EVMChainInterface } from "../chain/EVMChainInterface";
4
+ import { EVMSigner } from "./EVMSigner";
5
+ export declare class EVMPersistentSigner extends EVMSigner {
6
+ readonly safeBlockTag: EVMBlockTag;
7
+ private pendingTxs;
8
+ private confirmedNonce;
9
+ private pendingNonce;
10
+ private feeBumper;
11
+ private stopped;
12
+ private readonly directory;
13
+ private readonly waitBeforeBump;
14
+ private readonly minFeeIncreaseAbsolute;
15
+ private readonly minFeeIncreasePpm;
16
+ private readonly chainInterface;
17
+ private readonly logger;
18
+ constructor(account: Signer, address: string, chainInterface: EVMChainInterface, directory: string, minFeeIncreaseAbsolute?: bigint, minFeeIncreasePpm?: bigint, waitBeforeBumpMillis?: number);
19
+ private load;
20
+ private priorSavePromise;
21
+ private saveCount;
22
+ private save;
23
+ private checkPastTransactions;
24
+ private startFeeBumper;
25
+ init(): Promise<void>;
26
+ stop(): Promise<void>;
27
+ private readonly sendTransactionQueue;
28
+ sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse>;
29
+ }
@@ -1,222 +1,222 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EVMPersistentSigner = void 0;
4
- const fs = require("fs/promises");
5
- const ethers_1 = require("ethers");
6
- const Utils_1 = require("../../utils/Utils");
7
- const EVMFees_1 = require("../chain/modules/EVMFees");
8
- const EVMSigner_1 = require("./EVMSigner");
9
- const promise_queue_ts_1 = require("promise-queue-ts");
10
- const WAIT_BEFORE_BUMP = 15 * 1000;
11
- const MIN_FEE_INCREASE_ABSOLUTE = 1n * 1000000000n; //1GWei
12
- const MIN_FEE_INCREASE_PPM = 100000n; // +10%
13
- class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
14
- constructor(account, address, chainInterface, directory, minFeeIncreaseAbsolute, minFeeIncreasePpm, waitBeforeBumpMillis) {
15
- super(account, address, true);
16
- this.pendingTxs = new Map();
17
- this.stopped = false;
18
- this.saveCount = 0;
19
- this.sendTransactionQueue = new promise_queue_ts_1.PromiseQueue();
20
- this.signTransaction = null;
21
- this.chainInterface = chainInterface;
22
- this.directory = directory;
23
- this.minFeeIncreaseAbsolute = minFeeIncreaseAbsolute ?? MIN_FEE_INCREASE_ABSOLUTE;
24
- this.minFeeIncreasePpm = minFeeIncreasePpm ?? MIN_FEE_INCREASE_PPM;
25
- this.waitBeforeBump = waitBeforeBumpMillis ?? WAIT_BEFORE_BUMP;
26
- this.safeBlockTag = chainInterface.config.safeBlockTag;
27
- this.logger = (0, Utils_1.getLogger)("EVMPersistentSigner(" + address + "): ");
28
- }
29
- async load() {
30
- const fileExists = await fs.access(this.directory + "/txs.json", fs.constants.F_OK).then(() => true).catch(() => false);
31
- if (!fileExists)
32
- return;
33
- const res = await fs.readFile(this.directory + "/txs.json");
34
- if (res != null) {
35
- const pendingTxs = JSON.parse(res.toString());
36
- for (let nonceStr in pendingTxs) {
37
- const nonceData = pendingTxs[nonceStr];
38
- const nonce = parseInt(nonceStr);
39
- if (this.confirmedNonce >= nonce)
40
- continue; //Already confirmed
41
- if (this.pendingNonce < nonce) {
42
- this.pendingNonce = nonce;
43
- }
44
- const parsedPendingTxns = nonceData.txs.map(ethers_1.Transaction.from);
45
- this.pendingTxs.set(nonce, {
46
- txs: parsedPendingTxns,
47
- lastBumped: nonceData.lastBumped
48
- });
49
- for (let tx of parsedPendingTxns) {
50
- this.chainInterface.Transactions._knownTxSet.add(tx.hash);
51
- }
52
- }
53
- }
54
- }
55
- async save() {
56
- const pendingTxs = {};
57
- for (let [nonce, data] of this.pendingTxs) {
58
- pendingTxs[nonce.toString(10)] = {
59
- lastBumped: data.lastBumped,
60
- txs: data.txs.map(tx => tx.serialized)
61
- };
62
- }
63
- const requiredSaveCount = ++this.saveCount;
64
- if (this.priorSavePromise != null) {
65
- await this.priorSavePromise;
66
- }
67
- if (requiredSaveCount === this.saveCount) {
68
- this.priorSavePromise = fs.writeFile(this.directory + "/txs.json", JSON.stringify(pendingTxs));
69
- await this.priorSavePromise;
70
- }
71
- }
72
- async checkPastTransactions() {
73
- let _gasPrice = null;
74
- let _safeBlockTxCount = null;
75
- for (let [nonce, data] of this.pendingTxs) {
76
- if (!data.sending && data.lastBumped < Date.now() - this.waitBeforeBump) {
77
- _safeBlockTxCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
78
- this.confirmedNonce = _safeBlockTxCount;
79
- if (_safeBlockTxCount > nonce) {
80
- this.pendingTxs.delete(nonce);
81
- data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
82
- this.logger.info("checkPastTransactions(): Tx confirmed, required fee bumps: ", data.txs.length);
83
- this.save();
84
- continue;
85
- }
86
- const lastTx = data.txs[data.txs.length - 1];
87
- if (_gasPrice == null) {
88
- const feeRate = await this.chainInterface.Fees.getFeeRate();
89
- const [baseFee, priorityFee] = feeRate.split(",");
90
- _gasPrice = {
91
- baseFee: BigInt(baseFee),
92
- priorityFee: BigInt(priorityFee)
93
- };
94
- }
95
- let priorityFee = lastTx.maxPriorityFeePerGas;
96
- let baseFee = lastTx.maxFeePerGas - lastTx.maxPriorityFeePerGas;
97
- baseFee = (0, Utils_1.bigIntMax)(_gasPrice.baseFee, this.minFeeIncreaseAbsolute + (baseFee * (1000000n + this.minFeeIncreasePpm) / 1000000n));
98
- priorityFee = (0, Utils_1.bigIntMax)(_gasPrice.priorityFee, this.minFeeIncreaseAbsolute + (priorityFee * (1000000n + this.minFeeIncreasePpm) / 1000000n));
99
- if (baseFee > (this.minFeeIncreaseAbsolute + (_gasPrice.baseFee * (1000000n + this.minFeeIncreasePpm) / 1000000n)) &&
100
- priorityFee > (this.minFeeIncreaseAbsolute + (_gasPrice.priorityFee * (1000000n + this.minFeeIncreasePpm) / 1000000n))) {
101
- //Too big of an increase over the current fee rate, don't fee bump
102
- this.logger.debug("checkPastTransactions(): Tx yet unconfirmed but not increasing fee for ", lastTx.hash);
103
- await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => {
104
- if (e.code === "NONCE_EXPIRED")
105
- return;
106
- this.logger.error("checkPastTransactions(): Tx re-broadcast error", e);
107
- });
108
- continue;
109
- }
110
- let newTx = lastTx.clone();
111
- EVMFees_1.EVMFees.applyFeeRate(newTx, null, baseFee.toString(10) + "," + priorityFee.toString(10));
112
- this.logger.info("checkPastTransactions(): Bump fee for tx: ", lastTx.hash);
113
- newTx.signature = null;
114
- const signedRawTx = await this.account.signTransaction(newTx);
115
- //Double check pending txns still has nonce after async signTransaction was called
116
- if (!this.pendingTxs.has(nonce))
117
- continue;
118
- newTx = ethers_1.Transaction.from(signedRawTx);
119
- for (let callback of this.chainInterface.Transactions._cbksBeforeTxReplace) {
120
- try {
121
- await callback(lastTx.serialized, lastTx.hash, signedRawTx, newTx.hash);
122
- }
123
- catch (e) {
124
- this.logger.error("checkPastTransactions(): beforeTxReplace callback error: ", e);
125
- }
126
- }
127
- data.txs.push(newTx);
128
- data.lastBumped = Date.now();
129
- this.save();
130
- this.chainInterface.Transactions._knownTxSet.add(newTx.hash);
131
- //TODO: Better error handling when sending tx
132
- await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => {
133
- if (e.code === "NONCE_EXPIRED")
134
- return;
135
- this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e);
136
- });
137
- }
138
- }
139
- }
140
- startFeeBumper() {
141
- let func;
142
- func = async () => {
143
- try {
144
- await this.checkPastTransactions();
145
- }
146
- catch (e) {
147
- this.logger.error("startFeeBumper(): Error when check past transactions: ", e);
148
- }
149
- if (this.stopped)
150
- return;
151
- this.feeBumper = setTimeout(func, 1000);
152
- };
153
- func();
154
- }
155
- async init() {
156
- try {
157
- await fs.mkdir(this.directory);
158
- }
159
- catch (e) { }
160
- const txCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
161
- this.confirmedNonce = txCount - 1;
162
- this.pendingNonce = txCount - 1;
163
- await this.load();
164
- this.startFeeBumper();
165
- }
166
- stop() {
167
- this.stopped = true;
168
- if (this.feeBumper != null) {
169
- clearTimeout(this.feeBumper);
170
- this.feeBumper = null;
171
- }
172
- return Promise.resolve();
173
- }
174
- sendTransaction(transaction, onBeforePublish) {
175
- return this.sendTransactionQueue.enqueue(async () => {
176
- if (transaction.nonce != null) {
177
- if (transaction.nonce !== this.pendingNonce + 1)
178
- throw new Error("Invalid transaction nonce!");
179
- this.pendingNonce++;
180
- }
181
- else {
182
- this.pendingNonce++;
183
- transaction.nonce = this.pendingNonce;
184
- }
185
- const tx = {};
186
- for (let key in transaction) {
187
- if (transaction[key] instanceof Promise) {
188
- tx[key] = await transaction[key];
189
- }
190
- else {
191
- tx[key] = transaction[key];
192
- }
193
- }
194
- const signedRawTx = await this.account.signTransaction(tx);
195
- const signedTx = ethers_1.Transaction.from(signedRawTx);
196
- if (onBeforePublish != null) {
197
- try {
198
- await onBeforePublish(signedTx.hash, signedRawTx);
199
- }
200
- catch (e) {
201
- this.logger.error("sendTransaction(): Error when calling onBeforePublish function: ", e);
202
- }
203
- }
204
- const pendingTxObject = { txs: [signedTx], lastBumped: Date.now(), sending: true };
205
- this.pendingTxs.set(transaction.nonce, pendingTxObject);
206
- this.save();
207
- this.chainInterface.Transactions._knownTxSet.add(signedTx.hash);
208
- try {
209
- const result = await this.chainInterface.provider.broadcastTransaction(signedRawTx);
210
- pendingTxObject.sending = false;
211
- return result;
212
- }
213
- catch (e) {
214
- this.chainInterface.Transactions._knownTxSet.delete(signedTx.hash);
215
- this.pendingTxs.delete(transaction.nonce);
216
- this.pendingNonce--;
217
- throw e;
218
- }
219
- });
220
- }
221
- }
222
- exports.EVMPersistentSigner = EVMPersistentSigner;
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EVMPersistentSigner = void 0;
4
+ const fs = require("fs/promises");
5
+ const ethers_1 = require("ethers");
6
+ const Utils_1 = require("../../utils/Utils");
7
+ const EVMFees_1 = require("../chain/modules/EVMFees");
8
+ const EVMSigner_1 = require("./EVMSigner");
9
+ const promise_queue_ts_1 = require("promise-queue-ts");
10
+ const WAIT_BEFORE_BUMP = 15 * 1000;
11
+ const MIN_FEE_INCREASE_ABSOLUTE = 1n * 1000000000n; //1GWei
12
+ const MIN_FEE_INCREASE_PPM = 100000n; // +10%
13
+ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
14
+ constructor(account, address, chainInterface, directory, minFeeIncreaseAbsolute, minFeeIncreasePpm, waitBeforeBumpMillis) {
15
+ super(account, address, true);
16
+ this.pendingTxs = new Map();
17
+ this.stopped = false;
18
+ this.saveCount = 0;
19
+ this.sendTransactionQueue = new promise_queue_ts_1.PromiseQueue();
20
+ this.signTransaction = null;
21
+ this.chainInterface = chainInterface;
22
+ this.directory = directory;
23
+ this.minFeeIncreaseAbsolute = minFeeIncreaseAbsolute ?? MIN_FEE_INCREASE_ABSOLUTE;
24
+ this.minFeeIncreasePpm = minFeeIncreasePpm ?? MIN_FEE_INCREASE_PPM;
25
+ this.waitBeforeBump = waitBeforeBumpMillis ?? WAIT_BEFORE_BUMP;
26
+ this.safeBlockTag = chainInterface.config.safeBlockTag;
27
+ this.logger = (0, Utils_1.getLogger)("EVMPersistentSigner(" + address + "): ");
28
+ }
29
+ async load() {
30
+ const fileExists = await fs.access(this.directory + "/txs.json", fs.constants.F_OK).then(() => true).catch(() => false);
31
+ if (!fileExists)
32
+ return;
33
+ const res = await fs.readFile(this.directory + "/txs.json");
34
+ if (res != null) {
35
+ const pendingTxs = JSON.parse(res.toString());
36
+ for (let nonceStr in pendingTxs) {
37
+ const nonceData = pendingTxs[nonceStr];
38
+ const nonce = parseInt(nonceStr);
39
+ if (this.confirmedNonce >= nonce)
40
+ continue; //Already confirmed
41
+ if (this.pendingNonce < nonce) {
42
+ this.pendingNonce = nonce;
43
+ }
44
+ const parsedPendingTxns = nonceData.txs.map(ethers_1.Transaction.from);
45
+ this.pendingTxs.set(nonce, {
46
+ txs: parsedPendingTxns,
47
+ lastBumped: nonceData.lastBumped
48
+ });
49
+ for (let tx of parsedPendingTxns) {
50
+ this.chainInterface.Transactions._knownTxSet.add(tx.hash);
51
+ }
52
+ }
53
+ }
54
+ }
55
+ async save() {
56
+ const pendingTxs = {};
57
+ for (let [nonce, data] of this.pendingTxs) {
58
+ pendingTxs[nonce.toString(10)] = {
59
+ lastBumped: data.lastBumped,
60
+ txs: data.txs.map(tx => tx.serialized)
61
+ };
62
+ }
63
+ const requiredSaveCount = ++this.saveCount;
64
+ if (this.priorSavePromise != null) {
65
+ await this.priorSavePromise;
66
+ }
67
+ if (requiredSaveCount === this.saveCount) {
68
+ this.priorSavePromise = fs.writeFile(this.directory + "/txs.json", JSON.stringify(pendingTxs));
69
+ await this.priorSavePromise;
70
+ }
71
+ }
72
+ async checkPastTransactions() {
73
+ let _gasPrice = null;
74
+ let _safeBlockTxCount = null;
75
+ for (let [nonce, data] of this.pendingTxs) {
76
+ if (!data.sending && data.lastBumped < Date.now() - this.waitBeforeBump) {
77
+ _safeBlockTxCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
78
+ this.confirmedNonce = _safeBlockTxCount;
79
+ if (_safeBlockTxCount > nonce) {
80
+ this.pendingTxs.delete(nonce);
81
+ data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
82
+ this.logger.info("checkPastTransactions(): Tx confirmed, required fee bumps: ", data.txs.length);
83
+ this.save();
84
+ continue;
85
+ }
86
+ const lastTx = data.txs[data.txs.length - 1];
87
+ if (_gasPrice == null) {
88
+ const feeRate = await this.chainInterface.Fees.getFeeRate();
89
+ const [baseFee, priorityFee] = feeRate.split(",");
90
+ _gasPrice = {
91
+ baseFee: BigInt(baseFee),
92
+ priorityFee: BigInt(priorityFee)
93
+ };
94
+ }
95
+ let priorityFee = lastTx.maxPriorityFeePerGas;
96
+ let baseFee = lastTx.maxFeePerGas - lastTx.maxPriorityFeePerGas;
97
+ baseFee = (0, Utils_1.bigIntMax)(_gasPrice.baseFee, this.minFeeIncreaseAbsolute + (baseFee * (1000000n + this.minFeeIncreasePpm) / 1000000n));
98
+ priorityFee = (0, Utils_1.bigIntMax)(_gasPrice.priorityFee, this.minFeeIncreaseAbsolute + (priorityFee * (1000000n + this.minFeeIncreasePpm) / 1000000n));
99
+ if (baseFee > (this.minFeeIncreaseAbsolute + (_gasPrice.baseFee * (1000000n + this.minFeeIncreasePpm) / 1000000n)) &&
100
+ priorityFee > (this.minFeeIncreaseAbsolute + (_gasPrice.priorityFee * (1000000n + this.minFeeIncreasePpm) / 1000000n))) {
101
+ //Too big of an increase over the current fee rate, don't fee bump
102
+ this.logger.debug("checkPastTransactions(): Tx yet unconfirmed but not increasing fee for ", lastTx.hash);
103
+ await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => {
104
+ if (e.code === "NONCE_EXPIRED")
105
+ return;
106
+ this.logger.error("checkPastTransactions(): Tx re-broadcast error", e);
107
+ });
108
+ continue;
109
+ }
110
+ let newTx = lastTx.clone();
111
+ EVMFees_1.EVMFees.applyFeeRate(newTx, null, baseFee.toString(10) + "," + priorityFee.toString(10));
112
+ this.logger.info("checkPastTransactions(): Bump fee for tx: ", lastTx.hash);
113
+ newTx.signature = null;
114
+ const signedRawTx = await this.account.signTransaction(newTx);
115
+ //Double check pending txns still has nonce after async signTransaction was called
116
+ if (!this.pendingTxs.has(nonce))
117
+ continue;
118
+ newTx = ethers_1.Transaction.from(signedRawTx);
119
+ for (let callback of this.chainInterface.Transactions._cbksBeforeTxReplace) {
120
+ try {
121
+ await callback(lastTx.serialized, lastTx.hash, signedRawTx, newTx.hash);
122
+ }
123
+ catch (e) {
124
+ this.logger.error("checkPastTransactions(): beforeTxReplace callback error: ", e);
125
+ }
126
+ }
127
+ data.txs.push(newTx);
128
+ data.lastBumped = Date.now();
129
+ this.save();
130
+ this.chainInterface.Transactions._knownTxSet.add(newTx.hash);
131
+ //TODO: Better error handling when sending tx
132
+ await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => {
133
+ if (e.code === "NONCE_EXPIRED")
134
+ return;
135
+ this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e);
136
+ });
137
+ }
138
+ }
139
+ }
140
+ startFeeBumper() {
141
+ let func;
142
+ func = async () => {
143
+ try {
144
+ await this.checkPastTransactions();
145
+ }
146
+ catch (e) {
147
+ this.logger.error("startFeeBumper(): Error when check past transactions: ", e);
148
+ }
149
+ if (this.stopped)
150
+ return;
151
+ this.feeBumper = setTimeout(func, 1000);
152
+ };
153
+ func();
154
+ }
155
+ async init() {
156
+ try {
157
+ await fs.mkdir(this.directory);
158
+ }
159
+ catch (e) { }
160
+ const txCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
161
+ this.confirmedNonce = txCount - 1;
162
+ this.pendingNonce = txCount - 1;
163
+ await this.load();
164
+ this.startFeeBumper();
165
+ }
166
+ stop() {
167
+ this.stopped = true;
168
+ if (this.feeBumper != null) {
169
+ clearTimeout(this.feeBumper);
170
+ this.feeBumper = null;
171
+ }
172
+ return Promise.resolve();
173
+ }
174
+ sendTransaction(transaction, onBeforePublish) {
175
+ return this.sendTransactionQueue.enqueue(async () => {
176
+ if (transaction.nonce != null) {
177
+ if (transaction.nonce !== this.pendingNonce + 1)
178
+ throw new Error("Invalid transaction nonce!");
179
+ this.pendingNonce++;
180
+ }
181
+ else {
182
+ this.pendingNonce++;
183
+ transaction.nonce = this.pendingNonce;
184
+ }
185
+ const tx = {};
186
+ for (let key in transaction) {
187
+ if (transaction[key] instanceof Promise) {
188
+ tx[key] = await transaction[key];
189
+ }
190
+ else {
191
+ tx[key] = transaction[key];
192
+ }
193
+ }
194
+ const signedRawTx = await this.account.signTransaction(tx);
195
+ const signedTx = ethers_1.Transaction.from(signedRawTx);
196
+ if (onBeforePublish != null) {
197
+ try {
198
+ await onBeforePublish(signedTx.hash, signedRawTx);
199
+ }
200
+ catch (e) {
201
+ this.logger.error("sendTransaction(): Error when calling onBeforePublish function: ", e);
202
+ }
203
+ }
204
+ const pendingTxObject = { txs: [signedTx], lastBumped: Date.now(), sending: true };
205
+ this.pendingTxs.set(transaction.nonce, pendingTxObject);
206
+ this.save();
207
+ this.chainInterface.Transactions._knownTxSet.add(signedTx.hash);
208
+ try {
209
+ const result = await this.chainInterface.provider.broadcastTransaction(signedRawTx);
210
+ pendingTxObject.sending = false;
211
+ return result;
212
+ }
213
+ catch (e) {
214
+ this.chainInterface.Transactions._knownTxSet.delete(signedTx.hash);
215
+ this.pendingTxs.delete(transaction.nonce);
216
+ this.pendingNonce--;
217
+ throw e;
218
+ }
219
+ });
220
+ }
221
+ }
222
+ exports.EVMPersistentSigner = EVMPersistentSigner;
@@ -1,11 +1,11 @@
1
- import { AbstractSigner } from "@atomiqlabs/base";
2
- import { Signer, TransactionRequest, TransactionResponse } from "ethers";
3
- export declare class EVMSigner implements AbstractSigner {
4
- account: Signer;
5
- readonly address: string;
6
- readonly isManagingNoncesInternally: boolean;
7
- constructor(account: Signer, address: string, isManagingNoncesInternally?: boolean);
8
- getAddress(): string;
9
- signTransaction?(transaction: TransactionRequest): Promise<string>;
10
- sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse>;
11
- }
1
+ import { AbstractSigner } from "@atomiqlabs/base";
2
+ import { Signer, TransactionRequest, TransactionResponse } from "ethers";
3
+ export declare class EVMSigner implements AbstractSigner {
4
+ account: Signer;
5
+ readonly address: string;
6
+ readonly isManagingNoncesInternally: boolean;
7
+ constructor(account: Signer, address: string, isManagingNoncesInternally?: boolean);
8
+ getAddress(): string;
9
+ signTransaction?(transaction: TransactionRequest): Promise<string>;
10
+ sendTransaction(transaction: TransactionRequest, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<TransactionResponse>;
11
+ }
@@ -1,24 +1,24 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EVMSigner = void 0;
4
- const ethers_1 = require("ethers");
5
- class EVMSigner {
6
- constructor(account, address, isManagingNoncesInternally = false) {
7
- this.account = account;
8
- this.address = address;
9
- this.isManagingNoncesInternally = isManagingNoncesInternally;
10
- }
11
- getAddress() {
12
- return this.address;
13
- }
14
- async signTransaction(transaction) {
15
- return this.account.signTransaction(transaction);
16
- }
17
- async sendTransaction(transaction, onBeforePublish) {
18
- const txResponse = await this.account.sendTransaction(transaction);
19
- if (onBeforePublish != null)
20
- await onBeforePublish(txResponse.hash, ethers_1.Transaction.from(txResponse).serialized);
21
- return txResponse;
22
- }
23
- }
24
- exports.EVMSigner = EVMSigner;
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EVMSigner = void 0;
4
+ const ethers_1 = require("ethers");
5
+ class EVMSigner {
6
+ constructor(account, address, isManagingNoncesInternally = false) {
7
+ this.account = account;
8
+ this.address = address;
9
+ this.isManagingNoncesInternally = isManagingNoncesInternally;
10
+ }
11
+ getAddress() {
12
+ return this.address;
13
+ }
14
+ async signTransaction(transaction) {
15
+ return this.account.signTransaction(transaction);
16
+ }
17
+ async sendTransaction(transaction, onBeforePublish) {
18
+ const txResponse = await this.account.sendTransaction(transaction);
19
+ if (onBeforePublish != null)
20
+ await onBeforePublish(txResponse.hash, ethers_1.Transaction.from(txResponse).serialized);
21
+ return txResponse;
22
+ }
23
+ }
24
+ exports.EVMSigner = EVMSigner;