-
Notifications
You must be signed in to change notification settings - Fork 122
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Poolswap to empty to address swaps to from address making to optional #1534
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
Bushstar
requested review from
Mixa84,
wafflespeanut,
dcorral,
prasannavl,
mambisi and
Jouzo
as code owners
October 31, 2022 10:06
kuegi
reviewed
Nov 1, 2022
prasannavl
changed the title
Fix from genesis master
Backport of loan payback fix to genesis
Nov 7, 2022
prasannavl
changed the title
Backport of loan payback fix to genesis
Backport of negative interest payback fix to genesis
Nov 7, 2022
Bushstar
changed the title
Backport of negative interest payback fix to genesis
Poolswap to empty to address swaps to from address making to optional
Nov 8, 2022
prasannavl
previously approved these changes
Nov 11, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just some boring changes to prefer readability.
src/masternodes/mn_checks.cpp
Outdated
@@ -4355,7 +4355,7 @@ Res CPoolSwap::ExecuteSwap(CCustomCSView& view, std::vector<DCT_ID> poolIDs, boo | |||
intermediateView.Flush(); | |||
|
|||
auto& addView = lastSwap ? view : intermediateView; | |||
res = addView.AddBalance(lastSwap ? obj.to : obj.from, swapAmountResult); | |||
res = addView.AddBalance(lastSwap ? (obj.to.empty() && height >= static_cast<uint32_t>(Params().GetConsensus().GrandCentralHeight) ? obj.from : obj.to) : obj.from, swapAmountResult); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
res = addView.AddBalance(lastSwap ? (obj.to.empty() && height >= static_cast<uint32_t>(Params().GetConsensus().GrandCentralHeight) ? obj.from : obj.to) : obj.from, swapAmountResult); | |
if (height >= static_cast<uint32_t>(Params().GetConsensus().GrandCentralHeight)) { | |
res = addView.AddBalance(lastSwap ? (obj.to.empty() ? obj.from : obj.to) : obj.from, swapAmountResult); | |
} else { | |
res = addView.AddBalance(lastSwap ? obj.to : obj.from, swapAmountResult); | |
} |
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.
When failing to set an address on a pool swap the swapped amount is sent to the from address, not an empty inaccessible address.