Merge #15371: gui: Uppercase bech32 addresses in qr codes

jonasschnelli · jonasschnelli · commit 3a0d6da098c7 · 2019-04-29T09:04:40.000+02:00
3407b44 gui: Uppercase bech32 addresses in qr codes (Ben Carman) Pull request description: Closes #12191 ACKs for commit 3407b4: meshcollider: utACK bitcoin/bitcoin@3407b44 jonasschnelli: Re utACK 3407b44 Tree-SHA512: d63ecf8e9805c46c9f554cc929661a37837bc3ba9b7b931331c2a5c2b81468742e1819c9add73966083011709cc15ae1870a454348af8591b3d75d3765dca568
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -175,7 +175,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)

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,9 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)`
`175`	`175`
`176`	`176`	`QString formatBitcoinURI(const SendCoinsRecipient &info)`
`177`	`177`	`{`
`178`		`- QString ret = QString("bitcoin:%1").arg(info.address);`
	`178`	`+ bool bech_32 = info.address.startsWith(QString::fromStdString(Params().Bech32HRP() + "1"));`
	`179`	`+`
	`180`	`+ QString ret = QString("bitcoin:%1").arg(bech_32 ? info.address.toUpper() : info.address);`
`179`	`181`	`int paramCount = 0;`
`180`	`182`
`181`	`183`	`if (info.amount)`