@atomiqlabs/chain-evm 1.0.0-dev.38 → 1.0.0-dev.40

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 (167) hide show
  1. package/LICENSE +201 -201
  2. package/dist/chains/botanix/BotanixChainType.d.ts +13 -0
  3. package/dist/chains/botanix/BotanixChainType.js +2 -0
  4. package/dist/chains/botanix/BotanixInitializer.d.ts +30 -0
  5. package/dist/chains/botanix/BotanixInitializer.js +117 -0
  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 +127 -127
  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 +195 -195
  25. package/dist/evm/btcrelay/EVMBtcRelay.js +423 -423
  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 +73 -73
  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 +89 -89
  49. package/dist/evm/chain/modules/EVMTransactions.js +230 -230
  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 +67 -67
  58. package/dist/evm/events/EVMChainEventsBrowser.d.ts +86 -86
  59. package/dist/evm/events/EVMChainEventsBrowser.js +294 -294
  60. package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts +78 -78
  61. package/dist/evm/spv_swap/EVMSpvVaultContract.js +478 -478
  62. package/dist/evm/spv_swap/EVMSpvVaultData.d.ts +39 -39
  63. package/dist/evm/spv_swap/EVMSpvVaultData.js +180 -180
  64. package/dist/evm/spv_swap/EVMSpvWithdrawalData.d.ts +19 -19
  65. package/dist/evm/spv_swap/EVMSpvWithdrawalData.js +55 -55
  66. package/dist/evm/spv_swap/SpvVaultContractAbi.d.ts +91 -91
  67. package/dist/evm/spv_swap/SpvVaultContractAbi.js +849 -849
  68. package/dist/evm/spv_swap/SpvVaultContractTypechain.d.ts +450 -450
  69. package/dist/evm/spv_swap/SpvVaultContractTypechain.js +2 -2
  70. package/dist/evm/swaps/EVMSwapContract.d.ts +193 -193
  71. package/dist/evm/swaps/EVMSwapContract.js +378 -378
  72. package/dist/evm/swaps/EVMSwapData.d.ts +66 -66
  73. package/dist/evm/swaps/EVMSwapData.js +260 -260
  74. package/dist/evm/swaps/EVMSwapModule.d.ts +9 -9
  75. package/dist/evm/swaps/EVMSwapModule.js +11 -11
  76. package/dist/evm/swaps/EscrowManagerAbi.d.ts +120 -120
  77. package/dist/evm/swaps/EscrowManagerAbi.js +985 -985
  78. package/dist/evm/swaps/EscrowManagerTypechain.d.ts +475 -475
  79. package/dist/evm/swaps/EscrowManagerTypechain.js +2 -2
  80. package/dist/evm/swaps/handlers/IHandler.d.ts +13 -13
  81. package/dist/evm/swaps/handlers/IHandler.js +2 -2
  82. package/dist/evm/swaps/handlers/claim/ClaimHandlers.d.ts +10 -10
  83. package/dist/evm/swaps/handlers/claim/ClaimHandlers.js +13 -13
  84. package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.d.ts +20 -20
  85. package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.js +39 -39
  86. package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts +24 -24
  87. package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js +59 -59
  88. package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts +25 -25
  89. package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js +51 -51
  90. package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts +21 -21
  91. package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js +28 -28
  92. package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.d.ts +48 -48
  93. package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.js +63 -63
  94. package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.d.ts +17 -17
  95. package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.js +28 -28
  96. package/dist/evm/swaps/modules/EVMLpVault.d.ts +69 -69
  97. package/dist/evm/swaps/modules/EVMLpVault.js +134 -134
  98. package/dist/evm/swaps/modules/EVMSwapClaim.d.ts +54 -54
  99. package/dist/evm/swaps/modules/EVMSwapClaim.js +137 -137
  100. package/dist/evm/swaps/modules/EVMSwapInit.d.ts +88 -88
  101. package/dist/evm/swaps/modules/EVMSwapInit.js +274 -274
  102. package/dist/evm/swaps/modules/EVMSwapRefund.d.ts +62 -62
  103. package/dist/evm/swaps/modules/EVMSwapRefund.js +167 -167
  104. package/dist/evm/typechain/common.d.ts +50 -50
  105. package/dist/evm/typechain/common.js +2 -2
  106. package/dist/evm/wallet/EVMSigner.d.ts +10 -10
  107. package/dist/evm/wallet/EVMSigner.js +17 -17
  108. package/dist/index.d.ts +40 -38
  109. package/dist/index.js +56 -54
  110. package/dist/utils/Utils.d.ts +15 -15
  111. package/dist/utils/Utils.js +71 -71
  112. package/package.json +37 -37
  113. package/src/chains/botanix/BotanixChainType.ts +28 -0
  114. package/src/chains/botanix/BotanixInitializer.ts +164 -0
  115. package/src/chains/citrea/CitreaBtcRelay.ts +57 -57
  116. package/src/chains/citrea/CitreaChainType.ts +28 -28
  117. package/src/chains/citrea/CitreaFees.ts +77 -77
  118. package/src/chains/citrea/CitreaInitializer.ts +178 -178
  119. package/src/chains/citrea/CitreaSpvVaultContract.ts +75 -75
  120. package/src/chains/citrea/CitreaSwapContract.ts +102 -102
  121. package/src/chains/citrea/CitreaTokens.ts +21 -21
  122. package/src/evm/btcrelay/BtcRelayAbi.ts +258 -258
  123. package/src/evm/btcrelay/BtcRelayTypechain.ts +371 -371
  124. package/src/evm/btcrelay/EVMBtcRelay.ts +522 -522
  125. package/src/evm/btcrelay/headers/EVMBtcHeader.ts +109 -109
  126. package/src/evm/btcrelay/headers/EVMBtcStoredHeader.ts +152 -152
  127. package/src/evm/chain/EVMChainInterface.ts +155 -155
  128. package/src/evm/chain/EVMModule.ts +21 -21
  129. package/src/evm/chain/modules/ERC20Abi.ts +222 -222
  130. package/src/evm/chain/modules/EVMAddresses.ts +28 -28
  131. package/src/evm/chain/modules/EVMBlocks.ts +75 -75
  132. package/src/evm/chain/modules/EVMEvents.ts +139 -139
  133. package/src/evm/chain/modules/EVMFees.ts +104 -104
  134. package/src/evm/chain/modules/EVMSignatures.ts +76 -76
  135. package/src/evm/chain/modules/EVMTokens.ts +155 -155
  136. package/src/evm/chain/modules/EVMTransactions.ts +257 -257
  137. package/src/evm/contract/EVMContractBase.ts +63 -63
  138. package/src/evm/contract/EVMContractModule.ts +16 -16
  139. package/src/evm/contract/modules/EVMContractEvents.ts +102 -102
  140. package/src/evm/events/EVMChainEvents.ts +81 -81
  141. package/src/evm/events/EVMChainEventsBrowser.ts +390 -390
  142. package/src/evm/spv_swap/EVMSpvVaultContract.ts +608 -608
  143. package/src/evm/spv_swap/EVMSpvVaultData.ts +224 -224
  144. package/src/evm/spv_swap/EVMSpvWithdrawalData.ts +70 -70
  145. package/src/evm/spv_swap/SpvVaultContractAbi.ts +846 -846
  146. package/src/evm/spv_swap/SpvVaultContractTypechain.ts +685 -685
  147. package/src/evm/swaps/EVMSwapContract.ts +600 -600
  148. package/src/evm/swaps/EVMSwapData.ts +378 -378
  149. package/src/evm/swaps/EVMSwapModule.ts +16 -16
  150. package/src/evm/swaps/EscrowManagerAbi.ts +982 -982
  151. package/src/evm/swaps/EscrowManagerTypechain.ts +723 -723
  152. package/src/evm/swaps/handlers/IHandler.ts +17 -17
  153. package/src/evm/swaps/handlers/claim/ClaimHandlers.ts +20 -20
  154. package/src/evm/swaps/handlers/claim/HashlockClaimHandler.ts +46 -46
  155. package/src/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.ts +82 -82
  156. package/src/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.ts +76 -76
  157. package/src/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.ts +46 -46
  158. package/src/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts +115 -115
  159. package/src/evm/swaps/handlers/refund/TimelockRefundHandler.ts +37 -37
  160. package/src/evm/swaps/modules/EVMLpVault.ts +154 -154
  161. package/src/evm/swaps/modules/EVMSwapClaim.ts +172 -172
  162. package/src/evm/swaps/modules/EVMSwapInit.ts +328 -328
  163. package/src/evm/swaps/modules/EVMSwapRefund.ts +229 -229
  164. package/src/evm/typechain/common.ts +131 -131
  165. package/src/evm/wallet/EVMSigner.ts +25 -25
  166. package/src/index.ts +48 -45
  167. package/src/utils/Utils.ts +81 -81
