diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-14 23:44:52 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-24 20:26:19 +0200 |
commit | 1025440184ef100a22d07c7bb543ee45cf169d64 (patch) | |
tree | cd85ae7d981820189e506167e518adaf820aa638 /src/qt/verifymessagedialog.cpp | |
parent | fd61d6f5068cf92d34569862b4225f177049a4f0 (diff) |
Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
This introduces internal types:
* CKeyID: reference (hash160) of a key
* CScriptID: reference (hash160) of a script
* CTxDestination: a boost::variant of the former two
CBitcoinAddress is retrofitted to be a Base58 encoding of a
CTxDestination. This allows all internal code to only use the
internal types, and only have RPC and GUI depend on the base58 code.
Furthermore, the header dependencies are a lot saner now. base58.h is
at the top (right below rpc and gui) instead of at the bottom. For the
rest: wallet -> script -> keystore -> key. Only keystore still requires
a forward declaration of CScript. Solving that would require splitting
script into two layers.
Diffstat (limited to 'src/qt/verifymessagedialog.cpp')
-rw-r--r-- | src/qt/verifymessagedialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/verifymessagedialog.cpp b/src/qt/verifymessagedialog.cpp index 0bac24820c..d71568d2e9 100644 --- a/src/qt/verifymessagedialog.cpp +++ b/src/qt/verifymessagedialog.cpp @@ -14,6 +14,7 @@ #include "walletmodel.h" #include "addresstablemodel.h" #include "guiutil.h" +#include "base58.h" VerifyMessageDialog::VerifyMessageDialog(AddressTableModel *addressModel, QWidget *parent) : QDialog(parent), @@ -62,7 +63,7 @@ bool VerifyMessageDialog::checkAddress() return false; } - CBitcoinAddress address(key.GetPubKey()); + CBitcoinAddress address(key.GetPubKey().GetID()); QString qStringAddress = QString::fromStdString(address.ToString()); ui->lnAddress->setText(qStringAddress); ui->copyToClipboard->setEnabled(true); |