From d1e689e6c52f75cb744eea93527eb91b3d9dfdf0 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 22 Apr 2013 16:53:36 -0400 Subject: [PATCH] Delete bitcoind patch, it is now in bitcoin/contrib/ --- bitcoind-comparison.patch | 46 --------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 bitcoind-comparison.patch diff --git a/bitcoind-comparison.patch b/bitcoind-comparison.patch deleted file mode 100644 index e04b1531..00000000 --- a/bitcoind-comparison.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index 23c6d98..af42d91 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -28,8 +28,8 @@ CTxMemPool mempool; - unsigned int nTransactionsUpdated = 0; - - map mapBlockIndex; --uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); --static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); -+uint256 hashGenesisBlock("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"); -+static CBigNum bnProofOfWorkLimit(~uint256(0) >> 1); - CBlockIndex* pindexGenesisBlock = NULL; - int nBestHeight = -1; - CBigNum bnBestChainWork = 0; -@@ -856,7 +856,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees) - int64 nSubsidy = 50 * COIN; - - // Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years -- nSubsidy >>= (nHeight / 210000); -+ nSubsidy >>= (nHeight / 150); - - return nSubsidy + nFees; - } -@@ -2040,9 +2043,9 @@ bool LoadBlockIndex(bool fAllowNew) - block.hashPrevBlock = 0; - block.hashMerkleRoot = block.BuildMerkleTree(); - block.nVersion = 1; -- block.nTime = 1231006505; -- block.nBits = 0x1d00ffff; -- block.nNonce = 2083236893; -+ block.nTime = 1296688602; -+ block.nBits = 0x207fffff; -+ block.nNonce = 2; - - if (fTestNet) - { -@@ -2368,7 +2371,7 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv) - // The message start string is designed to be unlikely to occur in normal data. - // The characters are rarely used upper ASCII, not valid as UTF-8, and produce - // a large 4-byte int at any alignment. --unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 }; -+unsigned char pchMessageStart[4] = { 0xfa, 0xbf, 0xb5, 0xda }; - - - bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)