Merge pull request #403 from sipa/cbitcoinaddress

keys indexed by address + introduced CBitcoinaddress
2011-07-24 15:38:38 -07:00
parent b6d19aefa0 ca40e581eb
commit a9ba47101a
13 changed files with 353 additions and 311 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,9 +21,6 @@ set<CWallet*> setpwalletRegistered;

 CCriticalSection cs_main;

-CCriticalSection cs_mapPubKeys;
-map<uint160, vector<unsigned char> > mapPubKeys;
-
 map<uint256, CTransaction> mapTransactions;
 CCriticalSection cs_mapTransactions;
 unsigned int nTransactionsUpdated = 0;