mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
wallet2_api: wallet recovery - seed offset passphrase support
This commit is contained in:
parent
51873fec04
commit
cc18926eba
@ -725,7 +725,7 @@ bool WalletImpl::recover(const std::string &path, const std::string &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();
|
||||
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"));
|
||||
return false;
|
||||
}
|
||||
if (!seed_offset.empty())
|
||||
{
|
||||
recovery_key = cryptonote::decrypt_key(recovery_key, seed_offset);
|
||||
}
|
||||
|
||||
if (old_language == crypto::ElectrumWords::old_language_name)
|
||||
old_language = Language::English().get_language_name();
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
const std::string &language) const override;
|
||||
bool open(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,
|
||||
const std::string &password,
|
||||
const std::string &language,
|
||||
|
@ -1085,10 +1085,12 @@ struct WalletManager
|
||||
* \param nettype Network type
|
||||
* \param restoreHeight restore from start height
|
||||
* \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)
|
||||
*/
|
||||
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,
|
||||
bool testnet = false, uint64_t restoreHeight = 0) // deprecated
|
||||
{
|
||||
|
@ -93,13 +93,14 @@ Wallet *WalletManagerImpl::recoveryWallet(const std::string &path,
|
||||
const std::string &mnemonic,
|
||||
NetworkType nettype,
|
||||
uint64_t restoreHeight,
|
||||
uint64_t kdf_rounds)
|
||||
uint64_t kdf_rounds,
|
||||
const std::string &seed_offset/* = {}*/)
|
||||
{
|
||||
WalletImpl * wallet = new WalletImpl(nettype, kdf_rounds);
|
||||
if(restoreHeight > 0){
|
||||
wallet->setRefreshFromBlockHeight(restoreHeight);
|
||||
}
|
||||
wallet->recover(path, password, mnemonic);
|
||||
wallet->recover(path, password, mnemonic, seed_offset);
|
||||
return wallet;
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,8 @@ public:
|
||||
const std::string &mnemonic,
|
||||
NetworkType nettype,
|
||||
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,
|
||||
const std::string &password,
|
||||
const std::string &language,
|
||||
|
Loading…
Reference in New Issue
Block a user