core: Ensure login in core.resendPendingRequests
#2633
Merged
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
Signed-off-by: Philemon Ukane <[email protected]>
ukane-philemon
changed the title
buck54321
reviewed
Dec 18, 2023
client/core/core.go
Outdated
Comment on lines
4743
to
4746
| c.notify(newLoginNote("Resuming active trades...")) | ||
| c.resolveActiveTrades(crypter) | ||
| c.notify(newLoginNote("Connecting to DEX servers...")) | ||
| c.initializeDEXConnections(crypter) | ||
| c.notify(newLoginNote("Resuming active trades...")) | ||
| c.resolveActiveTrades(crypter) |
There was a problem hiding this comment.
Seems dangerous. What if the DEX server sends info about an active trade that we haven't loaded from the database yet?
There was a problem hiding this comment.
Hmm, then a better resolution to this would be to check if we are logged in? #2617 (comment), but we can just log a msg and not exit.
Signed-off-by: Philemon Ukane <[email protected]>
ukane-philemon
changed the title
core.resendPendingRequests
Signed-off-by: Philemon Ukane <[email protected]>
ukane-philemon
commented
Dec 18, 2023
client/core/trade.go
Outdated
| @@ -2086,7 +2086,7 @@ func (c *Core) tick(t *trackedTrade) (assetMap, error) { | |||
| // This method modifies match fields and MUST be called with the trackedTrade | |||
| // mutex lock held for reads. | |||
| func (c *Core) resendPendingRequests(t *trackedTrade) { | |||
| if t.isSelfGoverned() { | |||
| if t.isSelfGoverned() || !c.loggedIn /* we can't send `init` or `redeem` if we are not logged in */ { | |||
There was a problem hiding this comment.
No need to log a message, just move on. It's not going to be helpful to the user and we know this can happen.
There was a problem hiding this comment.
log debug maybe?
Also I think c.loginMtx should be held.
Signed-off-by: Philemon Ukane <[email protected]>
JoeGruffins
approved these changes
Dec 20, 2023
martonp
approved these changes
Dec 30, 2023
buck54321
approved these changes
Jan 11, 2024
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.
This PR handles an edge case that causes a match init request to be sent before connecting to the server : See: #2617 (comment)
Closes: #2617