@@ -1,230 +1,230 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EVMTransactions = void 0;
4
- const EVMModule_1 = require("../EVMModule");
5
- const ethers_1 = require("ethers");
6
- const Utils_1 = require("../../../utils/Utils");
7
- class EVMTransactions extends EVMModule_1.EVMModule {
8
- constructor() {
9
- super(...arguments);
10
- this.latestConfirmedNonces = {};
11
- }
12
- /**
13
- * Waits for transaction confirmation using WS subscription and occasional HTTP polling, also re-sends
14
- * the transaction at regular interval
15
- *
16
- * @param tx EVM transaction to wait for confirmation for
17
- * @param abortSignal signal to abort waiting for tx confirmation
18
- * @private
19
- */
20
- async confirmTransaction(tx, abortSignal) {
21
- let state = "pending";
22
- while (state === "pending" || state === "not_found") {
23
- await (0, Utils_1.timeoutPromise)(3000, abortSignal);
24
- state = await this.getTxIdStatus(tx.hash);
25
- //Don't re-send transactions
26
- // if(state==="not_found") await this.sendSignedTransaction(tx).catch(e => {
27
- // if(e.baseError?.code === 59) return; //Transaction already in the mempool
28
- // this.logger.error("confirmTransaction(): Error on transaction re-send: ", e);
29
- // });
30
- }
31
- const nextAccountNonce = tx.nonce + 1;
32
- const currentNonce = this.latestConfirmedNonces[tx.from];
33
- if (currentNonce == null || nextAccountNonce > currentNonce) {
34
- this.latestConfirmedNonces[tx.from] = nextAccountNonce;
35
- }
36
- if (state === "reverted")
37
- throw new Error("Transaction reverted!");
38
- }
39
- /**
40
- * Prepares starknet transactions, checks if the account is deployed, assigns nonces if needed & calls beforeTxSigned callback
41
- *
42
- * @param signer
43
- * @param txs
44
- * @private
45
- */
46
- async prepareTransactions(signer, txs) {
47
- let nonce = (await signer.getNonce()) ?? await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
48
- const latestConfirmedNonce = this.latestConfirmedNonces[signer.getAddress()];
49
- if (latestConfirmedNonce != null && latestConfirmedNonce > nonce) {
50
- this.logger.debug("prepareTransactions(): Using nonce from local cache!");
51
- nonce = latestConfirmedNonce;
52
- }
53
- for (let i = 0; i < txs.length; i++) {
54
- const tx = txs[i];
55
- tx.chainId = this.root.evmChainId;
56
- tx.from = signer.getAddress();
57
- if (tx.nonce != null)
58
- nonce = tx.nonce; //Take the nonce from last tx
59
- if (nonce == null)
60
- nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
61
- if (tx.nonce == null)
62
- tx.nonce = nonce;
63
- this.logger.debug("sendAndConfirm(): transaction prepared (" + (i + 1) + "/" + txs.length + "), nonce: " + tx.nonce);
64
- nonce++;
65
- if (this.cbkBeforeTxSigned != null)
66
- await this.cbkBeforeTxSigned(tx);
67
- }
68
- }
69
- /**
70
- * Sends out a signed transaction to the RPC
71
- *
72
- * @param tx EVM tx to send
73
- * @param onBeforePublish a callback called before every transaction is published
74
- * @private
75
- */
76
- async sendSignedTransaction(tx, onBeforePublish) {
77
- if (onBeforePublish != null)
78
- await onBeforePublish(tx.hash, await this.serializeTx(tx));
79
- this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.hash);
80
- const serializedTx = tx.serialized;
81
- let result;
82
- if (this.cbkSendTransaction != null)
83
- result = await this.cbkSendTransaction(serializedTx);
84
- if (result == null) {
85
- const broadcastResult = await this.provider.broadcastTransaction(tx.serialized);
86
- result = broadcastResult.hash;
87
- }
88
- this.logger.info("sendSignedTransaction(): tx sent, txHash: " + result);
89
- return result;
90
- }
91
- /**
92
- * Prepares, signs, sends (in parallel or sequentially) & optionally waits for confirmation
93
- * of a batch of EVM transactions
94
- *
95
- * @param signer
96
- * @param txs transactions to send
97
- * @param waitForConfirmation whether to wait for transaction confirmations (this also makes sure the transactions
98
- * are re-sent at regular intervals)
99
- * @param abortSignal abort signal to abort waiting for transaction confirmations
100
- * @param parallel whether the send all the transaction at once in parallel or sequentially (such that transactions
101
- * are executed in order)
102
- * @param onBeforePublish a callback called before every transaction is published, NOTE: callback is not called when using browser-based wallet!
103
- */
104
- async sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
105
- await this.prepareTransactions(signer, txs);
106
- const signedTxs = [];
107
- //Don't separate the signing process from the sending when using browser-based wallet
108
- if (!signer.isBrowserWallet)
109
- for (let i = 0; i < txs.length; i++) {
110
- const tx = txs[i];
111
- const signedTx = ethers_1.Transaction.from(await signer.account.signTransaction(tx));
112
- signedTxs.push(signedTx);
113
- this.logger.debug("sendAndConfirm(): transaction signed (" + (i + 1) + "/" + txs.length + "): " + signedTx);
114
- }
115
- this.logger.debug("sendAndConfirm(): sending transactions, count: " + txs.length +
116
- " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
117
- const txIds = [];
118
- if (parallel) {
119
- const promises = [];
120
- for (let i = 0; i < signedTxs.length; i++) {
121
- let tx;
122
- if (signer.isBrowserWallet) {
123
- tx = await signer.account.sendTransaction(txs[i]);
124
- }
125
- else {
126
- const signedTx = signedTxs[i];
127
- await this.sendSignedTransaction(signedTx, onBeforePublish);
128
- tx = signedTx;
129
- }
130
- if (waitForConfirmation)
131
- promises.push(this.confirmTransaction(tx, abortSignal));
132
- txIds.push(tx.hash);
133
- this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + tx.hash);
134
- }
135
- if (promises.length > 0)
136
- await Promise.all(promises);
137
- }
138
- else {
139
- for (let i = 0; i < signedTxs.length; i++) {
140
- let tx;
141
- if (signer.isBrowserWallet) {
142
- tx = await signer.account.sendTransaction(txs[i]);
143
- }
144
- else {
145
- const signedTx = signedTxs[i];
146
- await this.sendSignedTransaction(signedTx, onBeforePublish);
147
- tx = signedTx;
148
- }
149
- const confirmPromise = this.confirmTransaction(tx, abortSignal);
150
- this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + txs.length + "): " + tx.hash);
151
- //Don't await the last promise when !waitForConfirmation
152
- if (i < txs.length - 1 || waitForConfirmation)
153
- await confirmPromise;
154
- txIds.push(tx.hash);
155
- }
156
- }
157
- this.logger.info("sendAndConfirm(): sent transactions, count: " + txs.length +
158
- " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
159
- return txIds;
160
- }
161
- /**
162
- * Serializes the signed EVM transaction
163
- *
164
- * @param tx
165
- */
166
- serializeTx(tx) {
167
- return Promise.resolve(tx.serialized);
168
- }
169
- /**
170
- * Deserializes signed EVM transaction
171
- *
172
- * @param txData
173
- */
174
- deserializeTx(txData) {
175
- return Promise.resolve(ethers_1.Transaction.from(txData));
176
- }
177
- /**
178
- * Gets the status of the raw starknet transaction
179
- *
180
- * @param tx
181
- */
182
- async getTxStatus(tx) {
183
- const parsedTx = await this.deserializeTx(tx);
184
- return await this.getTxIdStatus(parsedTx.hash);
185
- }
186
- /**
187
- * Gets the status of the starknet transaction with a specific txId
188
- *
189
- * @param txId
190
- */
191
- async getTxIdStatus(txId) {
192
- const txResponse = await this.provider.getTransaction(txId);
193
- if (txResponse == null)
194
- return "not_found";
195
- if (txResponse.blockHash == null)
196
- return "pending";
197
- const [safeBlockNumber, txReceipt] = await Promise.all([
198
- this.root.config.safeBlockTag === "latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
199
- this.provider.getTransactionReceipt(txId)
200
- ]);
201
- if (txReceipt == null || (safeBlockNumber != null && txReceipt.blockNumber < safeBlockNumber))
202
- return "pending";
203
- if (txReceipt.status === 0)
204
- return "reverted";
205
- return "success";
206
- }
207
- onBeforeTxSigned(callback) {
208
- this.cbkBeforeTxSigned = callback;
209
- }
210
- offBeforeTxSigned(callback) {
211
- this.cbkBeforeTxSigned = null;
212
- return true;
213
- }
214
- onSendTransaction(callback) {
215
- this.cbkSendTransaction = callback;
216
- }
217
- offSendTransaction(callback) {
218
- this.cbkSendTransaction = null;
219
- return true;
220
- }
221
- traceTransaction(txId) {
222
- return this.provider.send("debug_traceTransaction", [
223
- txId,
224
- {
225
- tracer: "callTracer"
226
- }
227
- ]);
228
- }
229
- }
230
- exports.EVMTransactions = EVMTransactions;
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EVMTransactions = void 0;
4
+ const EVMModule_1 = require("../EVMModule");
5
+ const ethers_1 = require("ethers");
6
+ const Utils_1 = require("../../../utils/Utils");
7
+ class EVMTransactions extends EVMModule_1.EVMModule {
8
+ constructor() {
9
+ super(...arguments);
10
+ this.latestConfirmedNonces = {};
11
+ }
12
+ /**
13
+ * Waits for transaction confirmation using WS subscription and occasional HTTP polling, also re-sends
14
+ * the transaction at regular interval
15
+ *
16
+ * @param tx EVM transaction to wait for confirmation for
17
+ * @param abortSignal signal to abort waiting for tx confirmation
18
+ * @private
19
+ */
20
+ async confirmTransaction(tx, abortSignal) {
21
+ let state = "pending";
22
+ while (state === "pending" || state === "not_found") {
23
+ await (0, Utils_1.timeoutPromise)(3000, abortSignal);
24
+ state = await this.getTxIdStatus(tx.hash);
25
+ //Don't re-send transactions
26
+ // if(state==="not_found") await this.sendSignedTransaction(tx).catch(e => {
27
+ // if(e.baseError?.code === 59) return; //Transaction already in the mempool
28
+ // this.logger.error("confirmTransaction(): Error on transaction re-send: ", e);
29
+ // });
30
+ }
31
+ const nextAccountNonce = tx.nonce + 1;
32
+ const currentNonce = this.latestConfirmedNonces[tx.from];
33
+ if (currentNonce == null || nextAccountNonce > currentNonce) {
34
+ this.latestConfirmedNonces[tx.from] = nextAccountNonce;
35
+ }
36
+ if (state === "reverted")
37
+ throw new Error("Transaction reverted!");
38
+ }
39
+ /**
40
+ * Prepares starknet transactions, checks if the account is deployed, assigns nonces if needed & calls beforeTxSigned callback
41
+ *
42
+ * @param signer
43
+ * @param txs
44
+ * @private
45
+ */
46
+ async prepareTransactions(signer, txs) {
47
+ let nonce = (await signer.getNonce()) ?? await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
48
+ const latestConfirmedNonce = this.latestConfirmedNonces[signer.getAddress()];
49
+ if (latestConfirmedNonce != null && latestConfirmedNonce > nonce) {
50
+ this.logger.debug("prepareTransactions(): Using nonce from local cache!");
51
+ nonce = latestConfirmedNonce;
52
+ }
53
+ for (let i = 0; i < txs.length; i++) {
54
+ const tx = txs[i];
55
+ tx.chainId = this.root.evmChainId;
56
+ tx.from = signer.getAddress();
57
+ if (tx.nonce != null)
58
+ nonce = tx.nonce; //Take the nonce from last tx
59
+ if (nonce == null)
60
+ nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
61
+ if (tx.nonce == null)
62
+ tx.nonce = nonce;
63
+ this.logger.debug("sendAndConfirm(): transaction prepared (" + (i + 1) + "/" + txs.length + "), nonce: " + tx.nonce);
64
+ nonce++;
65
+ if (this.cbkBeforeTxSigned != null)
66
+ await this.cbkBeforeTxSigned(tx);
67
+ }
68
+ }
69
+ /**
70
+ * Sends out a signed transaction to the RPC
71
+ *
72
+ * @param tx EVM tx to send
73
+ * @param onBeforePublish a callback called before every transaction is published
74
+ * @private
75
+ */
76
+ async sendSignedTransaction(tx, onBeforePublish) {
77
+ if (onBeforePublish != null)
78
+ await onBeforePublish(tx.hash, await this.serializeTx(tx));
79
+ this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.hash);
80
+ const serializedTx = tx.serialized;
81
+ let result;
82
+ if (this.cbkSendTransaction != null)
83
+ result = await this.cbkSendTransaction(serializedTx);
84
+ if (result == null) {
85
+ const broadcastResult = await this.provider.broadcastTransaction(tx.serialized);
86
+ result = broadcastResult.hash;
87
+ }
88
+ this.logger.info("sendSignedTransaction(): tx sent, txHash: " + result);
89
+ return result;
90
+ }
91
+ /**
92
+ * Prepares, signs, sends (in parallel or sequentially) & optionally waits for confirmation
93
+ * of a batch of EVM transactions
94
+ *
95
+ * @param signer
96
+ * @param txs transactions to send
97
+ * @param waitForConfirmation whether to wait for transaction confirmations (this also makes sure the transactions
98
+ * are re-sent at regular intervals)
99
+ * @param abortSignal abort signal to abort waiting for transaction confirmations
100
+ * @param parallel whether the send all the transaction at once in parallel or sequentially (such that transactions
101
+ * are executed in order)
102
+ * @param onBeforePublish a callback called before every transaction is published, NOTE: callback is not called when using browser-based wallet!
103
+ */
104
+ async sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
105
+ await this.prepareTransactions(signer, txs);
106
+ const signedTxs = [];
107
+ //Don't separate the signing process from the sending when using browser-based wallet
108
+ if (!signer.isBrowserWallet)
109
+ for (let i = 0; i < txs.length; i++) {
110
+ const tx = txs[i];
111
+ const signedTx = ethers_1.Transaction.from(await signer.account.signTransaction(tx));
112
+ signedTxs.push(signedTx);
113
+ this.logger.debug("sendAndConfirm(): transaction signed (" + (i + 1) + "/" + txs.length + "): " + signedTx);
114
+ }
115
+ this.logger.debug("sendAndConfirm(): sending transactions, count: " + txs.length +
116
+ " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
117
+ const txIds = [];
118
+ if (parallel) {
119
+ const promises = [];
120
+ for (let i = 0; i < signedTxs.length; i++) {
121
+ let tx;
122
+ if (signer.isBrowserWallet) {
123
+ tx = await signer.account.sendTransaction(txs[i]);
124
+ }
125
+ else {
126
+ const signedTx = signedTxs[i];
127
+ await this.sendSignedTransaction(signedTx, onBeforePublish);
128
+ tx = signedTx;
129
+ }
130
+ if (waitForConfirmation)
131
+ promises.push(this.confirmTransaction(tx, abortSignal));
132
+ txIds.push(tx.hash);
133
+ this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + tx.hash);
134
+ }
135
+ if (promises.length > 0)
136
+ await Promise.all(promises);
137
+ }
138
+ else {
139
+ for (let i = 0; i < signedTxs.length; i++) {
140
+ let tx;
141
+ if (signer.isBrowserWallet) {
142
+ tx = await signer.account.sendTransaction(txs[i]);
143
+ }
144
+ else {
145
+ const signedTx = signedTxs[i];
146
+ await this.sendSignedTransaction(signedTx, onBeforePublish);
147
+ tx = signedTx;
148
+ }
149
+ const confirmPromise = this.confirmTransaction(tx, abortSignal);
150
+ this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + txs.length + "): " + tx.hash);
151
+ //Don't await the last promise when !waitForConfirmation
152
+ if (i < txs.length - 1 || waitForConfirmation)
153
+ await confirmPromise;
154
+ txIds.push(tx.hash);
155
+ }
156
+ }
157
+ this.logger.info("sendAndConfirm(): sent transactions, count: " + txs.length +
158
+ " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
159
+ return txIds;
160
+ }
161
+ /**
162
+ * Serializes the signed EVM transaction
163
+ *
164
+ * @param tx
165
+ */
166
+ serializeTx(tx) {
167
+ return Promise.resolve(tx.serialized);
168
+ }
169
+ /**
170
+ * Deserializes signed EVM transaction
171
+ *
172
+ * @param txData
173
+ */
174
+ deserializeTx(txData) {
175
+ return Promise.resolve(ethers_1.Transaction.from(txData));
176
+ }
177
+ /**
178
+ * Gets the status of the raw starknet transaction
179
+ *
180
+ * @param tx
181
+ */
182
+ async getTxStatus(tx) {
183
+ const parsedTx = await this.deserializeTx(tx);
184
+ return await this.getTxIdStatus(parsedTx.hash);
185
+ }
186
+ /**
187
+ * Gets the status of the starknet transaction with a specific txId
188
+ *
189
+ * @param txId
190
+ */
191
+ async getTxIdStatus(txId) {
192
+ const txResponse = await this.provider.getTransaction(txId);
193
+ if (txResponse == null)
194
+ return "not_found";
195
+ if (txResponse.blockHash == null)
196
+ return "pending";
197
+ const [safeBlockNumber, txReceipt] = await Promise.all([
198
+ this.root.config.safeBlockTag === "latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
199
+ this.provider.getTransactionReceipt(txId)
200
+ ]);
201
+ if (txReceipt == null || (safeBlockNumber != null && txReceipt.blockNumber < safeBlockNumber))
202
+ return "pending";
203
+ if (txReceipt.status === 0)
204
+ return "reverted";
205
+ return "success";
206
+ }
207
+ onBeforeTxSigned(callback) {
208
+ this.cbkBeforeTxSigned = callback;
209
+ }
210
+ offBeforeTxSigned(callback) {
211
+ this.cbkBeforeTxSigned = null;
212
+ return true;
213
+ }
214
+ onSendTransaction(callback) {
215
+ this.cbkSendTransaction = callback;
216
+ }
217
+ offSendTransaction(callback) {
218
+ this.cbkSendTransaction = null;
219
+ return true;
220
+ }
221
+ traceTransaction(txId) {
222
+ return this.provider.send("debug_traceTransaction", [
223
+ txId,
224
+ {
225
+ tracer: "callTracer"
226
+ }
227
+ ]);
228
+ }
229
+ }
230
+ exports.EVMTransactions = EVMTransactions;
@@ -1,22 +1,22 @@
1
- import { BaseContract, Log, TransactionDescription } from "ethers";
2
- import { EVMChainInterface } from "../chain/EVMChainInterface";
3
- import { EVMContractEvents } from "./modules/EVMContractEvents";
4
- import { TypedContractMethod, TypedEventLog } from "../typechain/common";
5
- type __TypechainOutputObject<T> = T extends TypedContractMethod<infer V> ? V : never;
6
- export interface TypedFunctionCall<TCMethod extends TypedContractMethod> extends Omit<TransactionDescription, "args"> {
7
- args: __TypechainOutputObject<TCMethod>;
8
- }
9
- /**
10
- * Base class providing program specific utilities
11
- */
12
- export declare class EVMContractBase<T extends BaseContract> {
13
- contract: T;
14
- readonly Events: EVMContractEvents<T>;
15
- readonly Chain: EVMChainInterface<any>;
16
- readonly contractAddress: string;
17
- readonly contractDeploymentHeight: number;
18
- constructor(chainInterface: EVMChainInterface<any>, contractAddress: string, contractAbi: any, contractDeploymentHeight?: number);
19
- toTypedEvent<TEventName extends keyof T["filters"] = keyof T["filters"]>(log: Log): TypedEventLog<T["filters"][TEventName]>;
20
- parseCalldata<TMethod extends TypedContractMethod>(calldata: string): TypedFunctionCall<TMethod>;
21
- }
22
- export {};
1
+ import { BaseContract, Log, TransactionDescription } from "ethers";
2
+ import { EVMChainInterface } from "../chain/EVMChainInterface";
3
+ import { EVMContractEvents } from "./modules/EVMContractEvents";
4
+ import { TypedContractMethod, TypedEventLog } from "../typechain/common";
5
+ type __TypechainOutputObject<T> = T extends TypedContractMethod<infer V> ? V : never;
6
+ export interface TypedFunctionCall<TCMethod extends TypedContractMethod> extends Omit<TransactionDescription, "args"> {
7
+ args: __TypechainOutputObject<TCMethod>;
8
+ }
9
+ /**
10
+ * Base class providing program specific utilities
11
+ */
12
+ export declare class EVMContractBase<T extends BaseContract> {
13
+ contract: T;
14
+ readonly Events: EVMContractEvents<T>;
15
+ readonly Chain: EVMChainInterface<any>;
16
+ readonly contractAddress: string;
17
+ readonly contractDeploymentHeight: number;
18
+ constructor(chainInterface: EVMChainInterface<any>, contractAddress: string, contractAbi: any, contractDeploymentHeight?: number);
19
+ toTypedEvent<TEventName extends keyof T["filters"] = keyof T["filters"]>(log: Log): TypedEventLog<T["filters"][TEventName]>;
20
+ parseCalldata<TMethod extends TypedContractMethod>(calldata: string): TypedFunctionCall<TMethod>;
21
+ }
22
+ export {};
@@ -1,34 +1,34 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EVMContractBase = void 0;
4
- const ethers_1 = require("ethers");
5
- const EVMContractEvents_1 = require("./modules/EVMContractEvents");
6
- /**
7
- * Base class providing program specific utilities
8
- */
9
- class EVMContractBase {
10
- constructor(chainInterface, contractAddress, contractAbi, contractDeploymentHeight) {
11
- this.Chain = chainInterface;
12
- this.contract = new ethers_1.Contract(contractAddress, contractAbi, chainInterface.provider);
13
- this.Events = new EVMContractEvents_1.EVMContractEvents(chainInterface, this);
14
- this.contractAddress = contractAddress;
15
- this.contractDeploymentHeight = contractDeploymentHeight;
16
- }
17
- toTypedEvent(log) {
18
- let foundFragment;
19
- try {
20
- foundFragment = this.contract.interface.getEvent(log.topics[0]);
21
- }
22
- catch (error) { }
23
- if (!foundFragment)
24
- return null;
25
- try {
26
- return new ethers_1.EventLog(log, this.contract.interface, foundFragment);
27
- }
28
- catch (error) { }
29
- }
30
- parseCalldata(calldata) {
31
- return this.contract.interface.parseTransaction({ data: calldata });
32
- }
33
- }
34
- exports.EVMContractBase = EVMContractBase;
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EVMContractBase = void 0;
4
+ const ethers_1 = require("ethers");
5
+ const EVMContractEvents_1 = require("./modules/EVMContractEvents");
6
+ /**
7
+ * Base class providing program specific utilities
8
+ */
9
+ class EVMContractBase {
10
+ constructor(chainInterface, contractAddress, contractAbi, contractDeploymentHeight) {
11
+ this.Chain = chainInterface;
12
+ this.contract = new ethers_1.Contract(contractAddress, contractAbi, chainInterface.provider);
13
+ this.Events = new EVMContractEvents_1.EVMContractEvents(chainInterface, this);
14
+ this.contractAddress = contractAddress;
15
+ this.contractDeploymentHeight = contractDeploymentHeight;
16
+ }
17
+ toTypedEvent(log) {
18
+ let foundFragment;
19
+ try {
20
+ foundFragment = this.contract.interface.getEvent(log.topics[0]);
21
+ }
22
+ catch (error) { }
23
+ if (!foundFragment)
24
+ return null;
25
+ try {
26
+ return new ethers_1.EventLog(log, this.contract.interface, foundFragment);
27
+ }
28
+ catch (error) { }
29
+ }
30
+ parseCalldata(calldata) {
31
+ return this.contract.interface.parseTransaction({ data: calldata });
32
+ }
33
+ }
34
+ exports.EVMContractBase = EVMContractBase;
@@ -1,8 +1,8 @@
1
- import { BaseContract } from "ethers";
2
- import { EVMModule } from "../chain/EVMModule";
3
- import { EVMChainInterface } from "../chain/EVMChainInterface";
4
- import { EVMContractBase } from "./EVMContractBase";
5
- export declare class EVMContractModule<T extends BaseContract> extends EVMModule<any> {
6
- readonly contract: EVMContractBase<T>;
7
- constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>);
8
- }
1
+ import { BaseContract } from "ethers";
2
+ import { EVMModule } from "../chain/EVMModule";
3
+ import { EVMChainInterface } from "../chain/EVMChainInterface";
4
+ import { EVMContractBase } from "./EVMContractBase";
5
+ export declare class EVMContractModule<T extends BaseContract> extends EVMModule<any> {
6
+ readonly contract: EVMContractBase<T>;
7
+ constructor(chainInterface: EVMChainInterface<any>, contract: EVMContractBase<T>);
8
+ }
@@ -1,11 +1,11 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EVMContractModule = void 0;
4
- const EVMModule_1 = require("../chain/EVMModule");
5
- class EVMContractModule extends EVMModule_1.EVMModule {
6
- constructor(chainInterface, contract) {
7
- super(chainInterface);
8
- this.contract = contract;
9
- }
10
- }
11
- exports.EVMContractModule = EVMContractModule;
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EVMContractModule = void 0;
4
+ const EVMModule_1 = require("../chain/EVMModule");
5
+ class EVMContractModule extends EVMModule_1.EVMModule {
6
+ constructor(chainInterface, contract) {
7
+ super(chainInterface);
8
+ this.contract = contract;
9
+ }
10
+ }
11
+ exports.EVMContractModule = EVMContractModule;