Merge pull request #1574

59a63e7 Fix blackball section to conform to format change (moneromooo-monero)

2 files changed, 7 insertions, 9 deletions

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 2c6e92c9..4aa442fa 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -738,11 +738,9 @@ QString Wallet::getDaemonLogPath() const
     return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/bitmonero.log";
 }
 
-bool Wallet::blackballOutput(const QString &pubkey)
+bool Wallet::blackballOutput(const QString &amount, const QString &offset)
 {
-    QList<QString> list;
-    list.push_back(pubkey);
-    return blackballOutputs(list, true);
+    return m_walletImpl->blackballOutput(amount.toStdString(), offset.toStdString());
 }
 
 bool Wallet::blackballOutputs(const QList<QString> &pubkeys, bool add)
@@ -775,9 +773,9 @@ bool Wallet::blackballOutputs(const QString &filename, bool add)
     }
 }
 
-bool Wallet::unblackballOutput(const QString &pubkey)
+bool Wallet::unblackballOutput(const QString &amount, const QString &offset)
 {
-    return m_walletImpl->unblackballOutput(pubkey.toStdString());
+    return m_walletImpl->unblackballOutput(amount.toStdString(), offset.toStdString());
 }
 
 QString Wallet::getRing(const QString &key_image)
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index d0f053ac..8197e567 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -281,10 +281,10 @@ public:
     QString getWalletLogPath() const;
 
     // Blackalled outputs
-    Q_INVOKABLE bool blackballOutput(const QString &pubkey);
-    Q_INVOKABLE bool blackballOutputs(const QList<QString> &pubkeys, bool add);
+    Q_INVOKABLE bool blackballOutput(const QString &amount, const QString &offset);
+    Q_INVOKABLE bool blackballOutputs(const QList<QString> &outputs, bool add);
     Q_INVOKABLE bool blackballOutputs(const QString &filename, bool add);
-    Q_INVOKABLE bool unblackballOutput(const QString &pubkey);
+    Q_INVOKABLE bool unblackballOutput(const QString &amount, const QString &offset);
 
     // Rings
     Q_INVOKABLE QString getRing(const QString &key_image);