From: Sunny King <sunnyking9999@gmail.com>
Date: Sun, 9 Sep 2012 01:47:43 +0000 (+0100)
Subject: PPCoin: Rename COINBASE_MATURITY to detect future merge issues
X-Git-Tag: v0.4.0-unstable~71
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=12db855ca6994106d7eb667f02402b0df458b952

PPCoin: Rename COINBASE_MATURITY to detect future merge issues
        Minor comment cleanup
---

diff --git a/src/base58.h b/src/base58.h
index 90a9b45..589b975 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -256,7 +256,7 @@ public:
 /** base58-encoded bitcoin addresses.
  * Public-key-hash-addresses have version 55 (or 111 testnet).
  * The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
- * Script-hash-addresses have version 57 (or 196 testnet).
+ * Script-hash-addresses have version 117 (or 196 testnet).
  * The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
  */
 class CBitcoinAddress : public CBase58Data
diff --git a/src/main.cpp b/src/main.cpp
index f2c7b51..e4e6acf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,7 @@ uint256 hashGenesisBlock = hashGenesisBlockOfficial;
 static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
 static CBigNum bnInitialHashTarget(~uint256(0) >> 40);
 unsigned int nStakeMinAge = STAKE_MIN_AGE;
-int nCoinbaseMaturity = COINBASE_MATURITY;
+int nCoinbaseMaturity = COINBASE_MATURITY_PPC;
 CBlockIndex* pindexGenesisBlock = NULL;
 int nBestHeight = -1;
 CBigNum bnBestChainTrust = 0;
diff --git a/src/main.h b/src/main.h
index b673a4b..ab4026a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -38,7 +38,7 @@ static const int64 MAX_MONEY = 2000000000 * COIN;
 static const int64 MAX_MINT_PROOF_OF_WORK = 9999 * COIN;
 static const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE;
 inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
-static const int COINBASE_MATURITY = 500;
+static const int COINBASE_MATURITY_PPC = 500;
 // Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp.
 static const int LOCKTIME_THRESHOLD = 500000000; // Tue Nov  5 00:53:20 1985 UTC
 #ifdef USE_UPNP
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 08f753a..ad998c4 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -16,7 +16,7 @@
 // a large 4-byte int at any alignment.
 
 // Public testnet message start
-// unsigned char pchMessageStartTestBitcoin[4] = { 0x9b, 0xa1, 0xb2, 0xb6 };
+// unsigned char pchMessageStartTestBitcoin[4] = { 0xfa, 0xbf, 0xb5, 0xda };
 static unsigned char pchMessageStartTestOld[4] = { 0xdb, 0xe1, 0xf2, 0xf6 };
 static unsigned char pchMessageStartTestNew[4] = { 0xcb, 0xf2, 0xc0, 0xef };
 static unsigned int nMessageStartTestSwitchTime = 1346200000;