Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-16 17:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Offline tx signing: don't rely on errorString for import/export success

Browse source
This commit is contained in:
tobtoht 2022-03-14 20:49:15 +01:00
parent a8910b0fe4
commit 87e46fc961
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/MainWindow.cpp
View file

@ -1092,10 +1092,9 @@ void MainWindow::exportKeyImages() {
QString fn = QFileDialog::getSaveFileName(this, "Save key images to file", QString("%1/%2_%3").arg(QDir::homePath(), this->walletName(), QString::number(QDateTime::currentSecsSinceEpoch())), "Key Images (*_keyImages)"); QString fn = QFileDialog::getSaveFileName(this, "Save key images to file", QString("%1/%2_%3").arg(QDir::homePath(), this->walletName(), QString::number(QDateTime::currentSecsSinceEpoch())), "Key Images (*_keyImages)");
if (fn.isEmpty()) return; if (fn.isEmpty()) return;
if (!fn.endsWith("_keyImages")) fn += "_keyImages"; if (!fn.endsWith("_keyImages")) fn += "_keyImages";
m_ctx->wallet->exportKeyImages(fn, true); bool r = m_ctx->wallet->exportKeyImages(fn, true);
auto err = m_ctx->wallet->errorString(); if (!r) {
if (!err.isEmpty()) { QMessageBox::warning(this, "Key image export", QString("Failed to export key images.\nReason: %1").arg(m_ctx->wallet->errorString()));
QMessageBox::warning(this, "Key image export", QString("Failed to export key images.\nReason: %1").arg(err));
} else { } else {
QMessageBox::information(this, "Key image export", "Successfully exported key images."); QMessageBox::information(this, "Key image export", "Successfully exported key images.");
} }
@ -1104,10 +1103,9 @@ void MainWindow::exportKeyImages() {
void MainWindow::importKeyImages() { void MainWindow::importKeyImages() {
QString fn = QFileDialog::getOpenFileName(this, "Import key image file", QDir::homePath(), "Key Images (*_keyImages)"); QString fn = QFileDialog::getOpenFileName(this, "Import key image file", QDir::homePath(), "Key Images (*_keyImages)");
if (fn.isEmpty()) return; if (fn.isEmpty()) return;
m_ctx->wallet->importKeyImages(fn); bool r = m_ctx->wallet->importKeyImages(fn);
auto err = m_ctx->wallet->errorString(); if (!r) {
if (!err.isEmpty()) { QMessageBox::warning(this, "Key image import", QString("Failed to import key images.\n\n%1").arg(m_ctx->wallet->errorString()));
QMessageBox::warning(this, "Key image import", QString("Failed to import key images.\n\n%1").arg(err));
} else { } else {
QMessageBox::information(this, "Key image import", "Successfully imported key images"); QMessageBox::information(this, "Key image import", "Successfully imported key images");
m_ctx->refreshModels(); m_ctx->refreshModels();
@ -1118,10 +1116,9 @@ void MainWindow::exportOutputs() {
QString fn = QFileDialog::getSaveFileName(this, "Save outputs to file", QString("%1/%2_%3").arg(QDir::homePath(), this->walletName(), QString::number(QDateTime::currentSecsSinceEpoch())), "Outputs (*_outputs)"); QString fn = QFileDialog::getSaveFileName(this, "Save outputs to file", QString("%1/%2_%3").arg(QDir::homePath(), this->walletName(), QString::number(QDateTime::currentSecsSinceEpoch())), "Outputs (*_outputs)");
if (fn.isEmpty()) return; if (fn.isEmpty()) return;
if (!fn.endsWith("_outputs")) fn += "_outputs"; if (!fn.endsWith("_outputs")) fn += "_outputs";
m_ctx->wallet->exportOutputs(fn, true); bool r = m_ctx->wallet->exportOutputs(fn, true);
auto err = m_ctx->wallet->errorString(); if (!r) {
if (!err.isEmpty()) { QMessageBox::warning(this, "Outputs export", QString("Failed to export outputs.\nReason: %1").arg(m_ctx->wallet->errorString()));
QMessageBox::warning(this, "Outputs export", QString("Failed to export outputs.\nReason: %1").arg(err));
} else { } else {
QMessageBox::information(this, "Outputs export", "Successfully exported outputs."); QMessageBox::information(this, "Outputs export", "Successfully exported outputs.");
} }
@ -1130,10 +1127,9 @@ void MainWindow::exportOutputs() {
void MainWindow::importOutputs() { void MainWindow::importOutputs() {
QString fn = QFileDialog::getOpenFileName(this, "Import outputs file", QDir::homePath(), "Outputs (*_outputs)"); QString fn = QFileDialog::getOpenFileName(this, "Import outputs file", QDir::homePath(), "Outputs (*_outputs)");
if (fn.isEmpty()) return; if (fn.isEmpty()) return;
m_ctx->wallet->importOutputs(fn); bool r = m_ctx->wallet->importOutputs(fn);
auto err = m_ctx->wallet->errorString(); if (!r) {
if (!err.isEmpty()) { QMessageBox::warning(this, "Outputs import", QString("Failed to import outputs.\n\n%1").arg(m_ctx->wallet->errorString()));
QMessageBox::warning(this, "Outputs import", QString("Failed to import outputs.\n\n%1").arg(err));
} else { } else {
QMessageBox::information(this, "Outputs import", "Successfully imported outputs"); QMessageBox::information(this, "Outputs import", "Successfully imported outputs");
m_ctx->refreshModels(); m_ctx->refreshModels();