X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fbase58.h;h=2b6e3266c5fc51131e2f670012d7ae4471ee2dad;hb=15e9a03687e99d6b1a7a90e56e69a37faa6bb9b8;hp=b8a0e45530bcdbefe1ee313abc0df29b61203579;hpb=3b3a4cb430cf5a7e3665faeaec0ae882b0650336;p=novacoin.git

diff --git a/src/base58.h b/src/base58.h
index b8a0e45..2b6e326 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -67,6 +67,7 @@ public:
     bool SetString(const char* psz);
     bool SetString(const std::string& str);
     std::string ToString() const;
+    const std::vector<unsigned char> &GetData() const;
 
     int CompareTo(const CBase58Data& b58) const;
     bool operator==(const CBase58Data& b58) const { return CompareTo(b58) == 0; }
@@ -81,6 +82,8 @@ public:
  * The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
  * Script-hash-addresses have version 5 (or 196 testnet).
  * The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
+ * Pubkey-pair-addresses have version 1 (or 6 testnet)
+ * The data vector contains a serialized copy of two compressed ECDSA secp256k1 public keys.
  */
 class CBitcoinAddress;
 class CBitcoinAddressVisitor : public boost::static_visitor<bool>
@@ -91,6 +94,7 @@ public:
     CBitcoinAddressVisitor(CBitcoinAddress *addrIn) : addr(addrIn) { }
     bool operator()(const CKeyID &id) const;
     bool operator()(const CScriptID &id) const;
+    bool operator()(const CMalleablePubKey &mpk) const;
     bool operator()(const CNoDestination &no) const;
 };
 
@@ -99,8 +103,10 @@ class CBitcoinAddress : public CBase58Data
 public:
     enum
     {
+        PUBKEY_PAIR_ADDRESS = 1,
         PUBKEY_ADDRESS = 8,
         SCRIPT_ADDRESS = 20,
+        PUBKEY_PAIR_ADDRESS_TEST = 6,
         PUBKEY_ADDRESS_TEST = 111,
         SCRIPT_ADDRESS_TEST = 196
     };
@@ -108,6 +114,7 @@ public:
     bool Set(const CKeyID &id);
     bool Set(const CScriptID &id);
     bool Set(const CTxDestination &dest);
+    bool Set(const CMalleablePubKey &mpk);
     bool IsValid() const;
 
     CBitcoinAddress()
@@ -119,6 +126,11 @@ public:
         Set(dest);
     }
 
+    CBitcoinAddress(const CMalleablePubKey &mpk)
+    {
+        Set(mpk);
+    }
+
     CBitcoinAddress(const std::string& strAddress)
     {
         SetString(strAddress);
@@ -132,11 +144,14 @@ public:
     CTxDestination Get() const;
     bool GetKeyID(CKeyID &keyID) const;
     bool IsScript() const;
+    bool IsPubKey() const;
+    bool IsPair() const;
 };
 
-bool inline CBitcoinAddressVisitor::operator()(const CKeyID &id) const         { return addr->Set(id); }
-bool inline CBitcoinAddressVisitor::operator()(const CScriptID &id) const      { return addr->Set(id); }
-bool inline CBitcoinAddressVisitor::operator()(const CNoDestination &id) const { return false; }
+bool inline CBitcoinAddressVisitor::operator()(const CKeyID &id) const            { return addr->Set(id); }
+bool inline CBitcoinAddressVisitor::operator()(const CScriptID &id) const         { return addr->Set(id); }
+bool inline CBitcoinAddressVisitor::operator()(const CMalleablePubKey &mpk) const { return addr->Set(mpk); }
+bool inline CBitcoinAddressVisitor::operator()(const CNoDestination &id) const    { return false; }
 
 /** A base58-encoded secret key */
 class CBitcoinSecret : public CBase58Data