Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@ ApplicationWindow {
// opening with password but password doesn't match
console.error("Error opening wallet with password: ", wallet.errorString);
passwordDialog.showError(qsTr("Couldn't open wallet: ") + wallet.errorString);
console.log("closing wallet async : " + wallet.address)
closeWallet();
return;
}
Expand Down Expand Up @@ -1069,10 +1068,8 @@ ApplicationWindow {
var result = currentWallet.getReserveProof(false, currentWallet.currentSubaddressAccount, amount, message)
txProofComputed(null, result)
} else {
console.log("Getting payment proof: ")
console.log("\ttxid: ", txid,
", address: ", address,
", message: ", message);
// Don't log txid/address/message; payment-proof signatures are
// sensitive and must not end up in the logs.
function spendProofFallback(txid, result){
if (!result || result.indexOf("error|") === 0) {
currentWallet.getSpendProofAsync(txid, message, txProofComputed);
Expand Down Expand Up @@ -1101,11 +1098,8 @@ ApplicationWindow {

// called on "checkProof"
function handleCheckProof(txid, address, message, signature) {
console.log("Checking payment proof: ")
console.log("\ttxid: ", txid,
", address: ", address,
", message: ", message,
", signature: ", signature);
// Don't log txid/address/message/signature; payment-proof signatures
// are sensitive and must not end up in the logs.

var result;
var isReserveProof = signature.indexOf("ReserveProofV") === 0;
Expand Down
1 change: 0 additions & 1 deletion pages/AddressBook.qml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ Rectangle {
color: itemMouseArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"

function doSend() {
console.log("Sending to: ", address +" "+ paymentId);
middlePanel.sendTo(address, paymentId);
leftPanel.selectItem(middlePanel.state)
}
Expand Down
21 changes: 12 additions & 9 deletions pages/History.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,6 @@ Rectangle {
console.log('getProof: Error checking TxId and/or address');
}

console.log("getProof: Generate clicked: txid " + hash + ", address " + address);
middlePanel.getProofClicked(hash, address, '', null);
informationPopup.title = qsTr("Payment proof") + translationManager.emptyString;
informationPopup.text = qsTr("Generating payment proof") + "..." + translationManager.emptyString;
Expand All @@ -1738,17 +1737,21 @@ Rectangle {
trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">',
trEnd = "</td></tr>";

// destinations may intentionally contain "<br>" separators inserted by the wallet backend;
// escape everything first, then restore the literal "<br>" so line breaks are preserved.
destinations = Utils.htmlEscape(destinations).replace(/&lt;br&gt;/g, '<br>');

return '<table border="0">'
+ (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + tx_id + trEnd : "")
+ (dateTime ? trStart + qsTr("Date") + ":" + trMiddle + dateTime + trEnd : "")
+ (amount ? trStart + qsTr("Amount") + ":" + trMiddle + amount + trEnd : "")
+ (address ? trStart + qsTr("Address:") + trMiddle + address + trEnd : "")
+ (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId + trEnd : "")
+ (integratedAddress ? trStart + qsTr("Integrated address") + ":" + trMiddle + integratedAddress + trEnd : "")
+ (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + trEnd : "")
+ (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + Utils.htmlEscape(tx_id) + trEnd : "")
+ (dateTime ? trStart + qsTr("Date") + ":" + trMiddle + Utils.htmlEscape(dateTime) + trEnd : "")
+ (amount ? trStart + qsTr("Amount") + ":" + trMiddle + Utils.htmlEscape(amount) + trEnd : "")
+ (address ? trStart + qsTr("Address:") + trMiddle + Utils.htmlEscape(address) + trEnd : "")
+ (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + Utils.htmlEscape(paymentId) + trEnd : "")
+ (integratedAddress ? trStart + qsTr("Integrated address") + ":" + trMiddle + Utils.htmlEscape(integratedAddress) + trEnd : "")
+ (tx_key ? trStart + qsTr("Tx key:") + trMiddle + Utils.htmlEscape(tx_key) + trEnd : "")
+ (tx_note ? trStart + qsTr("Tx note:") + trMiddle + Utils.htmlEscape(tx_note) + trEnd : "")
+ (destinations ? trStart + qsTr("Destinations:") + trMiddle + destinations + trEnd : "")
+ (rings ? trStart + qsTr("Rings:") + trMiddle + rings + trEnd : "")
+ (rings ? trStart + qsTr("Rings:") + trMiddle + Utils.htmlEscape(rings) + trEnd : "")
+ "</table>"
+ translationManager.emptyString;
}
Expand Down
2 changes: 0 additions & 2 deletions pages/TxKey.qml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ Rectangle {
text: qsTr("Generate") + translationManager.emptyString
enabled: TxUtils.checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || TxUtils.checkAddress(getProofAddressLine.text, appWindow.persistentSettings.nettype)) || getReserveProofAmtLine.text.length != 0 && walletManager.amountFromString(getReserveProofAmtLine.text) < appWindow.getUnlockedBalance() && walletManager.amountFromString(getReserveProofAmtLine.text) > 0
onClicked: {
console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
middlePanel.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text, getReserveProofAmtLine.text)
}
}
Expand Down Expand Up @@ -233,7 +232,6 @@ Rectangle {
text: qsTr("Check") + translationManager.emptyString
enabled: (TxUtils.checkTxID(checkProofTxIdLine.text) && TxUtils.checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && TxUtils.checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.nettype)))) || (TxUtils.checkSignature(checkProofSignatureLine.text) && checkProofSignatureLine.text.indexOf("ReserveProofV") === 0 && TxUtils.checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.nettype))
onClicked: {
console.log("checkProof: Check clicked: txid " + checkProofTxIdLine.text + ", address " + checkProofAddressLine.text + ", message " + checkProofMessageLine.text + ", signature " + checkProofSignatureLine.text);
middlePanel.checkProofClicked(checkProofTxIdLine.text, checkProofAddressLine.text, checkProofMessageLine.text, checkProofSignatureLine.text)
}
}
Expand Down
Loading