monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 11:39:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix with tx proof + update

Browse source
This commit is contained in:
stoffu 2017-11-20 16:24:29 +09:00
parent 2147803d45
commit d8f3a52378
No known key found for this signature in database
GPG key ID: 41DAB8343A9EC012
4 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MiddlePanel.qml
View file

@ -65,8 +65,8 @@ Rectangle {
signal paymentClicked(string address, string paymentId, string amount, int mixinCount, int priority, string description)
signal sweepUnmixableClicked()
signal generatePaymentIdInvoked()
signal getTxProofClicked(string txid, string address, string message);
signal checkTxProofClicked(string txid, string address, string message, string signature);
signal getProofClicked(string txid, string address, string message);
signal checkProofClicked(string txid, string address, string message, string signature);
color: "#F0EEEE"

16
main.qml
View file

@ -243,8 +243,8 @@ ApplicationWindow {
currentWallet.connectionStatusChanged.disconnect(onWalletConnectionStatusChanged)
middlePanel.paymentClicked.disconnect(handlePayment);
middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
middlePanel.getTxProofClicked.disconnect(handleGetTxProof);
middlePanel.checkTxProofClicked.disconnect(handleCheckTxProof);
middlePanel.getProofClicked.disconnect(handleGetProof);
middlePanel.checkProofClicked.disconnect(handleCheckProof);
}
currentWallet = undefined;
@ -276,8 +276,8 @@ ApplicationWindow {
currentWallet.connectionStatusChanged.connect(onWalletConnectionStatusChanged)
middlePanel.paymentClicked.connect(handlePayment);
middlePanel.sweepUnmixableClicked.connect(handleSweepUnmixable);
middlePanel.getTxProofClicked.connect(handleGetTxProof);
middlePanel.checkTxProofClicked.connect(handleCheckTxProof);
middlePanel.getProofClicked.connect(handleGetProof);
middlePanel.checkProofClicked.connect(handleCheckProof);
console.log("Recovering from seed: ", persistentSettings.is_recovering)
@ -757,8 +757,8 @@ ApplicationWindow {
currentWallet.store();
}
// called on "getTxProof"
function handleGetTxProof(txid, address, message) {
// called on "getProof"
function handleGetProof(txid, address, message) {
console.log("Getting payment proof: ")
console.log("\ttxid: ", txid,
", address: ", address,
@ -778,8 +778,8 @@ ApplicationWindow {
informationPopup.open()
}
// called on "checkTxProof"
function handleCheckTxProof(txid, address, message, signature) {
// called on "checkProof"
function handleCheckProof(txid, address, message, signature) {
console.log("Checking payment proof: ")
console.log("\ttxid: ", txid,
", address: ", address,

12
pages/TxKey.qml
View file

@ -64,8 +64,16 @@ Rectangle {
}
function checkSignature(signature) {
return signature.startsWith("OutProofV") && check256(signature, 142) ||
signature.startsWith("InProofV") && check256(signature, 141)
if (signature.startsWith("OutProofV")) {
if ((signature.length - 10) % 132 != 0)
return false;
return check256(signature, signature.length);
} else if (signature.startsWith("InProofV")) {
if ((signature.length - 9) % 132 != 0)
return false;
return check256(signature, signature.length);
}
return false;
}
/* main layout */

9
src/libwalletqt/Wallet.cpp
View file

@ -506,11 +506,10 @@ QString Wallet::checkTxKey(const QString &txid, const QString &tx_key, const QSt
QString Wallet::getTxProof(const QString &txid, const QString &address, const QString &message) const
{
std::string error_str;
QString result = QString::fromStdString(m_walletImpl->getTxProof(txid.toStdString(), address.toStdString(), message.toStdString(), error_str));
if (!error_str.empty())
result = QString::fromStdString("error|" + error_str);
return result;
std::string result = m_walletImpl->getTxProof(txid.toStdString(), address.toStdString(), message.toStdString());
if (result.empty())
result = "error|" + m_walletImpl->errorString();
return QString::fromStdString(result);
}
QString Wallet::checkTxProof(const QString &txid, const QString &address, const QString &message, const QString &signature)