From cf60c0959678d8a8fd9fb616249e328395465f9b Mon Sep 17 00:00:00 2001 From: zhl Date: Fri, 14 Apr 2023 16:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9event=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/ScheduleConfirmEvent.ts | 16 ++++++++-------- src/models/ScheduleExecutedEvent.ts | 17 ++++++++++------- src/models/ScheduledAddedEvent.ts | 17 ++++++++++------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/models/ScheduleConfirmEvent.ts b/src/models/ScheduleConfirmEvent.ts index ad9a5d6..f35eb3c 100644 --- a/src/models/ScheduleConfirmEvent.ts +++ b/src/models/ScheduleConfirmEvent.ts @@ -33,22 +33,22 @@ export class ScheduleConfirmEventClass extends BaseModule { public static async saveEvent(event: any) { logger.info(JSON.stringify(event)) - if (!event.success) { + if (event.removed) { return } const data = { - address: event.tokenAddress, - blockNumber: event.blockHeight, + address: event.address, + blockNumber: event.blockNumber, removed: event.removed, - operater: event.sender, - scheduleIds: event.ids, - transactionHash: event.hash, - blockTime: new Date(event.time).getTime(), + operater: event.returnValues.sender, + scheduleIds: event.returnValues.ids, + transactionHash: event.transactionHash, + blockTime: new Date(event.timestamp).getTime(), $inc: { version: 1 }, } - let record = await ScheduleConfirmEvent.insertOrUpdate({ transactionHash: event.hash }, data) + let record = await ScheduleConfirmEvent.insertOrUpdate({ transactionHash: event.transactionHash }, data) if (record.version === 1) { logger.log('receive events: ' + JSON.stringify(event.ids)) for (let id of event.ids) { diff --git a/src/models/ScheduleExecutedEvent.ts b/src/models/ScheduleExecutedEvent.ts index 486d676..f3882ad 100644 --- a/src/models/ScheduleExecutedEvent.ts +++ b/src/models/ScheduleExecutedEvent.ts @@ -30,21 +30,24 @@ export class ScheduleExecutedEventClass extends BaseModule { public version: number public static async saveEvent(event: any) { - if (!event.success) { + if (event.removed) { return } const data = { - address: event.tokenAddress, - blockNumber: event.blockHeight, + address: event.address, + blockNumber: event.blockNumber, removed: event.removed, - operater: event.sender, - transactionHash: event.hash, - blockTime: new Date(event.time).getTime(), + operater: event.returnValues.sender, + transactionHash: event.transactionHash, + blockTime: new Date(event.timestamp).getTime(), $inc: { version: 1 }, } - return ScheduleExecutedEvent.insertOrUpdate({ transactionHash: event.hash, scheduleId: event.id }, data) + return ScheduleExecutedEvent.insertOrUpdate( + { transactionHash: event.transactionHash, scheduleId: event.returnValues.id }, + data, + ) } } diff --git a/src/models/ScheduledAddedEvent.ts b/src/models/ScheduledAddedEvent.ts index f4a3e81..bb684a3 100644 --- a/src/models/ScheduledAddedEvent.ts +++ b/src/models/ScheduledAddedEvent.ts @@ -30,21 +30,24 @@ export class ScheduledAddedEventClass extends BaseModule { public version: number public static async saveEvent(event: any) { - if (!event.success) { + if (event.removed) { return } const data = { - address: event.tokenAddress, - blockNumber: event.blockHeight, + address: event.address, + blockNumber: event.blockNumber, removed: event.removed, - operater: event.sender, - transactionHash: event.hash, - blockTime: new Date(event.time).getTime(), + operater: event.returnValues.sender, + transactionHash: event.transactionHash, + blockTime: new Date(event.timestamp).getTime(), $inc: { version: 1 }, } - return ScheduledAddedEvent.insertOrUpdate({ transactionHash: event.hash, scheduleId: event.id }, data) + return ScheduledAddedEvent.insertOrUpdate( + { transactionHash: event.transactionHash, scheduleId: event.returnValues.id }, + data, + ) } }