Import Wallet Mnemonic #348
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
eugene-sy
reviewed
May 10, 2018
src/wallet/wallet.cpp
Outdated
| LogPrintf("Failed to add the referral to the wallet.\n"); | ||
| return false; | ||
| } | ||
| //SetUnlockReferralTx(rtx, true); |
tonypizzicato
requested changes
May 10, 2018
src/crypto/mnemonic/mnemonic.cpp
Outdated
| } | ||
|
|
||
| bool IsAValidMnemonic(const WordList& words) { | ||
| if(words.size() != MNEMONIC_WORD_COUNT) { |
There was a problem hiding this comment.
return words.size() == MNEMONIC_WORD_COUNT
src/crypto/mnemonic/mnemonic.cpp
Outdated
| @@ -69,6 +91,8 @@ namespace mnemonic | |||
|
|
|||
| WordList mnemonic(MNEMONIC_WORD_COUNT); | |||
| std::transform(inds.begin(), inds.end(), mnemonic.begin(), [&dict](const int& i) { return dict[i]; }); | |||
|
|
|||
| assert(mnemonic.size() == MNEMONIC_WORD_COUNT); | |||
Mnemonic Encryption
tonypizzicato
requested changes
May 11, 2018
src/wallet/rpcwallet.cpp
Outdated
| @@ -4147,6 +4147,16 @@ UniValue getmnemonic(const JSONRPCRequest& request) | |||
| return NullUniValue; | |||
| } | |||
|
|
|||
| if (pwallet->IsLocked()) { | |||
There was a problem hiding this comment.
use EnsureWalletIsUnlocked here
There was a problem hiding this comment.
you don't even need it here, it's called below
src/wallet/wallet.cpp
Outdated
| } | ||
|
|
||
| CWalletDB walletdb{*dbw}; | ||
| walletdb.WriteKeyMetadata(hdkey->second.GetPubKey(), meta); |
There was a problem hiding this comment.
return walletdb.WriteKeyMetadata(hdkey->second.GetPubKey(), meta); here to check if it was written?
src/wallet/walletdb.h
Outdated
| @@ -103,7 +103,7 @@ class CKeyMetadata | |||
| static const int VERSION_WITH_HDDATA=10; | |||
| static const int VERSION_WITH_MNEMONIC=11; | |||
| static const int VERSION_WITH_SECURE_MNEMONIC=12; | |||
| static const int CURRENT_VERSION=VERSION_WITH_MNEMONIC; | |||
| static const int CURRENT_VERSION=VERSION_WITH_HDDATA; | |||
There was a problem hiding this comment.
VERSION_WITH_SECURE_MNEMONIC?
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 allows you to import your web wallet to the desktop using the wallet's mnemonic.