Merge 3a0d6da098 into merged_master (Bitcoin PR #15371)

This commit is contained in:
Andrew Poelstra 2020-10-28 23:29:43 +00:00
commit 8b992e207a

View file

@ -182,7 +182,9 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
QString formatBitcoinURI(const SendCoinsRecipient &info)
{
QString ret = QString("bitcoin:%1").arg(info.address);
bool bech_32 = info.address.startsWith(QString::fromStdString(Params().Bech32HRP() + "1"));
QString ret = QString("bitcoin:%1").arg(bech_32 ? info.address.toUpper() : info.address);
int paramCount = 0;
if (info.amount)