Fixes corrupt wallet #1839
Merged
Fixes corrupt wallet #1839
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
NejcZdovc
force-pushed
the
try-again-wallet
branch
from
bb0dd16
to
fc22949
Compare
NejcZdovc
commented
Mar 5, 2019
| @@ -1115,6 +1112,10 @@ const confirmations::WalletInfo LedgerImpl::GetConfirmationsWalletInfo( | |||
|
|
|||
| wallet_info.payment_id = info.paymentId_; | |||
|
|
|||
| if (info.keyInfoSeed_.empty()) { | |||
There was a problem hiding this comment.
if you have corrupted state, this would fail, so we need to return blank wallet_info object
There was a problem hiding this comment.
should this be a blank wallet_info object, as payment_id has been set?
NejcZdovc
requested review from
tmancey and
bridiver
and removed request for
tmancey
NejcZdovc
commented
Mar 5, 2019
| @@ -68,7 +68,7 @@ void BatClient::requestCredentialsCallback( | |||
|
|
|||
| ledger_->SetUserId(user_id); | |||
|
|
|||
| std::string registrar_vk = ledger_->GetRegistrarVK(); | |||
| std::string registrar_vk; | |||
There was a problem hiding this comment.
this variable should be empty when starting
NejcZdovc
commented
Mar 5, 2019
| @@ -86,7 +86,7 @@ void BatClient::requestCredentialsCallback( | |||
| return; | |||
| } | |||
|
|
|||
| braveledger_bat_helper::WALLET_INFO_ST wallet_info = ledger_->GetWalletInfo(); | |||
| braveledger_bat_helper::WALLET_INFO_ST wallet_info; | |||
There was a problem hiding this comment.
this variable should be empty when starting
NejcZdovc
commented
Mar 5, 2019
| const uint64_t stamp = ledger_->GetBootStamp(); | ||
| const std::string persona_id = ledger_->GetPersonaId(); | ||
|
|
||
| if (!payment_id.empty() && stamp != 0 && !persona_id.empty()) { |
There was a problem hiding this comment.
wallet was created and is correct, so we should skip creating new one
tmancey
reviewed
Mar 5, 2019
tmancey
reviewed
Mar 5, 2019
NejcZdovc
force-pushed
the
try-again-wallet
branch
from
fc22949
to
d6dd40d
Compare
NejcZdovc
force-pushed
the
try-again-wallet
branch
from
d6dd40d
to
ceb4e04
Compare
Merged
This was referenced Mar 13, 2019
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.
Resolves brave/brave-browser#3440
Resolves brave/brave-browser#2997
Resolves brave/brave-browser#3046
Submitter Checklist:
npm test brave_unit_tests && npm test brave_browser_tests) onnpm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist: