diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-13 15:36:44 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-13 15:36:44 -0500 |
| commit | eed51e3ffa4a6a20dd6392e07a3d7afde99b088e (patch) | |
| tree | f6379babcea1ead55ae2db686f30a99824f9c710 /src | |
| parent | 6a889bdaa19bd6ef66165d18d10f82c2c5ed6fa0 (diff) | |
| parent | 48aab5c6e57f9e66ffec7cae0c1398ac767381f7 (diff) | |
| download | monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.gz monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.xz monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.zip | |
Merge pull request #2772
48aab5c WalletManager: wallet recovery - seed offset passphrase support (xiphon)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 4 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index e089a285..01faf905 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -151,14 +151,14 @@ void WalletManager::openWalletAsync(const QString &path, const QString &password } -Wallet *WalletManager::recoveryWallet(const QString &path, const QString &memo, NetworkType::Type nettype, quint64 restoreHeight, quint64 kdfRounds) +Wallet *WalletManager::recoveryWallet(const QString &path, const QString &seed, const QString &seed_offset, NetworkType::Type nettype, quint64 restoreHeight, quint64 kdfRounds) { QMutexLocker locker(&m_mutex); if (m_currentWallet) { qDebug() << "Closing open m_currentWallet" << m_currentWallet; delete m_currentWallet; } - Monero::Wallet * w = m_pimpl->recoveryWallet(path.toStdString(), "", memo.toStdString(), static_cast<Monero::NetworkType>(nettype), restoreHeight, kdfRounds); + Monero::Wallet * w = m_pimpl->recoveryWallet(path.toStdString(), "", seed.toStdString(), static_cast<Monero::NetworkType>(nettype), restoreHeight, kdfRounds, seed_offset.toStdString()); m_currentWallet = new Wallet(w); return m_currentWallet; } diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index e5243caf..d03e4e13 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -83,7 +83,7 @@ public: Q_INVOKABLE void openWalletAsync(const QString &path, const QString &password, NetworkType::Type nettype = NetworkType::MAINNET, quint64 kdfRounds = 1); // wizard: recoveryWallet path; hint: internally it recorvers wallet and set password = "" - Q_INVOKABLE Wallet * recoveryWallet(const QString &path, const QString &memo, + Q_INVOKABLE Wallet * recoveryWallet(const QString &path, const QString &seed, const QString &seed_offset, NetworkType::Type nettype = NetworkType::MAINNET, quint64 restoreHeight = 0, quint64 kdfRounds = 1); Q_INVOKABLE Wallet * createWalletFromKeys(const QString &path, |