improve(spokePoolProcessor): improved logic for setting refunded status #109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+179
to
+188
| const refundEvents = await bundleEventsRepository | ||
| .createQueryBuilder("be") | ||
| .innerJoinAndSelect("be.bundle", "bundle") | ||
| .innerJoin(entities.RelayHashInfo, "rhi", "be.relayHash = rhi.relayHash") | ||
| .where("be.type = :expiredDeposit", { | ||
| expiredDeposit: entities.BundleEventType.ExpiredDeposit, | ||
| }) | ||
| .andWhere("rhi.status = :expired", { | ||
| expired: entities.RelayStatus.Expired, | ||
| }) |
There was a problem hiding this comment.
Does this generate a list of refunds without needing to do it iteratively in the loop below?
amateima
reviewed
Nov 21, 2024
| .createQueryBuilder() | ||
| .update() | ||
| .set({ | ||
| status: entities.RelayStatus.Refunded, | ||
| depositRefundTxHash: executedRelayerRefundRootEvent.transactionHash, | ||
| }) | ||
| .where("relayHash = :relayHash", { | ||
| relayHash: expiredDeposit.relayHash, | ||
| relayHash: refundEvent.relayHash, |
There was a problem hiding this comment.
was the previous used value incorrect?
There was a problem hiding this comment.
No, is just that we're not querying the deposits now, only the bundle events.
Comment on lines
228
to
239
| await this.postgres | ||
| .getRepository(entities.RelayHashInfo) | ||
| .createQueryBuilder() | ||
| .update() | ||
| .set({ | ||
| status: entities.RelayStatus.Refunded, | ||
| depositRefundTxHash: executedRelayerRefundRootEvent.transactionHash, | ||
| }) | ||
| .where("relayHash = :relayHash", { | ||
| relayHash: expiredDeposit.relayHash, | ||
| relayHash: refundEvent.relayHash, | ||
| }) | ||
| .execute(); |
There was a problem hiding this comment.
Looks good! Only one improvement suggestion. We need to emit webhook notifications from here with a payload like
{ depositId, originChainId, status, depositTxHash }
Any thoughts what's the best way to do it?
There was a problem hiding this comment.
I think this should help to integrate the webhook function next 48f3d16
amateima
approved these changes
Nov 21, 2024
melisaguevara
deleted the
mguevara/acx-3352-reading-relayerrefundroot-of-undefined
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we were querying the expired deposits and then querying its possible refunds. Now, we are getting from the database only the deposits that might be refunded based on the bundle events that are stored in the db.
This PR also fixes the bug we were having before (Cannot read properties of undefined, reading
relayerRefundRoot). The issue was fixed by including the inner join with the bundle table when querying bundle events.