From 84db464b10036ce5f2d3a6276b2047fd87dec9d8 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 11 Apr 2013 16:53:57 -0400 Subject: [PATCH] Add test patches for pull-tester to contrib/ --- contrib/test-patches/README | 4 + .../test-patches/bitcoind-comparison.patch | 196 ++++++++++++++++++ contrib/test-patches/temp-revert-1.patch | 21 ++ contrib/test-patches/temp-revert-2.patch | 20 ++ contrib/test-patches/temp-revert-3.patch | 34 +++ contrib/test-patches/temp-revert-4.patch | 110 ++++++++++ 6 files changed, 385 insertions(+) create mode 100644 contrib/test-patches/README create mode 100644 contrib/test-patches/bitcoind-comparison.patch create mode 100644 contrib/test-patches/temp-revert-1.patch create mode 100644 contrib/test-patches/temp-revert-2.patch create mode 100644 contrib/test-patches/temp-revert-3.patch create mode 100644 contrib/test-patches/temp-revert-4.patch diff --git a/contrib/test-patches/README b/contrib/test-patches/README new file mode 100644 index 000000000..ed754cea7 --- /dev/null +++ b/contrib/test-patches/README @@ -0,0 +1,4 @@ +These patches are applied when the automated pull-tester +tests each pull and when master is tested using jenkins. +You can find more information about the tests run at +http://jenkins.bluematt.me/pull-tester/files/ diff --git a/contrib/test-patches/bitcoind-comparison.patch b/contrib/test-patches/bitcoind-comparison.patch new file mode 100644 index 000000000..04a861828 --- /dev/null +++ b/contrib/test-patches/bitcoind-comparison.patch @@ -0,0 +1,196 @@ +diff --git a/src/main.cpp b/src/main.cpp +index 8c115c2..1e70ff2 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -31,8 +31,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; +@@ -1055,7 +1055,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; + } +@@ -2706,9 +2706,9 @@ bool InitBlockIndex() { + 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) + { +@@ -3007,7 +3007,7 @@ bool static AlreadyHave(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 }; + + + void static ProcessGetData(CNode* pfrom) +diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp +index af28465..ee9a4db 100644 +--- a/src/test/miner_tests.cpp ++++ b/src/test/miner_tests.cpp +@@ -15,34 +15,117 @@ struct { + unsigned char extranonce; + unsigned int nonce; + } blockinfo[] = { +- {4, 0xa4a3e223}, {2, 0x15c32f9e}, {1, 0x0375b547}, {1, 0x7004a8a5}, +- {2, 0xce440296}, {2, 0x52cfe198}, {1, 0x77a72cd0}, {2, 0xbb5d6f84}, +- {2, 0x83f30c2c}, {1, 0x48a73d5b}, {1, 0xef7dcd01}, {2, 0x6809c6c4}, +- {2, 0x0883ab3c}, {1, 0x087bbbe2}, {2, 0x2104a814}, {2, 0xdffb6daa}, +- {1, 0xee8a0a08}, {2, 0xba4237c1}, {1, 0xa70349dc}, {1, 0x344722bb}, +- {3, 0xd6294733}, {2, 0xec9f5c94}, {2, 0xca2fbc28}, {1, 0x6ba4f406}, +- {2, 0x015d4532}, {1, 0x6e119b7c}, {2, 0x43e8f314}, {2, 0x27962f38}, +- {2, 0xb571b51b}, {2, 0xb36bee23}, {2, 0xd17924a8}, {2, 0x6bc212d9}, +- {1, 0x630d4948}, {2, 0x9a4c4ebb}, {2, 0x554be537}, {1, 0xd63ddfc7}, +- {2, 0xa10acc11}, {1, 0x759a8363}, {2, 0xfb73090d}, {1, 0xe82c6a34}, +- {1, 0xe33e92d7}, {3, 0x658ef5cb}, {2, 0xba32ff22}, {5, 0x0227a10c}, +- {1, 0xa9a70155}, {5, 0xd096d809}, {1, 0x37176174}, {1, 0x830b8d0f}, +- {1, 0xc6e3910e}, {2, 0x823f3ca8}, {1, 0x99850849}, {1, 0x7521fb81}, +- {1, 0xaacaabab}, {1, 0xd645a2eb}, {5, 0x7aea1781}, {5, 0x9d6e4b78}, +- {1, 0x4ce90fd8}, {1, 0xabdc832d}, {6, 0x4a34f32a}, {2, 0xf2524c1c}, +- {2, 0x1bbeb08a}, {1, 0xad47f480}, {1, 0x9f026aeb}, {1, 0x15a95049}, +- {2, 0xd1cb95b2}, {2, 0xf84bbda5}, {1, 0x0fa62cd1}, {1, 0xe05f9169}, +- {1, 0x78d194a9}, {5, 0x3e38147b}, {5, 0x737ba0d4}, {1, 0x63378e10}, +- {1, 0x6d5f91cf}, {2, 0x88612eb8}, {2, 0xe9639484}, {1, 0xb7fabc9d}, +- {2, 0x19b01592}, {1, 0x5a90dd31}, {2, 0x5bd7e028}, {2, 0x94d00323}, +- {1, 0xa9b9c01a}, {1, 0x3a40de61}, {1, 0x56e7eec7}, {5, 0x859f7ef6}, +- {1, 0xfd8e5630}, {1, 0x2b0c9f7f}, {1, 0xba700e26}, {1, 0x7170a408}, +- {1, 0x70de86a8}, {1, 0x74d64cd5}, {1, 0x49e738a1}, {2, 0x6910b602}, +- {0, 0x643c565f}, {1, 0x54264b3f}, {2, 0x97ea6396}, {2, 0x55174459}, +- {2, 0x03e8779a}, {1, 0x98f34d8f}, {1, 0xc07b2b07}, {1, 0xdfe29668}, +- {1, 0x3141c7c1}, {1, 0xb3b595f4}, {1, 0x735abf08}, {5, 0x623bfbce}, +- {2, 0xd351e722}, {1, 0xf4ca48c9}, {1, 0x5b19c670}, {1, 0xa164bf0e}, +- {2, 0xbbbeb305}, {2, 0xfe1c810a}, ++{4, 2762203683}, ++{2, 365113248}, ++{1, 58045772}, ++{1, 1879353512}, ++{2, 3460563607}, ++{2, 1389355416}, ++{1, 2007444690}, ++{2, 3143462790}, ++{2, 2213743660}, ++{1, 1218919771}, ++{1, 4017999107}, ++{2, 1745471173}, ++{2, 142846780}, ++{1, 142326754}, ++{2, 553953301}, ++{2, 3757796778}, ++{1, 4002023946}, ++{2, 3124901826}, ++{1, 2802010589}, ++{1, 877077181}, ++{3, 3593029427}, ++{2, 3969866902}, ++{2, 3392125996}, ++{1, 1805972490}, ++{2, 22889779}, ++{1, 1846647676}, ++{2, 1139340052}, ++{2, 664153912}, ++{2, 3044128027}, ++{2, 3010194979}, ++{2, 3514377385}, ++{2, 1807880922}, ++{1, 1661815113}, ++{2, 2588692156}, ++{2, 1431037239}, ++{1, 3594379210}, ++{2, 2701839377}, ++{1, 1973060452}, ++{2, 4218620174}, ++{1, 3895224884}, ++{1, 3812528857}, ++{3, 1703867851}, ++{2, 3123904294}, ++{5, 36151564}, ++{1, 2846294357}, ++{5, 3499546633}, ++{1, 924279160}, ++{1, 2198572304}, ++{1, 3336802574}, ++{2, 2185182379}, ++{1, 2575632458}, ++{1, 1965161345}, ++{1, 2865408940}, ++{1, 3594887915}, ++{5, 2062161796}, ++{5, 2641251194}, ++{1, 1290342362}, ++{1, 2883355438}, ++{6, 1244984107}, ++{2, 4065479712}, ++{2, 465481866}, ++{1, 2907174016}, ++{1, 2667735788}, ++{1, 363417673}, ++{2, 3519780275}, ++{2, 4165713317}, ++{1, 262548689}, ++{1, 3764359529}, ++{1, 2027001003}, ++{5, 1043862655}, ++{5, 1937481940}, ++{1, 1664585233}, ++{1, 1834979792}, ++{2, 2288070330}, ++{2, 3915617412}, ++{1, 3086662813}, ++{2, 430970259}, ++{1, 1519443249}, ++{2, 1540874280}, ++{2, 2496660261}, ++{1, 2847522842}, ++{1, 977329763}, ++{1, 1458040519}, ++{5, 2241822454}, ++{1, 4253963824}, ++{1, 722247551}, ++{1, 3127905834}, ++{1, 1903207432}, ++{1, 1893631657}, ++{1, 1960201429}, ++{1, 1239890082}, ++{2, 1762702850}, ++{0, 1681675873}, ++{1, 1411795775}, ++{2, 2548720534}, ++{2, 1427588186}, ++{2, 65566621}, ++{1, 2566081936}, ++{1, 3229297415}, ++{1, 3756168812}, ++{1, 826394561}, ++{1, 3015022068}, ++{1, 1935326986}, ++{5, 1648098256}, ++{2, 3545360164}, ++{1, 4106897609}, ++{1, 1528415857}, ++{1, 2707734286}, ++{2, 3149837061}, ++{2, 4263280906}, ++ + }; + + // NOTE: These tests rely on CreateNewBlock doing its own self-validation! diff --git a/contrib/test-patches/temp-revert-1.patch b/contrib/test-patches/temp-revert-1.patch new file mode 100644 index 000000000..a5aec641c --- /dev/null +++ b/contrib/test-patches/temp-revert-1.patch @@ -0,0 +1,21 @@ +commit 4dcc8701ac0eb09d8992d19fb411cee3c9aaf394 +Author: Matt Corallo +Date: Sun Mar 24 20:45:44 2013 -0400 + + Revert "Update unit test to match rule enforcement starts 21 March" + + This reverts commit d3e8c6a9d3fad68b0eee4434401ec7b3066399a2. + +diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp +index 3cfb6db..e167def 100644 +--- a/src/test/checkblock_tests.cpp ++++ b/src/test/checkblock_tests.cpp +@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(May15) + if (read_block("Mar12Fork.dat", forkingBlock)) + { + CValidationState state; +- forkingBlock.nTime = tMay15-1; // Invalidates PoW ++ BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true)); + BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false)); + + // After May 15'th, big blocks are OK: diff --git a/contrib/test-patches/temp-revert-2.patch b/contrib/test-patches/temp-revert-2.patch new file mode 100644 index 000000000..1cd043d0d --- /dev/null +++ b/contrib/test-patches/temp-revert-2.patch @@ -0,0 +1,20 @@ +commit cfae26916dba311f6f75d444301c1f9362267c3e +Author: Matt Corallo +Date: Sun Mar 24 20:45:50 2013 -0400 + + Revert "Checkpoint at first block in 11 March chain fork" + + This reverts commit f817c496a1482d05b22c8e539de67f07db1c09d9. + +diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp +index 62234b9..9b11f0b 100644 +--- a/src/checkpoints.cpp ++++ b/src/checkpoints.cpp +@@ -44,7 +44,6 @@ namespace Checkpoints + (193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) + (210000, uint256("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e")) + (216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) +- (225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) + ; + static const CCheckpointData data = { + &mapCheckpoints, diff --git a/contrib/test-patches/temp-revert-3.patch b/contrib/test-patches/temp-revert-3.patch new file mode 100644 index 000000000..5c0775dfa --- /dev/null +++ b/contrib/test-patches/temp-revert-3.patch @@ -0,0 +1,34 @@ +commit ba84709c65b911798ddae1285d807f4cd036990d +Author: Matt Corallo +Date: Sun Mar 24 20:45:56 2013 -0400 + + Revert "Before 15 May, limit created block size to 500K" + + This reverts commit 402f19b64530775a7e4ded025c80d8c16a55e454. + +diff --git a/src/main.cpp b/src/main.cpp +index 22baf0f..51ada0a 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -2057,8 +2057,8 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk + return state.DoS(100, error("CheckBlock() : size limits failed")); + + // Special short-term limits to avoid 10,000 BDB lock limit: +- if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT +- GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00 ++ if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork ++ GetBlockTime() < 1368576000) // 15 May 2013 00:00:00 + { + // Rule is: #unique txids referenced <= 4,500 + // ... to prevent 10,000 BDB lock exhaustion on old clients +@@ -4155,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey) + // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity: + nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize)); + +- // Special compatibility rule before 15 May: limit size to 500,000 bytes: +- if (GetAdjustedTime() < 1368576000) +- nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN)); +- + // How much of the block should be dedicated to high-priority transactions, + // included regardless of the fees they pay + unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000); diff --git a/contrib/test-patches/temp-revert-4.patch b/contrib/test-patches/temp-revert-4.patch new file mode 100644 index 000000000..f93d7549c --- /dev/null +++ b/contrib/test-patches/temp-revert-4.patch @@ -0,0 +1,110 @@ +commit ca96b88b61f647d4f56d5d06321dda08a43bf92f +Author: Matt Corallo +Date: Sun Mar 24 20:46:01 2013 -0400 + + Revert "CheckBlock rule until 15-May for 10,000 BDB lock compatibility" + + This reverts commit 8c222dca4f961ad13ec64d690134a40d09b20813. + +diff --git a/src/main.cpp b/src/main.cpp +index 51ada0a..9a06dbf 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -2056,25 +2056,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk + if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) + return state.DoS(100, error("CheckBlock() : size limits failed")); + +- // Special short-term limits to avoid 10,000 BDB lock limit: +- if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork +- GetBlockTime() < 1368576000) // 15 May 2013 00:00:00 +- { +- // Rule is: #unique txids referenced <= 4,500 +- // ... to prevent 10,000 BDB lock exhaustion on old clients +- set setTxIn; +- for (size_t i = 0; i < vtx.size(); i++) +- { +- setTxIn.insert(vtx[i].GetHash()); +- if (i == 0) continue; // skip coinbase txin +- BOOST_FOREACH(const CTxIn& txin, vtx[i].vin) +- setTxIn.insert(txin.prevout.hash); +- } +- size_t nTxids = setTxIn.size(); +- if (nTxids > 4500) +- return error("CheckBlock() : 15 May maxlocks violation"); +- } +- + // Check proof of work matches claimed amount + if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits)) + return state.DoS(50, error("CheckBlock() : proof of work failed")); +diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp +deleted file mode 100644 +index e167def..0000000 +--- a/src/test/checkblock_tests.cpp ++++ /dev/null +@@ -1,66 +0,0 @@ +-// +-// Unit tests for block.CheckBlock() +-// +-#include +- +-#include // for 'map_list_of()' +-#include +-#include +-#include +- +-#include "main.h" +-#include "wallet.h" +-#include "net.h" +-#include "util.h" +- +-BOOST_AUTO_TEST_SUITE(CheckBlock_tests) +- +-bool +-read_block(const std::string& filename, CBlock& block) +-{ +- namespace fs = boost::filesystem; +- fs::path testFile = fs::current_path() / "test" / "data" / filename; +-#ifdef TEST_DATA_DIR +- if (!fs::exists(testFile)) +- { +- testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename; +- } +-#endif +- FILE* fp = fopen(testFile.string().c_str(), "rb"); +- if (!fp) return false; +- +- fseek(fp, 8, SEEK_SET); // skip msgheader/size +- +- CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION); +- if (!filein) return false; +- +- filein >> block; +- +- return true; +-} +- +-BOOST_AUTO_TEST_CASE(May15) +-{ +- // Putting a 1MB binary file in the git repository is not a great +- // idea, so this test is only run if you manually download +- // test/data/Mar12Fork.dat from +- // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download +- unsigned int tMay15 = 1368576000; +- SetMockTime(tMay15); // Test as if it was right at May 15 +- +- CBlock forkingBlock; +- if (read_block("Mar12Fork.dat", forkingBlock)) +- { +- CValidationState state; +- BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true)); +- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false)); +- +- // After May 15'th, big blocks are OK: +- forkingBlock.nTime = tMay15; // Invalidates PoW +- BOOST_CHECK(forkingBlock.CheckBlock(state, false, false)); +- } +- +- SetMockTime(0); +-} +- +-BOOST_AUTO_TEST_SUITE_END()