Merge pull request #4

sipa · sipa · commit 7848ae0eed55 · 2015-06-09T17:44:52.000+02:00
05871c0 Produce confidential addresses in GUI (Pieter Wuille)
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
@@ -383,7 +383,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
                 return QString();
             }
         }
-        strAddress = CBitcoinAddress(newKey.GetID()).ToString();
+        strAddress = CBitcoinAddress(newKey.GetID()).AddBlindingKey(wallet->blinding_pubkey).ToString();
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con`
`383`	`383`	`return QString();`
`384`	`384`	`}`
`385`	`385`	`}`
`386`		`- strAddress = CBitcoinAddress(newKey.GetID()).ToString();`
	`386`	`+ strAddress = CBitcoinAddress(newKey.GetID()).AddBlindingKey(wallet->blinding_pubkey).ToString();`
`387`	`387`	`}`
`388`	`388`	`else`
`389`	`389`	`{`