Change CWallet addressgrouping to use CTxDestination instead of strings.

This is cleanup for the listaddressgroupings code. Also add some
real help text.
This commit is contained in:
Gregory Maxwell
2012-08-20 13:43:33 -04:00
parent 92735bca31
commit b1093efa83
4 changed files with 57 additions and 54 deletions

View File

@@ -10,7 +10,6 @@
#include <stdlib.h>
#include "base58.h"
#include "main.h"
#include "key.h"
#include "keystore.h"
@@ -177,8 +176,8 @@ public:
int64 GetOldestKeyPoolTime();
void GetAllReserveKeys(std::set<CKeyID>& setAddress);
std::set< std::set<std::string> > GetAddressGroupings();
std::map<std::string, int64> GetAddressBalances();
std::set< std::set<CTxDestination> > GetAddressGroupings();
std::map<CTxDestination, int64> GetAddressBalances();
bool IsMine(const CTxIn& txin) const;
int64 GetDebit(const CTxIn& txin) const;
@@ -647,13 +646,6 @@ public:
return true;
}
std::string GetAddressOfTxOut(int n) const
{
CTxDestination addr;
ExtractDestination(vout[n].scriptPubKey, addr);
return CBitcoinAddress(addr).ToString();
}
bool WriteToDisk();
int64 GetTxTime() const;