[GUI][Bug] Fix editing of CS address labels #1588
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
Fuzzbawls
force-pushed
the
2020_cs-label-edit
branch
2 times, most recently
from
3719984 to
ef83a3d
Compare
Fuzzbawls
added
the
Needs Backport
random-zebra
reviewed
May 3, 2020
furszy
reviewed
May 3, 2020
src/wallet/wallet.cpp
Outdated
| std::string addressStr = ParseIntoAddress(address, strPurpose).ToString(); | ||
| if (!strPurpose.empty() && !CWalletDB(strWalletFile).WritePurpose(addressStr, strPurpose)) | ||
| std::string addressStr = ParseIntoAddress(address, (strPurpose.empty() && fUpdated) ? mapAddressBook.at(address).purpose : strPurpose).ToString(); | ||
| if ((!fUpdated || fUpdatePurpose) && !CWalletDB(strWalletFile).WritePurpose(addressStr, strPurpose)) |
There was a problem hiding this comment.
To be totally sure over the write purpose process, would use the IsMine method call that is few lines above to verify that the address is really from this wallet (no need to do any extra processing, just use what we already have here). And throw an exception if the wallet, for whatever reason, is trying to store an external address with the receive/cold_staking purpose.
Fuzzbawls
force-pushed
the
2020_cs-label-edit
branch
from
ef83a3d to
f6aa59c
Compare
Fixes a bug that prevented the editing of Cold Staking address labels in the address book due to the passing of an empty purpose, which `CWallet::ParseIntoAddress()` needs in order to determine if an address is a cold staking type address.
Fuzzbawls
force-pushed
the
2020_cs-label-edit
branch
from
f6aa59c to
805e436
Compare
furszy
approved these changes
May 5, 2020
Fuzzbawls
added a commit
to Fuzzbawls/PIVX
that referenced
this pull request
May 5, 2020
Fixes a bug that prevented the editing of Cold Staking address labels in the address book due to the passing of an empty purpose, which `CWallet::ParseIntoAddress()` needs in order to determine if an address is a cold staking type address. Github-Pull: PIVX-Project#1588 Rebased-From: 805e436
random-zebra
removed
the
Needs Backport
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.
Fixes a bug that prevented the editing of Cold Staking address labels in
the address book due to the passing of an empty purpose, which
CWallet::ParseIntoAddress()needs in order to determine if an addressis a cold staking type address.