monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet2_api: wallet recovery - seed offset passphrase support

Browse source
This commit is contained in:
xiphon 2020-02-11 23:27:30 +00:00
parent 51873fec04
commit cc18926eba
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/api/wallet.cpp
View file

@ -725,7 +725,7 @@ bool WalletImpl::recover(const std::string &path, const std::string &seed)
return recover(path, "", seed); return recover(path, "", seed);
} }
bool WalletImpl::recover(const std::string &path, const std::string &password, const std::string &seed) bool WalletImpl::recover(const std::string &path, const std::string &password, const std::string &seed, const std::string &seed_offset/* = {}*/)
{ {
clearStatus(); clearStatus();
m_errorString.clear(); m_errorString.clear();
@ -743,6 +743,10 @@ bool WalletImpl::recover(const std::string &path, const std::string &password, c
setStatusError(tr("Electrum-style word list failed verification")); setStatusError(tr("Electrum-style word list failed verification"));
return false; return false;
} }
if (!seed_offset.empty())
{
recovery_key = cryptonote::decrypt_key(recovery_key, seed_offset);
}
if (old_language == crypto::ElectrumWords::old_language_name) if (old_language == crypto::ElectrumWords::old_language_name)
old_language = Language::English().get_language_name(); old_language = Language::English().get_language_name();

2
src/wallet/api/wallet.h
View file

@ -60,7 +60,7 @@ public:
const std::string &language) const override; const std::string &language) const override;
bool open(const std::string &path, const std::string &password); bool open(const std::string &path, const std::string &password);
bool recover(const std::string &path,const std::string &password, bool recover(const std::string &path,const std::string &password,
const std::string &seed); const std::string &seed, const std::string &seed_offset = {});
bool recoverFromKeysWithPassword(const std::string &path, bool recoverFromKeysWithPassword(const std::string &path,
const std::string &password, const std::string &password,
const std::string &language, const std::string &language,

4
src/wallet/api/wallet2_api.h
View file

@ -1085,10 +1085,12 @@ struct WalletManager
* \param nettype Network type * \param nettype Network type
* \param restoreHeight restore from start height * \param restoreHeight restore from start height
* \param kdf_rounds Number of rounds for key derivation function * \param kdf_rounds Number of rounds for key derivation function
* \param seed_offset Seed offset passphrase (optional)
* \return Wallet instance (Wallet::status() needs to be called to check if recovered successfully) * \return Wallet instance (Wallet::status() needs to be called to check if recovered successfully)
*/ */
virtual Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic, virtual Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic,
NetworkType nettype = MAINNET, uint64_t restoreHeight = 0, uint64_t kdf_rounds = 1) = 0; NetworkType nettype = MAINNET, uint64_t restoreHeight = 0, uint64_t kdf_rounds = 1,
const std::string &seed_offset = {}) = 0;
Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic, Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic,
bool testnet = false, uint64_t restoreHeight = 0) // deprecated bool testnet = false, uint64_t restoreHeight = 0) // deprecated
{ {

5
src/wallet/api/wallet_manager.cpp
View file

@ -93,13 +93,14 @@ Wallet *WalletManagerImpl::recoveryWallet(const std::string &path,
const std::string &mnemonic, const std::string &mnemonic,
NetworkType nettype, NetworkType nettype,
uint64_t restoreHeight, uint64_t restoreHeight,
uint64_t kdf_rounds) uint64_t kdf_rounds,
const std::string &seed_offset/* = {}*/)
{ {
WalletImpl * wallet = new WalletImpl(nettype, kdf_rounds); WalletImpl * wallet = new WalletImpl(nettype, kdf_rounds);
if(restoreHeight > 0){ if(restoreHeight > 0){
wallet->setRefreshFromBlockHeight(restoreHeight); wallet->setRefreshFromBlockHeight(restoreHeight);
} }
wallet->recover(path, password, mnemonic); wallet->recover(path, password, mnemonic, seed_offset);
return wallet; return wallet;
} }

3
src/wallet/api/wallet_manager.h
View file

@ -46,7 +46,8 @@ public:
const std::string &mnemonic, const std::string &mnemonic,
NetworkType nettype, NetworkType nettype,
uint64_t restoreHeight, uint64_t restoreHeight,
uint64_t kdf_rounds = 1) override; uint64_t kdf_rounds = 1,
const std::string &seed_offset = {}) override;
virtual Wallet * createWalletFromKeys(const std::string &path, virtual Wallet * createWalletFromKeys(const std::string &path,
const std::string &password, const std::string &password,
const std::string &language, const std::string &language,