Merge bitcoin v0.5.1 into ppcoin

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/checkpoints.cpp
index 0000000,c7e054d..d20fe24
mode 000000,100644..100644
--- /dev/null
--- 2/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@@ -1,0 -1,65 +1,57 @@@
+ // Copyright (c) 2011 The Bitcoin developers
+ // Distributed under the MIT/X11 software license, see the accompanying
+ // file license.txt or http://www.opensource.org/licenses/mit-license.php.
+ 
+ #include <boost/assign/list_of.hpp> // for 'map_list_of()'
+ #include <boost/foreach.hpp>
+ 
+ #include "headers.h"
+ #include "checkpoints.h"
+ 
+ namespace Checkpoints
+ {
+     typedef std::map<int, uint256> MapCheckpoints;
+ 
+     //
+     // What makes a good checkpoint block?
+     // + Is surrounded by blocks with reasonable timestamps
+     //   (no blocks before with a timestamp after, none after with
+     //    timestamp before)
+     // + Contains no strange transactions
+     //
+     static MapCheckpoints mapCheckpoints =
+         boost::assign::map_list_of
 -        ( 11111, uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d"))
 -        ( 33333, uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6"))
 -        ( 68555, uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a"))
 -        ( 70567, uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a"))
 -        ( 74000, uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20"))
 -        (105000, uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97"))
 -        (118000, uint256("0x000000000000774a7f8a7a12dc906ddb9e17e75d684f15e00f8767f9e8f36553"))
 -        (134444, uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe"))
 -        (140700, uint256("0x000000000000033b512028abb90e1626d8b346fd0ed598ac0a3c371138dce2bd"))
 -        ;
++        ( 0, hashGenesisBlock )
++        ; // ppcoin: no checkpoint yet; to be created in future releases
+ 
+     bool CheckBlock(int nHeight, const uint256& hash)
+     {
+         if (fTestNet) return true; // Testnet has no checkpoints
+ 
+         MapCheckpoints::const_iterator i = mapCheckpoints.find(nHeight);
+         if (i == mapCheckpoints.end()) return true;
+         return hash == i->second;
+     }
+ 
+     int GetTotalBlocksEstimate()
+     {
+         if (fTestNet) return 0;
+ 
+         return mapCheckpoints.rbegin()->first;
+     }
+ 
+     CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex)
+     {
+         if (fTestNet) return NULL;
+ 
+         int64 nResult;
+         BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints)
+         {
+             const uint256& hash = i.second;
+             std::map<uint256, CBlockIndex*>::const_iterator t = mapBlockIndex.find(hash);
+             if (t != mapBlockIndex.end())
+                 return t->second;
+         }
+         return NULL;
+     }
+ }

diff --cc src/init.cpp
index 9d845a6,dd8bdf5..d36f1dd
--- 1/src/init.cpp
--- 2/src/init.cpp
+++ b/src/init.cpp
@@@ -81,8 -90,7 +91,8 @@@ void HandleSIGTERM(int
  //
  // Start
  //
- #ifndef GUI
+ #if !defined(QT_GUI)
 +#if !defined(PPCOIN_GENESIS)
  int main(int argc, char* argv[])
  {
      bool fRet = false;
@@@ -165,13 -172,13 +175,13 @@@ bool AppInit2(int argc, char* argv[]
          string strUsage = string() +
            _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
            _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
-             "  bitcoin [options]                   \t  " + "\n" +
-             "  bitcoin [options] <command> [params]\t  " + _("Send command to -server or bitcoind\n") +
-             "  bitcoin [options] help              \t\t  " + _("List commands\n") +
-             "  bitcoin [options] help <command>    \t\t  " + _("Get help for a command\n") +
+             "  bitcoind [options]                   \t  " + "\n" +
+             "  bitcoind [options] <command> [params]\t  " + _("Send command to -server or bitcoind\n") +
+             "  bitcoind [options] help              \t\t  " + _("List commands\n") +
+             "  bitcoind [options] help <command>    \t\t  " + _("Get help for a command\n") +
            _("Options:\n") +
 -            "  -conf=<file>     \t\t  " + _("Specify configuration file (default: bitcoin.conf)\n") +
 -            "  -pid=<file>      \t\t  " + _("Specify pid file (default: bitcoind.pid)\n") +
 +            "  -conf=<file>     \t\t  " + _("Specify configuration file (default: ppcoin.conf)\n") +
 +            "  -pid=<file>      \t\t  " + _("Specify pid file (default: ppcoind.pid)\n") +
              "  -gen             \t\t  " + _("Generate coins\n") +
              "  -gen=0           \t\t  " + _("Don't generate coins\n") +
              "  -min             \t\t  " + _("Start minimized\n") +

diff --cc src/main.cpp
index d528612,a7871fc..24a7fd0
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -29,9 -28,8 +29,8 @@@ unsigned int nTransactionsUpdated = 0
  map<COutPoint, CInPoint> mapNextTx;
  
  map<uint256, CBlockIndex*> mapBlockIndex;
 -uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
 +uint256 hashGenesisBlock("0x00000000e74ef41733382f8a94d41bf29f20c6c48a7ab489e1fab0ab719bf676");
  static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
- const int nTotalBlocksEstimate = 0; // Conservative estimate of total nr of blocks on main chain
  const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download"
  CBlockIndex* pindexGenesisBlock = NULL;
  int nBestHeight = -1;
@@@ -652,24 -659,60 +660,44 @@@ int64 static GetBlockValue(int nHeight
      return nSubsidy + nFees;
  }
  
- unsigned int static GetNextWorkRequired(const CBlockIndex* pindexLast)
 -static const int64 nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
++static const int64 nTargetTimespan = 7 * 24 * 60 * 60; // one week
+ static const int64 nTargetSpacing = 10 * 60;
+ static const int64 nInterval = nTargetTimespan / nTargetSpacing;
+ 
+ //
+ // minimum amount of work that could possibly be required nTime after
+ // minimum work required was nBase
+ //
+ unsigned int ComputeMinWork(unsigned int nBase, int64 nTime)
  {
-     const int64 nTargetTimespan = 7 * 24 * 60 * 60; // one week
-     const int64 nTargetSpacing = 10 * 60;
-     const int64 nInterval = nTargetTimespan / nTargetSpacing;
+     CBigNum bnResult;
+     bnResult.SetCompact(nBase);
+     while (nTime > 0 && bnResult < bnProofOfWorkLimit)
+     {
+         // Maximum 400% adjustment...
+         bnResult *= 4;
+         // ... in best-case exactly 4-times-normal target time
+         nTime -= nTargetTimespan*4;
+     }
+     if (bnResult > bnProofOfWorkLimit)
+         bnResult = bnProofOfWorkLimit;
+     return bnResult.GetCompact();
+ }
  
+ unsigned int static GetNextWorkRequired(const CBlockIndex* pindexLast)
+ {
 -
 -    // Genesis block
 -    if (pindexLast == NULL)
 +    // Genesis block and first block
 +    if (pindexLast == NULL || pindexLast->pprev == NULL)
          return bnProofOfWorkLimit.GetCompact();
  
 -    // Only change once per interval
 -    if ((pindexLast->nHeight+1) % nInterval != 0)
 -        return pindexLast->nBits;
 -
 -    // Go back by what we want to be 14 days worth of blocks
 -    const CBlockIndex* pindexFirst = pindexLast;
 -    for (int i = 0; pindexFirst && i < nInterval-1; i++)
 -        pindexFirst = pindexFirst->pprev;
 -    assert(pindexFirst);
 -
 -    // Limit adjustment step
 -    int64 nActualTimespan = pindexLast->GetBlockTime() - pindexFirst->GetBlockTime();
 -    printf("  nActualTimespan = %"PRI64d"  before bounds\n", nActualTimespan);
 -    if (nActualTimespan < nTargetTimespan/4)
 -        nActualTimespan = nTargetTimespan/4;
 -    if (nActualTimespan > nTargetTimespan*4)
 -        nActualTimespan = nTargetTimespan*4;
 -
 -    // Retarget
 +    int64 nActualSpacing = pindexLast->GetBlockTime() - pindexLast->pprev->GetBlockTime();
 +
 +    // ppcoin: target change every block
 +    // ppcoin: retarget with exponential moving toward target spacing
      CBigNum bnNew;
      bnNew.SetCompact(pindexLast->nBits);
 -    bnNew *= nActualTimespan;
 -    bnNew /= nTargetTimespan;
 +    bnNew *= ((nInterval - 1) * nTargetSpacing + nActualSpacing + nActualSpacing);
 +    bnNew /= ((nInterval + 1) * nTargetSpacing);
  
      if (bnNew > bnProofOfWorkLimit)
          bnNew = bnProofOfWorkLimit;

diff --cc src/main.h
Simple merge

diff --cc src/makefile.unix
index 5dbde3a,6c48199..b751e3f
--- 1/src/makefile.unix
--- 2/src/makefile.unix
+++ b/src/makefile.unix
@@@ -72,52 -117,43 +118,52 @@@ OBJS= 
      obj/main.o \
      obj/net.o \
      obj/protocol.o \
-     obj/rpc.o \
+     obj/bitcoinrpc.o \
      obj/script.o \
      obj/util.o \
-     obj/wallet.o \
-     cryptopp/obj/sha.o \
-     cryptopp/obj/cpu.o
+     obj/wallet.o
  
  
- all: bitcoin
+ all: bitcoind
  
+ # auto-generated dependencies:
+ -include obj/nogui/*.P
+ -include obj/test/*.P
  
- obj/%.o: %.cpp $(HEADERS)
-       $(CXX) -c $(CXXFLAGS) $(WXINCLUDEPATHS) -DGUI -o $@ $<
- 
- cryptopp/obj/%.o: cryptopp/%.cpp
-       $(CXX) -c $(CXXFLAGS) -O3 -o $@ $<
- 
- bitcoin: $(OBJS) obj/ui.o obj/uibase.o
-       $(CXX) $(CXXFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
- 
- 
- obj/nogui/%.o: %.cpp $(HEADERS)
-       $(CXX) -c $(CXXFLAGS) -o $@ $<
+ obj/nogui/%.o: %.cpp
+       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       @cp $(@:%.o=%.d) $(@:%.o=%.P); \
+         sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+             -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+         rm -f $(@:%.o=%.d)
  
  bitcoind: $(OBJS:obj/%=obj/nogui/%)
-       $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+       $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
  
- obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS)
-       $(CXX) -c $(CFLAGS) -o $@ test/test_bitcoin.cpp
+ obj/test/%.o: test/%.cpp
+       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       @cp $(@:%.o=%.d) $(@:%.o=%.P); \
+         sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+             -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+         rm -f $(@:%.o=%.d)
  
  test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
-       $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS)
+       $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LDFLAGS) $(LIBS)
  
  clean:
-       -rm -f bitcoin bitcoind test_bitcoin genesis
 -      -rm -f bitcoind test_bitcoin
++      -rm -f bitcoind test_bitcoin genesis
        -rm -f obj/*.o
        -rm -f obj/nogui/*.o
        -rm -f obj/test/*.o
-       -rm -f cryptopp/obj/*.o
-       -rm -f headers.h.gch
+       -rm -f obj/*.P
+       -rm -f obj/nogui/*.P
+       -rm -f obj/test/*.P
 +      -rm -f ppcoin/obj/*.o
 +
 +ppcoin/obj/genesis.o: ppcoin/genesis.cpp
 +      $(CXX) -c $(CXXFLAGS) -o $@ $<
 +      $(CXX) -c $(CXXFLAGS) -DPPCOIN_GENESIS -o obj/nogui/init.o init.cpp
 +
 +genesis: ppcoin/obj/genesis.o $(OBJS:obj/%=obj/nogui/%)
 +      $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 +      -rm -f obj/nogui/init.o

diff --cc src/net.cpp
index 0656c65,e0ac2ab..b968d5a
--- 1/src/net.cpp
--- 2/src/net.cpp
+++ b/src/net.cpp
@@@ -1159,11 -1223,32 +1224,31 @@@ void MapPort(bool /* unused fMapPort */
  
  
  static const char *strDNSSeed[] = {
 -    "bitseed.xf2.org",
 -    "dnsseed.bluematt.me",
 +    // "seeds.ppcoin.org"
  };
  
- void DNSAddressSeed()
+ void ThreadDNSAddressSeed(void* parg)
  {
+     IMPLEMENT_RANDOMIZE_STACK(ThreadDNSAddressSeed(parg));
+     try
+     {
+         vnThreadsRunning[6]++;
+         ThreadDNSAddressSeed2(parg);
+         vnThreadsRunning[6]--;
+     }
+     catch (std::exception& e) {
+         vnThreadsRunning[6]--;
+         PrintException(&e, "ThreadDNSAddressSeed()");
+     } catch (...) {
+         vnThreadsRunning[6]--;
+         throw; // support pthread_cancel()
+     }
+     printf("ThreadDNSAddressSeed exiting\n");
+ }
+ 
+ void ThreadDNSAddressSeed2(void* parg)
+ {
+     printf("ThreadDNSAddressSeed started\n");
      int found = 0;
  
      if (!fTestNet)
@@@ -1196,9 -1281,81 +1281,18 @@@
  
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  unsigned int pnSeed[] =
  {
 -    0x6884ac63, 0x3ffecead, 0x2919b953, 0x0942fe50, 0x7a1d922e, 0xcdd6734a, 0x953a5bb6, 0x2c46922e,
 -    0xe2a5f143, 0xaa39103a, 0xa06afa5c, 0x135ffd59, 0xe8e82863, 0xf61ef029, 0xf75f042e, 0x2b363532,
 -    0x29b2df42, 0x16b1f64e, 0xd46e281b, 0x5280bf58, 0x60372229, 0x1be58e4f, 0xa8496f45, 0x1fb1a057,
 -    0x756b3844, 0x3bb79445, 0x0b375518, 0xcccb0102, 0xb682bf2e, 0x46431c02, 0x3a81073a, 0xa3771f1f,
 -    0x213a121f, 0x85dc2c1b, 0x56b4323b, 0xb34e8945, 0x3c40b33d, 0xfa276418, 0x1f818d29, 0xebe1e344,
 -    0xf6160a18, 0xf4fa384a, 0x34b09558, 0xb882b543, 0xe3ce2253, 0x6abf56d8, 0xe91b1155, 0x688ee6ad,
 -    0x2efc6058, 0x4792cd47, 0x0c32f757, 0x4c813a46, 0x8c93644a, 0x37507444, 0x813ad218, 0xdac06d4a,
 -    0xe4c63e4b, 0x21a1ea3c, 0x8d88556f, 0x30e9173a, 0x041f681b, 0xdc77ba50, 0xc0072753, 0xceddd44f,
 -    0x052d1743, 0xe3c77a4a, 0x13981c3a, 0x5685d918, 0x3c0e4e70, 0x3e56fb54, 0xb676ae0c, 0xac93c859,
 -    0x22279f43, 0x975a4542, 0xe527f071, 0xea162f2e, 0x3c65a32e, 0x5be5713b, 0x961ec418, 0xb202922e,
 -    0x5ef7be50, 0xce49f53e, 0x05803b47, 0x8463b055, 0x78576153, 0x3ec2ae3a, 0x4bbd7118, 0xafcee043,
 -    0x56a3e8ba, 0x6174de4d, 0x8d01ba4b, 0xc9af564e, 0xdbc9c547, 0xa627474d, 0xdada9244, 0xd3b3083a,
 -    0x523e071f, 0xd6b96f18, 0xbd527c46, 0xdf2bbb4d, 0xd37b4a4b, 0x3a6a2158, 0xc064b055, 0x18a8e055,
 -    0xec4dae3b, 0x0540416c, 0x475b4fbe, 0x064803b2, 0x48e9f062, 0x2898524b, 0xd315ff43, 0xf786d247,
 -    0xc7ea2f3e, 0xc087f043, 0xc163354b, 0x8250284d, 0xed300029, 0xbf36e05c, 0x8eb3ae4c, 0xe7aa623e,
 -    0x7ced0274, 0xdd362c1b, 0x362b995a, 0xca26b629, 0x3fc41618, 0xb97b364e, 0xa05b8729, 0x0f5e3c43,
 -    0xdf942618, 0x6aeb9b5b, 0xbf04762e, 0xfaaeb118, 0x87579958, 0x76520044, 0xc2660c5b, 0x628b201b,
 -    0xf193932e, 0x1c0ad045, 0xff908346, 0x8da9d4da, 0xed201c1f, 0xa47a2b1b, 0x330007d4, 0x8ba1ed47,
 -    0xb2f02d44, 0x7db62c1b, 0x781c454b, 0xc0300029, 0xb7062a45, 0x88b52e3a, 0x78dd6b63, 0x1cb9b718,
 -    0x5d358e47, 0x59912c3b, 0x79607544, 0x5197f759, 0xc023be48, 0xd1013743, 0x0f354057, 0x8e3aac3b,
 -    0x4114693e, 0x22316318, 0xe27dda50, 0x878eac3b, 0x4948a21f, 0x5db7f24c, 0x8ccb6157, 0x26a5de18,
 -    0x0a11bd43, 0x27bb1e41, 0x60a7a951, 0x3e16b35e, 0x07888b53, 0x5648a853, 0x0149fe50, 0xd070a34f,
 -    0x6454c96d, 0xd6e54758, 0xa96dc152, 0x65447861, 0xf6bdf95e, 0x10400202, 0x2c29d483, 0x18174732,
 -    0x1d840618, 0x12e61818, 0x089d3f3c, 0x917e931f, 0xd1b0c90e, 0x25bd3c42, 0xeb05775b, 0x7d550c59,
 -    0x6cfacb01, 0xe4224444, 0xa41dd943, 0x0f5aa643, 0x5e33731b, 0x81036d50, 0x6f46a0d1, 0x7731be43,
 -    0x14840e18, 0xf1e8d059, 0x661d2b1f, 0x40a3201b, 0x9407b843, 0xedf0254d, 0x7bd1a5bc, 0x073dbe51,
 -    0xe864a97b, 0x2efd947b, 0xb9ca0e45, 0x4e2113ad, 0xcc305731, 0xd39ca63c, 0x733df918, 0xda172b1f,
 -    0xaa03b34d, 0x7230fd4d, 0xf1ce6e3a, 0x2e9fab43, 0xa4010750, 0xa928bd18, 0x6809be42, 0xb19de348,
 -    0xff956270, 0x0d795f51, 0xd2dec247, 0x6df5774b, 0xbac11f79, 0xdfb05c75, 0x887683d8, 0xa1e83632,
 -    0x2c0f7671, 0x28bcb65d, 0xac2a7545, 0x3eebfc60, 0x304ad7c4, 0xa215a462, 0xc86f0f58, 0xcfb92ebe,
 -    0x5e23ed82, 0xf506184b, 0xec0f19b7, 0x060c59ad, 0x86ee3174, 0x85380774, 0xa199a562, 0x02b507ae,
 -    0x33eb2163, 0xf2112b1f, 0xb702ba50, 0x131b9618, 0x90ccd04a, 0x08f3273b, 0xecb61718, 0x64b8b44d,
 -    0x182bf4dc, 0xc7b68286, 0x6e318d5f, 0xfdb03654, 0xb3272e54, 0xe014ad4b, 0x274e4a31, 0x7806375c,
 -    0xbc34a748, 0x1b5ad94a, 0x6b54d10e, 0x73e2ae6e, 0x5529d483, 0x8455a76d, 0x99c13f47, 0x1d811741,
 -    0xa9782a78, 0x0b00464d, 0x7266ea50, 0x532dab46, 0x33e1413e, 0x780d0c18, 0x0fb0854e, 0x03370155,
 -    0x2693042e, 0xfa3d824a, 0x2bb1681b, 0x37ea2a18, 0x7fb8414b, 0x32e0713b, 0xacf38d3f, 0xa282716f,
 -    0xb1a09d7b, 0xa04b764b, 0x83c94d18, 0x05ee4c6d, 0x0e795f51, 0x46984352, 0xf80fc247, 0x3fccb946,
 -    0xd7ae244b, 0x0a8e0a4c, 0x57b141bc, 0x3647bed1, 0x1431b052, 0x803a8bbb, 0xfc69056b, 0xf5991862,
 -    0x14963b2e, 0xd35d5dda, 0xc6c73574, 0xc8f1405b, 0x0ca4224d, 0xecd36071, 0xa9461754, 0xe7a0ed72,
 -    0x559e8346, 0x1c9beec1, 0xc786ea4a, 0x9561b44d, 0x9788074d, 0x1a69934f, 0x23c5614c, 0x07c79d4b,
 -    0xc7ee52db, 0xc72df351, 0xcb135e44, 0xa0988346, 0xc211fc4c, 0x87dec34b, 0x1381074d, 0x04a65cb7,
 -    0x4409083a, 0x4a407a4c, 0x92b8d37d, 0xacf50b4d, 0xa58aa5bc, 0x448f801f, 0x9c83762e, 0x6fd5734a,
 -    0xfe2d454b, 0x84144c55, 0x05190e4c, 0xb2151448, 0x63867a3e, 0x16099018, 0x9c010d3c, 0x962d8f3d,
 -    0xd51ee453, 0x9d86801f, 0x68e87b47, 0x6bf7bb73, 0x5fc7910e, 0x10d90118, 0x3db04442, 0x729d3e4b,
 -    0xc397d842, 0x57bb15ad, 0x72f31f4e, 0xc9380043, 0x2bb24e18, 0xd9b8ab50, 0xb786801f, 0xf4dc4847,
 -    0x85f4bb51, 0x4435995b, 0x5ba07e40, 0x2c57392e, 0x3628124b, 0x9839b64b, 0x6fe8b24d, 0xaddce847,
 -    0x75260e45, 0x0c572a43, 0xfea21902, 0xb9f9742e, 0x5a70d443, 0x8fc5910e, 0x868d4744, 0x56245e02,
 -    0xd7eb5f02, 0x35c12c1b, 0x4373034b, 0x8786554c, 0xa6facf18, 0x4b11a31f, 0x3570664e, 0x5a64bc42,
 -    0x0b03983f, 0x8f457e4c, 0x0fd874c3, 0xb6cf31b2, 0x2bbc2d4e, 0x146ca5b2, 0x9d00b150, 0x048a4153,
 -    0xca4dcd43, 0xc1607cca, 0x8234cf57, 0x9c7daead, 0x3dc07658, 0xea5c6e4c, 0xf1a0084e, 0x16d2ee53,
 -    0x1b849418, 0xfe913a47, 0x1e988f62, 0x208b644c, 0xc55ee980, 0xbdbce747, 0xf59a384e, 0x0f56091b,
 -    0x7417b745, 0x0c37344e, 0x2c62ab47, 0xf8533a4d, 0x8030084d, 0x76b93c4b, 0xda6ea0ad, 0x3c54f618,
 -    0x63b0de1f, 0x7370d858, 0x1a70bb4c, 0xdda63b2e, 0x60b2ba50, 0x1ba7d048, 0xbe1b2c1b, 0xabea5747,
 -    0x29ad2e4d, 0xe8cd7642, 0x66c80e18, 0x138bf34a, 0xc6145e44, 0x2586794c, 0x07bc5478, 0x0da0b14d,
 -    0x8f95354e, 0x9eb11c62, 0xa1545e46, 0x2e7a2602, 0x408c9c3d, 0x59065d55, 0xf51d1a4c, 0x3bbc6a4e,
 -    0xc71b2a2e, 0xcdaaa545, 0x17d659d0, 0x5202e7ad, 0xf1b68445, 0x93375961, 0xbd88a043, 0x066ad655,
 -    0x890f6318, 0x7b7dca47, 0x99bdd662, 0x3bb4fc53, 0x1231efdc, 0xc0a99444, 0x96bbea47, 0x61ed8748,
 -    0x27dfa73b, 0x8d4d1754, 0x3460042e, 0x551f0c4c, 0x8d0e0718, 0x162ddc53, 0x53231718, 0x1ecd65d0,
 -    0x944d28bc, 0x3b79d058, 0xaff97fbc, 0x4860006c, 0xc101c90e, 0xace41743, 0xa5975d4c, 0x5cc2703e,
 -    0xb55a4450, 0x02d18840, 0xee2765ae, 0xd6012fd5, 0x24c94d7d, 0x8c6eec47, 0x7520ba5d, 0x9e15e460,
 -    0x8510b04c, 0x75ec3847, 0x1dfa6661, 0xe172b3ad, 0x5744c90e, 0x52a0a152, 0x8d6fad18, 0x67b74b6d,
 -    0x93a089b2, 0x0f3ac5d5, 0xe5de1855, 0x43d25747, 0x4bad804a, 0x55b408d8, 0x60a36441, 0xf553e860,
 -    0xdb2fa2c8, 0x03152b32, 0xdd27a7d5, 0x3116a8b8, 0x0a1d708c, 0xeee2f13c, 0x6acf436f, 0xce6eb4ca,
 -    0x101cd3d9, 0x1c48a6b8, 0xe57d6f44, 0x93dcf562,
 +    0xfc01a8c0
  };
  
  

diff --cc src/util.cpp
index 6bd52ed,236c7f7..7fb3cd6
--- 1/src/util.cpp
--- 2/src/util.cpp
+++ b/src/util.cpp
@@@ -652,12 -745,12 +746,12 @@@ string MyGetSpecialFolderPath(int nFold
  
  string GetDefaultDataDir()
  {
 -    // Windows: C:\Documents and Settings\username\Application Data\Bitcoin
 -    // Mac: ~/Library/Application Support/Bitcoin
 -    // Unix: ~/.bitcoin
 +    // Windows: C:\Documents and Settings\username\Application Data\PPCoin
 +    // Mac: ~/Library/Application Support/PPCoin
 +    // Unix: ~/.ppcoin
- #ifdef __WXMSW__
+ #ifdef WIN32
      // Windows
 -    return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\Bitcoin";
 +    return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\PPCoin";
  #else
      char* pszHome = getenv("HOME");
      if (pszHome == NULL || strlen(pszHome) == 0)

diff --cc src/wallet.cpp
Simple merge