4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-13 20:06:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #66

Browse Source 
628b26c Transfer: validate destination address (moneromooo.monero)
51f89a8 Transfer: disable Send button if the payment id is invalid (moneromooo.monero)
This commit is contained in:
Riccardo Spagni 2016-10-24 10:34:29 +02:00
commit b74cae4168
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pages/Transfer.qml
View File

@ -239,6 +239,19 @@ Rectangle {
anchors.topMargin: 5 anchors.topMargin: 5
} }
function checkAddressAndPaymentID(address, payment_id, testnet) {
print ("testing")
if (!walletManager.addressValid(address, testnet))
return false
print ("address is valid")
var ipid = walletManager.paymentIdFromAddress(address, testnet)
print ("ipid: [" + ipid + "]")
if (ipid.length > 0)
return payment_id === ""
print ("payment_id: [" + payment_id + "]")
return payment_id === "" || walletManager.paymentIdValid(payment_id)
}
StandardButton { StandardButton {
id: sendButton id: sendButton
anchors.left: parent.left anchors.left: parent.left
@ -251,7 +264,7 @@ Rectangle {
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
enabled : addressLine.text.length > 0 && amountLine.text.length > 0 enabled : amountLine.text.length > 0 && checkAddressAndPaymentID(addressLine.text.trim(), paymentIdLine.text.trim(), appWindow.persistentSettings.testnet)
onClicked: { onClicked: {
console.log("Transfer: paymentClicked") console.log("Transfer: paymentClicked")
var priority = priorityModel.get(priorityDropdown.currentIndex).priority var priority = priorityModel.get(priorityDropdown.currentIndex).priority

15
src/libwalletqt/WalletManager.cpp
View File

@ -149,6 +149,21 @@ quint64 WalletManager::amountFromDouble(double amount) const
return Bitmonero::Wallet::amountFromDouble(amount); return Bitmonero::Wallet::amountFromDouble(amount);
} }
bool WalletManager::paymentIdValid(const QString &payment_id) const
{
return Bitmonero::Wallet::paymentIdValid(payment_id.toStdString());
}
bool WalletManager::addressValid(const QString &address, bool testnet) const
{
return Bitmonero::Wallet::addressValid(address.toStdString(), testnet);
}
QString WalletManager::paymentIdFromAddress(const QString &address, bool testnet) const
{
return QString::fromStdString(Bitmonero::Wallet::paymentIdFromAddress(address.toStdString(), testnet));
}
void WalletManager::setLogLevel(int logLevel) void WalletManager::setLogLevel(int logLevel)
{ {
Bitmonero::WalletManagerFactory::setLogLevel(logLevel); Bitmonero::WalletManagerFactory::setLogLevel(logLevel);

4
src/libwalletqt/WalletManager.h
View File

@ -89,6 +89,10 @@ public:
// QML JS engine doesn't support unsigned integers // QML JS engine doesn't support unsigned integers
Q_INVOKABLE QString maximumAllowedAmountAsSting() const; Q_INVOKABLE QString maximumAllowedAmountAsSting() const;
Q_INVOKABLE bool paymentIdValid(const QString &payment_id) const;
Q_INVOKABLE bool addressValid(const QString &address, bool testnet) const;
Q_INVOKABLE QString paymentIdFromAddress(const QString &address, bool testnet) const;
// QML missing such functionality, implementing these helpers here // QML missing such functionality, implementing these helpers here
Q_INVOKABLE QString urlToLocalPath(const QUrl &url) const; Q_INVOKABLE QString urlToLocalPath(const QUrl &url) const;
Q_INVOKABLE QUrl localPathToUrl(const QString &path) const; Q_INVOKABLE QUrl localPathToUrl(const QString &path) const;