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

WalletManager: support kdf round in device wallet restore

Browse source
This commit is contained in:
selsta 2021-04-20 21:44:23 +02:00
parent 02ae14fd6b
commit becc74714b
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libwalletqt/WalletManager.cpp
View file

@ -169,7 +169,7 @@ Wallet *WalletManager::createWalletFromKeys(const QString &path, const QString &
} }
Wallet *WalletManager::createWalletFromDevice(const QString &path, const QString &password, NetworkType::Type nettype, Wallet *WalletManager::createWalletFromDevice(const QString &path, const QString &password, NetworkType::Type nettype,
const QString &deviceName, quint64 restoreHeight, const QString &subaddressLookahead) const QString &deviceName, quint64 restoreHeight, const QString &subaddressLookahead, quint64 kdfRounds)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
WalletPassphraseListenerImpl tmpListener(this); WalletPassphraseListenerImpl tmpListener(this);
@ -187,7 +187,7 @@ Wallet *WalletManager::createWalletFromDevice(const QString &path, const QString
m_currentWallet = NULL; m_currentWallet = NULL;
} }
Monero::Wallet * w = m_pimpl->createWalletFromDevice(path.toStdString(), password.toStdString(), static_cast<Monero::NetworkType>(nettype), Monero::Wallet * w = m_pimpl->createWalletFromDevice(path.toStdString(), password.toStdString(), static_cast<Monero::NetworkType>(nettype),
deviceName.toStdString(), restoreHeight, subaddressLookahead.toStdString(), 1, &tmpListener); deviceName.toStdString(), restoreHeight, subaddressLookahead.toStdString(), kdfRounds, &tmpListener);
w->setListener(nullptr); w->setListener(nullptr);
m_currentWallet = new Wallet(w); m_currentWallet = new Wallet(w);
@ -202,10 +202,10 @@ Wallet *WalletManager::createWalletFromDevice(const QString &path, const QString
void WalletManager::createWalletFromDeviceAsync(const QString &path, const QString &password, NetworkType::Type nettype, void WalletManager::createWalletFromDeviceAsync(const QString &path, const QString &password, NetworkType::Type nettype,
const QString &deviceName, quint64 restoreHeight, const QString &subaddressLookahead) const QString &deviceName, quint64 restoreHeight, const QString &subaddressLookahead, quint64 kdfRounds)
{ {
m_scheduler.run([this, path, password, nettype, deviceName, restoreHeight, subaddressLookahead] { m_scheduler.run([this, path, password, nettype, deviceName, restoreHeight, subaddressLookahead, kdfRounds] {
Wallet *wallet = createWalletFromDevice(path, password, nettype, deviceName, restoreHeight, subaddressLookahead); Wallet *wallet = createWalletFromDevice(path, password, nettype, deviceName, restoreHeight, subaddressLookahead, kdfRounds);
emit walletCreated(wallet); emit walletCreated(wallet);
}); });
} }

6
src/libwalletqt/WalletManager.h
View file

@ -103,14 +103,16 @@ public:
NetworkType::Type nettype, NetworkType::Type nettype,
const QString &deviceName, const QString &deviceName,
quint64 restoreHeight = 0, quint64 restoreHeight = 0,
const QString &subaddressLookahead = ""); const QString &subaddressLookahead = "",
quint64 kdfRounds = 1);
Q_INVOKABLE void createWalletFromDeviceAsync(const QString &path, Q_INVOKABLE void createWalletFromDeviceAsync(const QString &path,
const QString &password, const QString &password,
NetworkType::Type nettype, NetworkType::Type nettype,
const QString &deviceName, const QString &deviceName,
quint64 restoreHeight = 0, quint64 restoreHeight = 0,
const QString &subaddressLookahead = ""); const QString &subaddressLookahead = "",
quint64 kdfRounds = 1);
/*! /*!
* \brief closeWallet - closes current open wallet and frees memory * \brief closeWallet - closes current open wallet and frees memory
* \return wallet address * \return wallet address

3
wizard/WizardController.qml
View file

@ -450,12 +450,13 @@ Rectangle {
tmpWalletFilename = oshelper.temporaryFilename(); tmpWalletFilename = oshelper.temporaryFilename();
console.log("Creating temporary wallet", tmpWalletFilename) console.log("Creating temporary wallet", tmpWalletFilename)
var nettype = persistentSettings.nettype; var nettype = persistentSettings.nettype;
var kdfRounds = persistentSettings.kdfRounds;
var restoreHeight = wizardController.walletOptionsRestoreHeight; var restoreHeight = wizardController.walletOptionsRestoreHeight;
var subaddressLookahead = wizardController.walletOptionsSubaddressLookahead; var subaddressLookahead = wizardController.walletOptionsSubaddressLookahead;
var deviceName = wizardController.walletOptionsDeviceName; var deviceName = wizardController.walletOptionsDeviceName;
connect(); connect();
walletManager.createWalletFromDeviceAsync(tmpWalletFilename, "", nettype, deviceName, restoreHeight, subaddressLookahead); walletManager.createWalletFromDeviceAsync(tmpWalletFilename, "", nettype, deviceName, restoreHeight, subaddressLookahead, kdfRounds);
creatingWalletDeviceSplash(); creatingWalletDeviceSplash();
} }