@atomiqlabs/chain-evm 1.0.0-dev.35 → 1.0.0-dev.36
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/LICENSE +201 -201
- package/dist/chains/citrea/CitreaBtcRelay.d.ts +21 -21
- package/dist/chains/citrea/CitreaBtcRelay.js +43 -43
- package/dist/chains/citrea/CitreaChainType.d.ts +13 -13
- package/dist/chains/citrea/CitreaChainType.js +2 -2
- package/dist/chains/citrea/CitreaFees.d.ts +29 -29
- package/dist/chains/citrea/CitreaFees.js +67 -67
- package/dist/chains/citrea/CitreaInitializer.d.ts +30 -30
- package/dist/chains/citrea/CitreaInitializer.js +127 -127
- package/dist/chains/citrea/CitreaSpvVaultContract.d.ts +15 -15
- package/dist/chains/citrea/CitreaSpvVaultContract.js +74 -74
- package/dist/chains/citrea/CitreaSwapContract.d.ts +22 -22
- package/dist/chains/citrea/CitreaSwapContract.js +96 -96
- package/dist/chains/citrea/CitreaTokens.d.ts +9 -9
- package/dist/chains/citrea/CitreaTokens.js +20 -20
- package/dist/evm/btcrelay/BtcRelayAbi.d.ts +198 -198
- package/dist/evm/btcrelay/BtcRelayAbi.js +261 -261
- package/dist/evm/btcrelay/BtcRelayTypechain.d.ts +172 -172
- package/dist/evm/btcrelay/BtcRelayTypechain.js +2 -2
- package/dist/evm/btcrelay/EVMBtcRelay.d.ts +195 -195
- package/dist/evm/btcrelay/EVMBtcRelay.js +423 -423
- package/dist/evm/btcrelay/headers/EVMBtcHeader.d.ts +33 -33
- package/dist/evm/btcrelay/headers/EVMBtcHeader.js +84 -84
- package/dist/evm/btcrelay/headers/EVMBtcStoredHeader.d.ts +56 -56
- package/dist/evm/btcrelay/headers/EVMBtcStoredHeader.js +123 -123
- package/dist/evm/chain/EVMChainInterface.d.ts +51 -51
- package/dist/evm/chain/EVMChainInterface.js +89 -89
- package/dist/evm/chain/EVMModule.d.ts +9 -9
- package/dist/evm/chain/EVMModule.js +13 -13
- package/dist/evm/chain/modules/ERC20Abi.d.ts +168 -168
- package/dist/evm/chain/modules/ERC20Abi.js +225 -225
- package/dist/evm/chain/modules/EVMAddresses.d.ts +10 -10
- package/dist/evm/chain/modules/EVMAddresses.js +30 -30
- package/dist/evm/chain/modules/EVMBlocks.d.ts +20 -20
- package/dist/evm/chain/modules/EVMBlocks.js +64 -64
- package/dist/evm/chain/modules/EVMEvents.d.ts +36 -36
- package/dist/evm/chain/modules/EVMEvents.js +122 -122
- package/dist/evm/chain/modules/EVMFees.d.ts +36 -36
- package/dist/evm/chain/modules/EVMFees.js +73 -73
- package/dist/evm/chain/modules/EVMSignatures.d.ts +29 -29
- package/dist/evm/chain/modules/EVMSignatures.js +68 -68
- package/dist/evm/chain/modules/EVMTokens.d.ts +70 -51
- package/dist/evm/chain/modules/EVMTokens.js +142 -113
- package/dist/evm/chain/modules/EVMTransactions.d.ts +89 -89
- package/dist/evm/chain/modules/EVMTransactions.js +216 -216
- package/dist/evm/contract/EVMContractBase.d.ts +22 -22
- package/dist/evm/contract/EVMContractBase.js +34 -34
- package/dist/evm/contract/EVMContractModule.d.ts +8 -8
- package/dist/evm/contract/EVMContractModule.js +11 -11
- package/dist/evm/contract/modules/EVMContractEvents.d.ts +42 -42
- package/dist/evm/contract/modules/EVMContractEvents.js +75 -75
- package/dist/evm/events/EVMChainEvents.d.ts +22 -22
- package/dist/evm/events/EVMChainEvents.js +67 -67
- package/dist/evm/events/EVMChainEventsBrowser.d.ts +86 -86
- package/dist/evm/events/EVMChainEventsBrowser.js +294 -294
- package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts +78 -78
- package/dist/evm/spv_swap/EVMSpvVaultContract.js +478 -480
- package/dist/evm/spv_swap/EVMSpvVaultData.d.ts +39 -39
- package/dist/evm/spv_swap/EVMSpvVaultData.js +180 -180
- package/dist/evm/spv_swap/EVMSpvWithdrawalData.d.ts +19 -19
- package/dist/evm/spv_swap/EVMSpvWithdrawalData.js +55 -55
- package/dist/evm/spv_swap/SpvVaultContractAbi.d.ts +91 -91
- package/dist/evm/spv_swap/SpvVaultContractAbi.js +849 -849
- package/dist/evm/spv_swap/SpvVaultContractTypechain.d.ts +450 -450
- package/dist/evm/spv_swap/SpvVaultContractTypechain.js +2 -2
- package/dist/evm/swaps/EVMSwapContract.d.ts +193 -193
- package/dist/evm/swaps/EVMSwapContract.js +374 -374
- package/dist/evm/swaps/EVMSwapData.d.ts +66 -66
- package/dist/evm/swaps/EVMSwapData.js +260 -260
- package/dist/evm/swaps/EVMSwapModule.d.ts +9 -9
- package/dist/evm/swaps/EVMSwapModule.js +11 -11
- package/dist/evm/swaps/EscrowManagerAbi.d.ts +120 -120
- package/dist/evm/swaps/EscrowManagerAbi.js +985 -985
- package/dist/evm/swaps/EscrowManagerTypechain.d.ts +475 -475
- package/dist/evm/swaps/EscrowManagerTypechain.js +2 -2
- package/dist/evm/swaps/handlers/IHandler.d.ts +13 -13
- package/dist/evm/swaps/handlers/IHandler.js +2 -2
- package/dist/evm/swaps/handlers/claim/ClaimHandlers.d.ts +10 -10
- package/dist/evm/swaps/handlers/claim/ClaimHandlers.js +13 -13
- package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.d.ts +20 -20
- package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.js +39 -39
- package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts +24 -24
- package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js +59 -59
- package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts +25 -25
- package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js +51 -51
- package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts +21 -21
- package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js +28 -28
- package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.d.ts +48 -48
- package/dist/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.js +63 -63
- package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.d.ts +17 -17
- package/dist/evm/swaps/handlers/refund/TimelockRefundHandler.js +28 -28
- package/dist/evm/swaps/modules/EVMLpVault.d.ts +69 -69
- package/dist/evm/swaps/modules/EVMLpVault.js +134 -131
- package/dist/evm/swaps/modules/EVMSwapClaim.d.ts +54 -54
- package/dist/evm/swaps/modules/EVMSwapClaim.js +137 -137
- package/dist/evm/swaps/modules/EVMSwapInit.d.ts +88 -88
- package/dist/evm/swaps/modules/EVMSwapInit.js +274 -275
- package/dist/evm/swaps/modules/EVMSwapRefund.d.ts +62 -62
- package/dist/evm/swaps/modules/EVMSwapRefund.js +167 -167
- package/dist/evm/typechain/common.d.ts +50 -50
- package/dist/evm/typechain/common.js +2 -2
- package/dist/evm/wallet/EVMSigner.d.ts +9 -9
- package/dist/evm/wallet/EVMSigner.js +16 -16
- package/dist/index.d.ts +38 -38
- package/dist/index.js +54 -54
- package/dist/utils/Utils.d.ts +15 -15
- package/dist/utils/Utils.js +71 -71
- package/package.json +37 -37
- package/src/chains/citrea/CitreaBtcRelay.ts +57 -57
- package/src/chains/citrea/CitreaChainType.ts +28 -28
- package/src/chains/citrea/CitreaFees.ts +77 -77
- package/src/chains/citrea/CitreaInitializer.ts +178 -178
- package/src/chains/citrea/CitreaSpvVaultContract.ts +75 -75
- package/src/chains/citrea/CitreaSwapContract.ts +102 -102
- package/src/chains/citrea/CitreaTokens.ts +21 -21
- package/src/evm/btcrelay/BtcRelayAbi.ts +258 -258
- package/src/evm/btcrelay/BtcRelayTypechain.ts +371 -371
- package/src/evm/btcrelay/EVMBtcRelay.ts +522 -522
- package/src/evm/btcrelay/headers/EVMBtcHeader.ts +109 -109
- package/src/evm/btcrelay/headers/EVMBtcStoredHeader.ts +152 -152
- package/src/evm/chain/EVMChainInterface.ts +155 -155
- package/src/evm/chain/EVMModule.ts +21 -21
- package/src/evm/chain/modules/ERC20Abi.ts +222 -222
- package/src/evm/chain/modules/EVMAddresses.ts +28 -28
- package/src/evm/chain/modules/EVMBlocks.ts +75 -75
- package/src/evm/chain/modules/EVMEvents.ts +139 -139
- package/src/evm/chain/modules/EVMFees.ts +104 -104
- package/src/evm/chain/modules/EVMSignatures.ts +76 -76
- package/src/evm/chain/modules/EVMTokens.ts +155 -126
- package/src/evm/chain/modules/EVMTransactions.ts +246 -246
- package/src/evm/contract/EVMContractBase.ts +63 -63
- package/src/evm/contract/EVMContractModule.ts +16 -16
- package/src/evm/contract/modules/EVMContractEvents.ts +102 -102
- package/src/evm/events/EVMChainEvents.ts +81 -81
- package/src/evm/events/EVMChainEventsBrowser.ts +390 -390
- package/src/evm/spv_swap/EVMSpvVaultContract.ts +608 -603
- package/src/evm/spv_swap/EVMSpvVaultData.ts +224 -224
- package/src/evm/spv_swap/EVMSpvWithdrawalData.ts +70 -70
- package/src/evm/spv_swap/SpvVaultContractAbi.ts +846 -846
- package/src/evm/spv_swap/SpvVaultContractTypechain.ts +685 -685
- package/src/evm/swaps/EVMSwapContract.ts +592 -592
- package/src/evm/swaps/EVMSwapData.ts +378 -378
- package/src/evm/swaps/EVMSwapModule.ts +16 -16
- package/src/evm/swaps/EscrowManagerAbi.ts +982 -982
- package/src/evm/swaps/EscrowManagerTypechain.ts +723 -723
- package/src/evm/swaps/handlers/IHandler.ts +17 -17
- package/src/evm/swaps/handlers/claim/ClaimHandlers.ts +20 -20
- package/src/evm/swaps/handlers/claim/HashlockClaimHandler.ts +46 -46
- package/src/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.ts +82 -82
- package/src/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.ts +76 -76
- package/src/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.ts +46 -46
- package/src/evm/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts +115 -115
- package/src/evm/swaps/handlers/refund/TimelockRefundHandler.ts +37 -37
- package/src/evm/swaps/modules/EVMLpVault.ts +154 -152
- package/src/evm/swaps/modules/EVMSwapClaim.ts +172 -172
- package/src/evm/swaps/modules/EVMSwapInit.ts +328 -325
- package/src/evm/swaps/modules/EVMSwapRefund.ts +229 -229
- package/src/evm/typechain/common.ts +131 -131
- package/src/evm/wallet/EVMSigner.ts +23 -23
- package/src/index.ts +45 -45
- package/src/utils/Utils.ts +81 -81
|
@@ -1,216 +1,216 @@
|
|
|
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
|
|
103
|
-
*/
|
|
104
|
-
async sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
|
|
105
|
-
await this.prepareTransactions(signer, txs);
|
|
106
|
-
const signedTxs = [];
|
|
107
|
-
//TODO: Maybe don't separate the signing process from the sending when using browser-based wallet,
|
|
108
|
-
// like with Starknet
|
|
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
|
-
const signedTx = signedTxs[i];
|
|
122
|
-
const txId = await this.sendSignedTransaction(signedTx, onBeforePublish);
|
|
123
|
-
if (waitForConfirmation)
|
|
124
|
-
promises.push(this.confirmTransaction(signedTx, abortSignal));
|
|
125
|
-
txIds.push(txId);
|
|
126
|
-
this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + signedTx.hash);
|
|
127
|
-
}
|
|
128
|
-
if (promises.length > 0)
|
|
129
|
-
await Promise.all(promises);
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
for (let i = 0; i < signedTxs.length; i++) {
|
|
133
|
-
const signedTx = signedTxs[i];
|
|
134
|
-
const txId = await this.sendSignedTransaction(signedTx, onBeforePublish);
|
|
135
|
-
const confirmPromise = this.confirmTransaction(signedTx, abortSignal);
|
|
136
|
-
this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + txs.length + "): " + signedTx.hash);
|
|
137
|
-
//Don't await the last promise when !waitForConfirmation
|
|
138
|
-
if (i < txs.length - 1 || waitForConfirmation)
|
|
139
|
-
await confirmPromise;
|
|
140
|
-
txIds.push(txId);
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
this.logger.info("sendAndConfirm(): sent transactions, count: " + txs.length +
|
|
144
|
-
" waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
|
|
145
|
-
return txIds;
|
|
146
|
-
}
|
|
147
|
-
/**
|
|
148
|
-
* Serializes the signed EVM transaction
|
|
149
|
-
*
|
|
150
|
-
* @param tx
|
|
151
|
-
*/
|
|
152
|
-
serializeTx(tx) {
|
|
153
|
-
return Promise.resolve(tx.serialized);
|
|
154
|
-
}
|
|
155
|
-
/**
|
|
156
|
-
* Deserializes signed EVM transaction
|
|
157
|
-
*
|
|
158
|
-
* @param txData
|
|
159
|
-
*/
|
|
160
|
-
deserializeTx(txData) {
|
|
161
|
-
return Promise.resolve(ethers_1.Transaction.from(txData));
|
|
162
|
-
}
|
|
163
|
-
/**
|
|
164
|
-
* Gets the status of the raw starknet transaction
|
|
165
|
-
*
|
|
166
|
-
* @param tx
|
|
167
|
-
*/
|
|
168
|
-
async getTxStatus(tx) {
|
|
169
|
-
const parsedTx = await this.deserializeTx(tx);
|
|
170
|
-
return await this.getTxIdStatus(parsedTx.hash);
|
|
171
|
-
}
|
|
172
|
-
/**
|
|
173
|
-
* Gets the status of the starknet transaction with a specific txId
|
|
174
|
-
*
|
|
175
|
-
* @param txId
|
|
176
|
-
*/
|
|
177
|
-
async getTxIdStatus(txId) {
|
|
178
|
-
const txResponse = await this.provider.getTransaction(txId);
|
|
179
|
-
if (txResponse == null)
|
|
180
|
-
return "not_found";
|
|
181
|
-
if (txResponse.blockHash == null)
|
|
182
|
-
return "pending";
|
|
183
|
-
const [safeBlockNumber, txReceipt] = await Promise.all([
|
|
184
|
-
this.root.config.safeBlockTag === "latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
|
|
185
|
-
this.provider.getTransactionReceipt(txId)
|
|
186
|
-
]);
|
|
187
|
-
if (txReceipt == null || (safeBlockNumber != null && txReceipt.blockNumber < safeBlockNumber))
|
|
188
|
-
return "pending";
|
|
189
|
-
if (txReceipt.status === 0)
|
|
190
|
-
return "reverted";
|
|
191
|
-
return "success";
|
|
192
|
-
}
|
|
193
|
-
onBeforeTxSigned(callback) {
|
|
194
|
-
this.cbkBeforeTxSigned = callback;
|
|
195
|
-
}
|
|
196
|
-
offBeforeTxSigned(callback) {
|
|
197
|
-
this.cbkBeforeTxSigned = null;
|
|
198
|
-
return true;
|
|
199
|
-
}
|
|
200
|
-
onSendTransaction(callback) {
|
|
201
|
-
this.cbkSendTransaction = callback;
|
|
202
|
-
}
|
|
203
|
-
offSendTransaction(callback) {
|
|
204
|
-
this.cbkSendTransaction = null;
|
|
205
|
-
return true;
|
|
206
|
-
}
|
|
207
|
-
traceTransaction(txId) {
|
|
208
|
-
return this.provider.send("debug_traceTransaction", [
|
|
209
|
-
txId,
|
|
210
|
-
{
|
|
211
|
-
tracer: "callTracer"
|
|
212
|
-
}
|
|
213
|
-
]);
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
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
|
|
103
|
+
*/
|
|
104
|
+
async sendAndConfirm(signer, txs, waitForConfirmation, abortSignal, parallel, onBeforePublish) {
|
|
105
|
+
await this.prepareTransactions(signer, txs);
|
|
106
|
+
const signedTxs = [];
|
|
107
|
+
//TODO: Maybe don't separate the signing process from the sending when using browser-based wallet,
|
|
108
|
+
// like with Starknet
|
|
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
|
+
const signedTx = signedTxs[i];
|
|
122
|
+
const txId = await this.sendSignedTransaction(signedTx, onBeforePublish);
|
|
123
|
+
if (waitForConfirmation)
|
|
124
|
+
promises.push(this.confirmTransaction(signedTx, abortSignal));
|
|
125
|
+
txIds.push(txId);
|
|
126
|
+
this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + signedTx.hash);
|
|
127
|
+
}
|
|
128
|
+
if (promises.length > 0)
|
|
129
|
+
await Promise.all(promises);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
for (let i = 0; i < signedTxs.length; i++) {
|
|
133
|
+
const signedTx = signedTxs[i];
|
|
134
|
+
const txId = await this.sendSignedTransaction(signedTx, onBeforePublish);
|
|
135
|
+
const confirmPromise = this.confirmTransaction(signedTx, abortSignal);
|
|
136
|
+
this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + txs.length + "): " + signedTx.hash);
|
|
137
|
+
//Don't await the last promise when !waitForConfirmation
|
|
138
|
+
if (i < txs.length - 1 || waitForConfirmation)
|
|
139
|
+
await confirmPromise;
|
|
140
|
+
txIds.push(txId);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
this.logger.info("sendAndConfirm(): sent transactions, count: " + txs.length +
|
|
144
|
+
" waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
|
|
145
|
+
return txIds;
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* Serializes the signed EVM transaction
|
|
149
|
+
*
|
|
150
|
+
* @param tx
|
|
151
|
+
*/
|
|
152
|
+
serializeTx(tx) {
|
|
153
|
+
return Promise.resolve(tx.serialized);
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* Deserializes signed EVM transaction
|
|
157
|
+
*
|
|
158
|
+
* @param txData
|
|
159
|
+
*/
|
|
160
|
+
deserializeTx(txData) {
|
|
161
|
+
return Promise.resolve(ethers_1.Transaction.from(txData));
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Gets the status of the raw starknet transaction
|
|
165
|
+
*
|
|
166
|
+
* @param tx
|
|
167
|
+
*/
|
|
168
|
+
async getTxStatus(tx) {
|
|
169
|
+
const parsedTx = await this.deserializeTx(tx);
|
|
170
|
+
return await this.getTxIdStatus(parsedTx.hash);
|
|
171
|
+
}
|
|
172
|
+
/**
|
|
173
|
+
* Gets the status of the starknet transaction with a specific txId
|
|
174
|
+
*
|
|
175
|
+
* @param txId
|
|
176
|
+
*/
|
|
177
|
+
async getTxIdStatus(txId) {
|
|
178
|
+
const txResponse = await this.provider.getTransaction(txId);
|
|
179
|
+
if (txResponse == null)
|
|
180
|
+
return "not_found";
|
|
181
|
+
if (txResponse.blockHash == null)
|
|
182
|
+
return "pending";
|
|
183
|
+
const [safeBlockNumber, txReceipt] = await Promise.all([
|
|
184
|
+
this.root.config.safeBlockTag === "latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
|
|
185
|
+
this.provider.getTransactionReceipt(txId)
|
|
186
|
+
]);
|
|
187
|
+
if (txReceipt == null || (safeBlockNumber != null && txReceipt.blockNumber < safeBlockNumber))
|
|
188
|
+
return "pending";
|
|
189
|
+
if (txReceipt.status === 0)
|
|
190
|
+
return "reverted";
|
|
191
|
+
return "success";
|
|
192
|
+
}
|
|
193
|
+
onBeforeTxSigned(callback) {
|
|
194
|
+
this.cbkBeforeTxSigned = callback;
|
|
195
|
+
}
|
|
196
|
+
offBeforeTxSigned(callback) {
|
|
197
|
+
this.cbkBeforeTxSigned = null;
|
|
198
|
+
return true;
|
|
199
|
+
}
|
|
200
|
+
onSendTransaction(callback) {
|
|
201
|
+
this.cbkSendTransaction = callback;
|
|
202
|
+
}
|
|
203
|
+
offSendTransaction(callback) {
|
|
204
|
+
this.cbkSendTransaction = null;
|
|
205
|
+
return true;
|
|
206
|
+
}
|
|
207
|
+
traceTransaction(txId) {
|
|
208
|
+
return this.provider.send("debug_traceTransaction", [
|
|
209
|
+
txId,
|
|
210
|
+
{
|
|
211
|
+
tracer: "callTracer"
|
|
212
|
+
}
|
|
213
|
+
]);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
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;
|