The merchant name is stored in the X.509 certificate embedded in a PaymentRequest. Use some string searching to locate it so that it can be shown to the user in the transaction details when BIP70 support was not configured.
An additional notice is added to the merchant string that indicates the certificate was not verified. When BIP70 is enabled, the certificate would be verified and the merchant name not shown if the certificate was invalid.
273 QString merchant;
274 if (req.getMerchant(PaymentServer::getCertStore(), merchant))
275 strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>";
276+#else
277+ // Search for the supported pki type strings
278+ std::string pr = r.second;
Concept ACK
Are there other places where the vendor name is used? For ex. the transaction list?
AFAIK, no. luke-jr might know as he was the one that pointed this out to me.
I checked: you’re right, the only place outside of paymentrequestplus / paymentserver and the tests where the getMerchant method is used is here.
Tested fc295e42071a82955c35d90792a9cbd127ca2859 works for me on transactions I made via BIP70 back in 2015.
Concept ACK.
Tested fc295e4 on macOS 10.14 without BIP70 support by looking at some BitPay transactions from late 2018. It shows the merchant with “(Certificate was not verified)”
However when I test with BIP70 support it doesn’t show the merchant. That doesn’t work on master either.
A test case for GetPaymentRequestMerchant would be nice.
However when I test with BIP70 support it doesn’t show the merchant. That doesn’t work on master either.
Presumably the certificate is no longer valid. I believe they have a new certificate since earlier this year, so the old one expired and thus the merchant name isn’t being shown now.
284@@ -255,26 +285,34 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
285 strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
286
287 // Message from normal bitcoin:URI (bitcoin:123...?message=example)
288- for (const std::pair<std::string, std::string>& r : orderForm)
289+ for (const std::pair<std::string, std::string>& r : orderForm) {
This will change Message,Message,Merchant,Merchant into Message,Merchant,Message,Merchant.
Is that intentional? Probably should be in a separate commit…
Does it really matter that much that the order is changed?
The only reason I changed it is because it looked funny that there were two loops in a row over the same vector.
certificate is no longer valid. I believe they have a new certificate since earlier this year, so the old one expired and thus the merchant name isn’t being shown now.
Hehe so this actually tends to work more reliably because it doesn’t check the signature. Which is fine as it was (presumably) checked at the time the payment was made, which is what counts.
48@@ -49,6 +49,36 @@ QString TransactionDesc::FormatTxStatus(const interfaces::WalletTx& wtx, const i
49 }
50 }
51
52+#ifndef ENABLE_BIP70
53+// Takes an encoded PaymentRequst as a string and tries to find the Common Name of the X.509 certificate
PaymentRequest :)
The merchant name is stored in the X.509 certificate embedded in a
PaymentRequest. Use some string searching to locate it so that it
can be shown to the user in the transaction details when BIP70 support
was not configured.
I have a couple of payments to bitpay in my wallet. In Bitcoin Core 0.18.1 the merchant information wasn’t displayed at all for either of them. When I viewed the transaction details I would see this in the debug.log:
PaymentRequestPlus::getMerchant: Payment request: certificate expired or not yet active
The certificate was valid from 2017-03-23 18:22:00.000 UTC to 2019-04-25 19:11:00.000 UTC, and so could no longer be validated, and as a result Core wasn’t showing any “Merchant:” information at all.
In Bitcoin Core 0.19 I see:
Merchant: bitpay.com (Certificate was not verified)
which is infinitely better.
Labels
GUI
Milestone
0.19.0