@atomiqlabs/chain-starknet 2.0.0-beta.2 → 2.0.0-beta.4
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.
|
@@ -202,14 +202,13 @@ class StarknetChainEventsBrowser {
|
|
|
202
202
|
async checkEventsEcrowManager(lastTxHash, lastBlockNumber, currentBlock) {
|
|
203
203
|
const currentBlockNumber = currentBlock.block_number;
|
|
204
204
|
lastBlockNumber ?? (lastBlockNumber = currentBlockNumber);
|
|
205
|
-
|
|
206
|
-
this.
|
|
207
|
-
let events = await this.starknetSwapContract.Events.getContractBlockEvents(["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"], [], logStartHeight, null);
|
|
205
|
+
// this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
|
|
206
|
+
let events = await this.starknetSwapContract.Events.getContractBlockEvents(["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"], [], lastBlockNumber, null);
|
|
208
207
|
if (lastTxHash != null) {
|
|
209
208
|
const latestProcessedEventIndex = (0, Utils_1.findLastIndex)(events, val => val.txHash === lastTxHash);
|
|
210
209
|
if (latestProcessedEventIndex !== -1) {
|
|
211
210
|
events.splice(0, latestProcessedEventIndex + 1);
|
|
212
|
-
this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "
|
|
211
|
+
// this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
|
|
213
212
|
}
|
|
214
213
|
}
|
|
215
214
|
if (events.length > 0) {
|
|
@@ -221,9 +220,8 @@ class StarknetChainEventsBrowser {
|
|
|
221
220
|
async checkEventsSpvVaults(lastTxHash, lastBlockNumber, currentBlock) {
|
|
222
221
|
const currentBlockNumber = currentBlock.block_number;
|
|
223
222
|
lastBlockNumber ?? (lastBlockNumber = currentBlockNumber);
|
|
224
|
-
const logStartHeight = currentBlockNumber > lastBlockNumber ? lastBlockNumber + 1 : lastBlockNumber;
|
|
225
223
|
// this.logger.debug("checkEvents(SpvVaults): Requesting logs: "+logStartHeight+"...pending");
|
|
226
|
-
let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"], [],
|
|
224
|
+
let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"], [], lastBlockNumber, null);
|
|
227
225
|
if (lastTxHash != null) {
|
|
228
226
|
const latestProcessedEventIndex = (0, Utils_1.findLastIndex)(events, val => val.txHash === lastTxHash);
|
|
229
227
|
if (latestProcessedEventIndex !== -1) {
|
package/package.json
CHANGED
|
@@ -300,19 +300,18 @@ export class StarknetChainEventsBrowser implements ChainEvents<StarknetSwapData>
|
|
|
300
300
|
protected async checkEventsEcrowManager(lastTxHash: string, lastBlockNumber?: number, currentBlock?: {timestamp: number, block_number: number}): Promise<string> {
|
|
301
301
|
const currentBlockNumber: number = (currentBlock as any).block_number;
|
|
302
302
|
lastBlockNumber ??= currentBlockNumber;
|
|
303
|
-
|
|
304
|
-
this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
|
|
303
|
+
// this.logger.debug("checkEvents(EscrowManager): Requesting logs: "+logStartHeight+"...pending");
|
|
305
304
|
let events = await this.starknetSwapContract.Events.getContractBlockEvents(
|
|
306
305
|
["escrow_manager::events::Initialize", "escrow_manager::events::Claim", "escrow_manager::events::Refund"],
|
|
307
306
|
[],
|
|
308
|
-
|
|
307
|
+
lastBlockNumber,
|
|
309
308
|
null
|
|
310
309
|
);
|
|
311
310
|
if(lastTxHash!=null) {
|
|
312
311
|
const latestProcessedEventIndex = findLastIndex(events, val => val.txHash===lastTxHash);
|
|
313
312
|
if(latestProcessedEventIndex!==-1) {
|
|
314
313
|
events.splice(0, latestProcessedEventIndex+1);
|
|
315
|
-
this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
|
|
314
|
+
// this.logger.debug("checkEvents(EscrowManager): Splicing processed events, resulting size: "+events.length);
|
|
316
315
|
}
|
|
317
316
|
}
|
|
318
317
|
if(events.length>0) {
|
|
@@ -325,12 +324,11 @@ export class StarknetChainEventsBrowser implements ChainEvents<StarknetSwapData>
|
|
|
325
324
|
protected async checkEventsSpvVaults(lastTxHash: string, lastBlockNumber?: number, currentBlock?: {timestamp: number, block_number: number}): Promise<string> {
|
|
326
325
|
const currentBlockNumber: number = (currentBlock as any).block_number;
|
|
327
326
|
lastBlockNumber ??= currentBlockNumber;
|
|
328
|
-
const logStartHeight = currentBlockNumber>lastBlockNumber ? lastBlockNumber+1 : lastBlockNumber;
|
|
329
327
|
// this.logger.debug("checkEvents(SpvVaults): Requesting logs: "+logStartHeight+"...pending");
|
|
330
328
|
let events = await this.starknetSpvVaultContract.Events.getContractBlockEvents(
|
|
331
329
|
["spv_swap_vault::events::Opened", "spv_swap_vault::events::Deposited", "spv_swap_vault::events::Closed", "spv_swap_vault::events::Fronted", "spv_swap_vault::events::Claimed"],
|
|
332
330
|
[],
|
|
333
|
-
|
|
331
|
+
lastBlockNumber,
|
|
334
332
|
null
|
|
335
333
|
);
|
|
336
334
|
if(lastTxHash!=null) {
|