mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 12:09:57 +00:00
Wallet: implement async wallet storing
This commit is contained in:
parent
4141832a4d
commit
cfdba59584
6 changed files with 61 additions and 38 deletions
6
main.qml
6
main.qml
|
@ -972,7 +972,11 @@ ApplicationWindow {
|
|||
informationPopup.open()
|
||||
currentWallet.refresh()
|
||||
currentWallet.disposeTransaction(transaction)
|
||||
currentWallet.store();
|
||||
currentWallet.storeAsync(function(success) {
|
||||
if (!success) {
|
||||
appWindow.showStatusMessage(qsTr("Failed to store the wallet"), 3);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// called on "getProof"
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QList>
|
||||
#include <QVector>
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
|
||||
namespace {
|
||||
|
@ -230,9 +229,19 @@ QString Wallet::path() const
|
|||
return QDir::toNativeSeparators(QString::fromStdString(m_walletImpl->path()));
|
||||
}
|
||||
|
||||
bool Wallet::store(const QString &path)
|
||||
void Wallet::storeAsync(const QJSValue &callback, const QString &path /* = "" */)
|
||||
{
|
||||
return m_walletImpl->store(path.toStdString());
|
||||
const auto future = m_scheduler.run(
|
||||
[this, path] {
|
||||
QMutexLocker locker(&m_storeMutex);
|
||||
|
||||
return QJSValueList({m_walletImpl->store(path.toStdString())});
|
||||
},
|
||||
callback);
|
||||
if (!future.first)
|
||||
{
|
||||
QJSValue(callback).call(QJSValueList({false}));
|
||||
}
|
||||
}
|
||||
|
||||
bool Wallet::init(const QString &daemonAddress, bool trustedDaemon, quint64 upperTransactionLimit, bool isRecovering, bool isRecoveringFromDevice, quint64 restoreHeight)
|
||||
|
|
|
@ -144,7 +144,7 @@ public:
|
|||
|
||||
//! saves wallet to the file by given path
|
||||
//! empty path stores in current location
|
||||
Q_INVOKABLE bool store(const QString &path = "");
|
||||
Q_INVOKABLE void storeAsync(const QJSValue &callback, const QString &path = "");
|
||||
|
||||
//! initializes wallet asynchronously
|
||||
Q_INVOKABLE void initAsync(const QString &daemonAddress, bool trustedDaemon = false, quint64 upperTransactionLimit = 0, bool isRecovering = false, bool isRecoveringFromDevice = false, quint64 restoreHeight = 0);
|
||||
|
@ -434,6 +434,7 @@ private:
|
|||
QString m_daemonPassword;
|
||||
Monero::WalletListener *m_walletListener;
|
||||
FutureScheduler m_scheduler;
|
||||
QMutex m_storeMutex;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -344,41 +344,48 @@ Rectangle {
|
|||
wizardController.tmpWalletFilename = tmp_wallet_filename
|
||||
}
|
||||
|
||||
function writeWallet() {
|
||||
function writeWallet(onSuccess) {
|
||||
// Save wallet files in user specified location
|
||||
var new_wallet_filename = Wizard.createWalletPath(
|
||||
isIOS,
|
||||
wizardController.walletOptionsLocation,
|
||||
wizardController.walletOptionsName);
|
||||
|
||||
if(isIOS) {
|
||||
console.log("saving in ios: " + moneroAccountsDir + new_wallet_filename)
|
||||
wizardController.m_wallet.store(moneroAccountsDir + new_wallet_filename);
|
||||
} else {
|
||||
console.log("saving in wizard: " + new_wallet_filename)
|
||||
wizardController.m_wallet.store(new_wallet_filename);
|
||||
const handler = function(success) {
|
||||
if (!success) {
|
||||
appWindow.showStatusMessage(qsTr("Failed to store the wallet"), 3);
|
||||
return;
|
||||
}
|
||||
|
||||
// make sure temporary wallet files are deleted
|
||||
console.log("Removing temporary wallet: " + wizardController.tmpWalletFilename)
|
||||
oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename)
|
||||
|
||||
// protecting wallet with password
|
||||
wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword);
|
||||
|
||||
// save to persistent settings
|
||||
persistentSettings.language = wizardController.language_language
|
||||
persistentSettings.locale = wizardController.language_locale
|
||||
|
||||
persistentSettings.account_name = wizardController.walletOptionsName
|
||||
persistentSettings.wallet_path = wizardController.m_wallet.path;
|
||||
persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight
|
||||
|
||||
persistentSettings.allow_background_mining = false
|
||||
persistentSettings.is_recovering = (wizardController.walletOptionsIsRecovering === undefined) ? false : wizardController.walletOptionsIsRecovering
|
||||
persistentSettings.is_recovering_from_device = (wizardController.walletOptionsIsRecoveringFromDevice === undefined) ? false : wizardController.walletOptionsIsRecoveringFromDevice
|
||||
|
||||
restart();
|
||||
|
||||
onSuccess();
|
||||
};
|
||||
|
||||
if (isIOS) {
|
||||
new_wallet_filename = moneroAccountsDir + new_wallet_filename;
|
||||
}
|
||||
|
||||
// make sure temporary wallet files are deleted
|
||||
console.log("Removing temporary wallet: " + wizardController.tmpWalletFilename)
|
||||
oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename)
|
||||
|
||||
// protecting wallet with password
|
||||
wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword);
|
||||
|
||||
// save to persistent settings
|
||||
persistentSettings.language = wizardController.language_language
|
||||
persistentSettings.locale = wizardController.language_locale
|
||||
|
||||
persistentSettings.account_name = wizardController.walletOptionsName
|
||||
persistentSettings.wallet_path = wizardController.m_wallet.path;
|
||||
persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight
|
||||
|
||||
persistentSettings.allow_background_mining = false
|
||||
persistentSettings.is_recovering = (wizardController.walletOptionsIsRecovering === undefined) ? false : wizardController.walletOptionsIsRecovering
|
||||
persistentSettings.is_recovering_from_device = (wizardController.walletOptionsIsRecoveringFromDevice === undefined) ? false : wizardController.walletOptionsIsRecoveringFromDevice
|
||||
|
||||
restart();
|
||||
console.log("saving new wallet to", new_wallet_filename);
|
||||
wizardController.m_wallet.storeAsync(handler, new_wallet_filename);
|
||||
}
|
||||
|
||||
function recoveryWallet() {
|
||||
|
|
|
@ -77,9 +77,10 @@ Rectangle {
|
|||
}
|
||||
}
|
||||
onNextClicked: {
|
||||
wizardController.writeWallet();
|
||||
wizardController.useMoneroClicked();
|
||||
wizardController.walletOptionsIsRecoveringFromDevice = false;
|
||||
wizardController.writeWallet(function() {
|
||||
wizardController.useMoneroClicked();
|
||||
wizardController.walletOptionsIsRecoveringFromDevice = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,8 +78,9 @@ Rectangle {
|
|||
}
|
||||
onNextClicked: {
|
||||
wizardController.recoveryWallet();
|
||||
wizardController.writeWallet();
|
||||
wizardController.useMoneroClicked();
|
||||
wizardController.writeWallet(function() {
|
||||
wizardController.useMoneroClicked();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue