apply functional tests to block height changes

instagibbs · instagibbs · commit aab22dd600af · 2018-10-22T16:53:12.000-04:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -118,7 +118,7 @@ class CMainParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", false);
+        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", true);
         // Serialization will not match if true
         if (!consensus.blockheight_in_header) {
             assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
@@ -231,7 +231,7 @@ class CTestNetParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", false);
+        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", true);
         // Serialization will not match if true
         if (!consensus.blockheight_in_header) {
             assert(consensus.hashGenesisBlock == uint256S("0x000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"));
@@ -326,7 +326,7 @@ class CRegTestParams : public CChainParams {
 
         genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN);
         consensus.hashGenesisBlock = genesis.GetHash();
-        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", false);
+        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", true);
         // Serialization will not match if true
         if (!consensus.blockheight_in_header) {
             assert(consensus.hashGenesisBlock == uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"));
@@ -434,7 +434,7 @@ class CCustomParams : public CRegTestParams {
 
         // Note: This gArg is accessed one more time in block.h for serialization to avoid
         // circular dependency
-        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", false);
+        consensus.blockheight_in_header = gArgs.GetBoolArg("-con_blockheightinheader", true);
 
         // All non-zero coinbase outputs must go to this scriptPubKey
         std::vector<unsigned char> man_bytes = ParseHex(gArgs.GetArg("-con_mandatorycoinbase", ""));
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -46,7 +46,7 @@ class CBlockHeader
         READWRITE(hashMerkleRoot);
         READWRITE(nTime);
         // Also found in consensus params as blockheight_in_header (circular dep otherwise)
-        if (gArgs.GetBoolArg("-con_blockheightinheader", false)) {
+        if (gArgs.GetBoolArg("-con_blockheightinheader", true)) {
             READWRITE(block_height);
         }
         READWRITE(nBits);
diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -263,6 +263,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams,
                 CBlockIndex* pindexNew = insertBlockIndex(diskindex.GetBlockHash());
                 pindexNew->pprev          = insertBlockIndex(diskindex.hashPrev);
                 pindexNew->nHeight        = diskindex.nHeight;
+                pindexNew->block_height   = diskindex.block_height;
                 pindexNew->nFile          = diskindex.nFile;
                 pindexNew->nDataPos       = diskindex.nDataPos;
                 pindexNew->nUndoPos       = diskindex.nUndoPos;
diff --git a/test/functional/data/rpc_getblockstats.json b/test/functional/data/rpc_getblockstats.json
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
@@ -535,6 +535,7 @@ def run_test(self):
         b44.hashPrevBlock = self.tip.sha256
         b44.nBits = 0x207fffff
         b44.vtx.append(coinbase)
+        b44.block_height = height
         b44.hashMerkleRoot = b44.calc_merkle_root()
         b44.solve()
         self.tip = b44
@@ -549,6 +550,7 @@ def run_test(self):
         b45.hashPrevBlock = self.tip.sha256
         b45.nBits = 0x207fffff
         b45.vtx.append(non_coinbase)
+        b45.block_height = height+1
         b45.hashMerkleRoot = b45.calc_merkle_root()
         b45.calc_sha256()
         b45.solve()
@@ -564,6 +566,7 @@ def run_test(self):
         b46.hashPrevBlock = b44.sha256
         b46.nBits = 0x207fffff
         b46.vtx = []
+        b46.block_height = height+1
         b46.hashMerkleRoot = 0
         b46.solve()
         self.block_heights[b46.sha256] = self.block_heights[b44.sha256] + 1
@@ -1242,11 +1245,11 @@ def next_block(self, number, spend=None, additional_coinbase_value=0, script=CSc
         coinbase.vout[0].nValue += additional_coinbase_value
         coinbase.rehash()
         if spend is None:
-            block = create_block(base_block_hash, coinbase, block_time)
+            block = create_block(base_block_hash, coinbase, height, block_time)
         else:
             coinbase.vout[0].nValue += spend.vout[0].nValue - 1  # all but one satoshi to fees
             coinbase.rehash()
-            block = create_block(base_block_hash, coinbase, block_time)
+            block = create_block(base_block_hash, coinbase, height, block_time)
             tx = self.create_tx(spend, 0, 1, script)  # spend 1 satoshi
             self.sign_tx(tx, spend)
             self.add_transactions_to_block(block, [tx])
diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py
@@ -73,7 +73,7 @@ def run_test(self):
 
         tip = self.nodes[0].getbestblockhash()
         block_time = self.nodes[0].getblockheader(tip)['mediantime'] + 1
-        block = create_block(int(tip, 16), create_coinbase(CLTV_HEIGHT - 1), block_time)
+        block = create_block(int(tip, 16), create_coinbase(CLTV_HEIGHT - 1), CLTV_HEIGHT-1, block_time)
         block.nVersion = 3
         block.vtx.append(spendtx)
         block.hashMerkleRoot = block.calc_merkle_root()
@@ -85,7 +85,7 @@ def run_test(self):
         self.log.info("Test that blocks must now be at least version 4")
         tip = block.sha256
         block_time += 1
-        block = create_block(tip, create_coinbase(CLTV_HEIGHT), block_time)
+        block = create_block(tip, create_coinbase(CLTV_HEIGHT), CLTV_HEIGHT, block_time)
         block.nVersion = 3
         block.solve()
         self.nodes[0].p2p.send_and_ping(msg_block(block))
diff --git a/test/functional/feature_csv_activation.py b/test/functional/feature_csv_activation.py
@@ -157,7 +157,7 @@ def generate_blocks(self, number, version, test_blocks=None):
         return test_blocks
 
     def create_test_block(self, txs, version=536870912):
-        block = create_block(self.tip, create_coinbase(self.tipheight + 1), self.last_block_time + 600)
+        block = create_block(self.tip, create_coinbase(self.tipheight + 1), self.tipheight + 1, self.last_block_time + 600)
         block.nVersion = version
         block.vtx.extend(txs)
         block.hashMerkleRoot = block.calc_merkle_root()
diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py
@@ -61,7 +61,7 @@ def run_test(self):
 
         tip = self.nodes[0].getbestblockhash()
         block_time = self.nodes[0].getblockheader(tip)['mediantime'] + 1
-        block = create_block(int(tip, 16), create_coinbase(DERSIG_HEIGHT - 1), block_time)
+        block = create_block(int(tip, 16), create_coinbase(DERSIG_HEIGHT - 1), DERSIG_HEIGHT-1, block_time)
         block.nVersion = 2
         block.vtx.append(spendtx)
         block.hashMerkleRoot = block.calc_merkle_root()
@@ -74,7 +74,7 @@ def run_test(self):
         self.log.info("Test that blocks must now be at least version 3")
         tip = block.sha256
         block_time += 1
-        block = create_block(tip, create_coinbase(DERSIG_HEIGHT), block_time)
+        block = create_block(tip, create_coinbase(DERSIG_HEIGHT), DERSIG_HEIGHT, block_time)
         block.nVersion = 2
         block.rehash()
         block.solve()
diff --git a/test/functional/feature_nulldummy.py b/test/functional/feature_nulldummy.py
@@ -98,7 +98,7 @@ def run_test(self):
 
 
     def block_submit(self, node, txs, witness = False, accept = False):
-        block = create_block(self.tip, create_coinbase(self.lastblockheight + 1), self.lastblocktime + 1)
+        block = create_block(self.tip, create_coinbase(self.lastblockheight + 1), self.lastblockheight + 1, self.lastblocktime + 1)
         block.nVersion = 4
         for tx in txs:
             tx.rehash()
diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py
@@ -47,7 +47,7 @@ def send_blocks_with_version(self, peer, numblocks, version):
         tip = int(tip, 16)
 
         for _ in range(numblocks):
-            block = create_block(tip, create_coinbase(height + 1), block_time)
+            block = create_block(tip, create_coinbase(height + 1), height+1, block_time)
             block.nVersion = version
             block.solve()
             peer.send_message(msg_block(block))
diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py
@@ -200,14 +200,14 @@ def run_test(self):
 
         # Check binary format
         response = self.test_rest_request("/block/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
-        assert_greater_than(int(response.getheader('content-length')), 80)
+        assert_greater_than(int(response.getheader('content-length')), 84)
         response_bytes = response.read()
 
         # Compare with block header
         response_header = self.test_rest_request("/headers/1/{}".format(bb_hash), req_type=ReqType.BIN, ret_type=RetType.OBJ)
-        assert_equal(int(response_header.getheader('content-length')), 80)
+        assert_equal(int(response_header.getheader('content-length')), 84)
         response_header_bytes = response_header.read()
-        assert_equal(response_bytes[:80], response_header_bytes)
+        assert_equal(response_bytes[:84], response_header_bytes)
 
         # Check block hex format
         response_hex = self.test_rest_request("/block/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
@@ -218,8 +218,8 @@ def run_test(self):
         # Compare with hex block header
         response_header_hex = self.test_rest_request("/headers/1/{}".format(bb_hash), req_type=ReqType.HEX, ret_type=RetType.OBJ)
         assert_greater_than(int(response_header_hex.getheader('content-length')), 160)
-        response_header_hex_bytes = response_header_hex.read(160)
-        assert_equal(binascii.hexlify(response_bytes[:80]), response_header_hex_bytes)
+        response_header_hex_bytes = response_header_hex.read(168)
+        assert_equal(binascii.hexlify(response_bytes[:84]), response_header_hex_bytes)
 
         # Check json format
         block_json_obj = self.test_rest_request("/block/{}".format(bb_hash))
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
@@ -60,6 +60,7 @@ def run_test(self):
         block.nVersion = tmpl["version"]
         block.hashPrevBlock = int(tmpl["previousblockhash"], 16)
         block.nTime = tmpl["curtime"]
+        block.block_height = node.getblockcount()+1
         block.nBits = int(tmpl["bits"], 16)
         block.nNonce = 0
         block.vtx = [coinbase_tx]
@@ -103,7 +104,7 @@ def run_test(self):
 
         self.log.info("getblocktemplate: Test bad tx count")
         # The tx count is immediately after the block header
-        TX_COUNT_OFFSET = 80
+        TX_COUNT_OFFSET = 80+4 # height is extra 4
         bad_block_sn = bytearray(block.serialize())
         assert_equal(bad_block_sn[TX_COUNT_OFFSET], 1)
         bad_block_sn[TX_COUNT_OFFSET] += 1
diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py
@@ -106,7 +106,7 @@ def build_block_on_tip(self, node, segwit=False):
         height = node.getblockcount()
         tip = node.getbestblockhash()
         mtp = node.getblockheader(tip)['mediantime']
-        block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
+        block = create_block(int(tip, 16), create_coinbase(height + 1), height+1, mtp + 1)
         block.nVersion = 4
         if segwit:
             add_witness_commitment(block)
@@ -655,6 +655,7 @@ def test_compactblocks_not_at_tip(self, node, test_node):
         hashPrevBlock = int(node.getblockhash(cur_height-5), 16)
         block = self.build_block_on_tip(node)
         block.hashPrevBlock = hashPrevBlock
+        block.block_height = cur_height-4
         block.solve()
 
         comp_block = HeaderAndShortIDs()
diff --git a/test/functional/p2p_fingerprint.py b/test/functional/p2p_fingerprint.py
@@ -36,7 +36,7 @@ def build_chain(self, nblocks, prev_hash, prev_height, prev_median_time):
         for _ in range(nblocks):
             coinbase = create_coinbase(prev_height + 1)
             block_time = prev_median_time + 1
-            block = create_block(int(prev_hash, 16), coinbase, block_time)
+            block = create_block(int(prev_hash, 16), coinbase, prev_height + 1, block_time)
             block.solve()
 
             blocks.append(block)
diff --git a/test/functional/p2p_invalid_block.py b/test/functional/p2p_invalid_block.py
@@ -37,7 +37,7 @@ def run_test(self):
         self.log.info("Create a new block with an anyone-can-spend coinbase")
 
         height = 1
-        block = create_block(tip, create_coinbase(height), block_time)
+        block = create_block(tip, create_coinbase(height), height, block_time)
         block.solve()
         # Save the coinbase for later
         block1 = block
@@ -59,7 +59,7 @@ def run_test(self):
         # leave merkle root and blockheader unchanged but invalidate the block.
         self.log.info("Test merkle root malleability.")
 
-        block2 = create_block(tip, create_coinbase(height), block_time)
+        block2 = create_block(tip, create_coinbase(height), height, block_time)
         block_time += 1
 
         # b'0x51' is OP_TRUE
@@ -93,7 +93,7 @@ def run_test(self):
 
         self.log.info("Test very broken block.")
 
-        block3 = create_block(tip, create_coinbase(height), block_time)
+        block3 = create_block(tip, create_coinbase(height), height, block_time)
         block_time += 1
         block3.vtx[0].vout[0].nValue = 100 * COIN  # Too high!
         block3.vtx[0].sha256 = None
diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py
@@ -53,7 +53,7 @@ def run_test(self):
 
         self.log.info("Create a new block with an anyone-can-spend coinbase.")
         height = 1
-        block = create_block(tip, create_coinbase(height), block_time)
+        block = create_block(tip, create_coinbase(height), height, block_time)
         block.solve()
         # Save the coinbase for later
         block1 = block
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
@@ -211,7 +211,7 @@ def build_next_block(self, version=4):
         tip = self.nodes[0].getbestblockhash()
         height = self.nodes[0].getblockcount() + 1
         block_time = self.nodes[0].getblockheader(tip)["mediantime"] + 1
-        block = create_block(int(tip, 16), create_coinbase(height), block_time)
+        block = create_block(int(tip, 16), create_coinbase(height), height, block_time)
         block.version = version
         block.rehash()
         return block
diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py
@@ -263,7 +263,7 @@ def test_null_locators(self, test_node, inv_node):
         test_node.check_last_headers_announcement(headers=[tip_hash])
 
         self.log.info("Verify getheaders with null locator and invalid hashstop does not return headers.")
-        block = create_block(int(tip["hash"], 16), create_coinbase(tip["height"] + 1), tip["mediantime"] + 1)
+        block = create_block(int(tip["hash"], 16), create_coinbase(tip["height"] + 1), tip["height"]+1, tip["mediantime"] + 1)
         block.solve()
         test_node.send_header_for_blocks([block])
         test_node.clear_block_announcements()
@@ -303,7 +303,7 @@ def test_nonnull_locators(self, test_node, inv_node):
                 height = self.nodes[0].getblockcount()
                 last_time = self.nodes[0].getblock(self.nodes[0].getbestblockhash())['time']
                 block_time = last_time + 1
-                new_block = create_block(tip, create_coinbase(height + 1), block_time)
+                new_block = create_block(tip, create_coinbase(height + 1), height+1, block_time)
                 new_block.solve()
                 test_node.send_header_for_blocks([new_block])
                 test_node.wait_for_getdata([new_block.sha256])
@@ -340,7 +340,7 @@ def test_nonnull_locators(self, test_node, inv_node):
                 self.log.debug("Part 2.{}.{}: starting...".format(i, j))
                 blocks = []
                 for b in range(i + 1):
-                    blocks.append(create_block(tip, create_coinbase(height), block_time))
+                    blocks.append(create_block(tip, create_coinbase(height), height, block_time))
                     blocks[-1].solve()
                     tip = blocks[-1].sha256
                     block_time += 1
@@ -455,7 +455,7 @@ def test_nonnull_locators(self, test_node, inv_node):
         # Create 2 blocks.  Send the blocks, then send the headers.
         blocks = []
         for b in range(2):
-            blocks.append(create_block(tip, create_coinbase(height), block_time))
+            blocks.append(create_block(tip, create_coinbase(height), height, block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
             block_time += 1
@@ -473,7 +473,7 @@ def test_nonnull_locators(self, test_node, inv_node):
         # This time, direct fetch should work
         blocks = []
         for b in range(3):
-            blocks.append(create_block(tip, create_coinbase(height), block_time))
+            blocks.append(create_block(tip, create_coinbase(height), height, block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
             block_time += 1
@@ -489,12 +489,12 @@ def test_nonnull_locators(self, test_node, inv_node):
 
         # Now announce a header that forks the last two blocks
         tip = blocks[0].sha256
-        height -= 1
+        height -= 2
         blocks = []
 
         # Create extra blocks for later
         for b in range(20):
-            blocks.append(create_block(tip, create_coinbase(height), block_time))
+            blocks.append(create_block(tip, create_coinbase(height), height, block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
             block_time += 1
@@ -541,7 +541,7 @@ def test_nonnull_locators(self, test_node, inv_node):
             blocks = []
             # Create two more blocks.
             for j in range(2):
-                blocks.append(create_block(tip, create_coinbase(height), block_time))
+                blocks.append(create_block(tip, create_coinbase(height), height, block_time))
                 blocks[-1].solve()
                 tip = blocks[-1].sha256
                 block_time += 1
@@ -562,7 +562,7 @@ def test_nonnull_locators(self, test_node, inv_node):
         # don't go into an infinite loop trying to get them to connect.
         MAX_UNCONNECTING_HEADERS = 10
         for j in range(MAX_UNCONNECTING_HEADERS + 1):
-            blocks.append(create_block(tip, create_coinbase(height), block_time))
+            blocks.append(create_block(tip, create_coinbase(height), height, block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
             block_time += 1
diff --git a/test/functional/p2p_unrequested_blocks.py b/test/functional/p2p_unrequested_blocks.py
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class CBlockHeader`
`46`	`46`	`READWRITE(hashMerkleRoot);`
`47`	`47`	`READWRITE(nTime);`
`48`	`48`	`// Also found in consensus params as blockheight_in_header (circular dep otherwise)`
`49`		`- if (gArgs.GetBoolArg("-con_blockheightinheader", false)) {`
	`49`	`+ if (gArgs.GetBoolArg("-con_blockheightinheader", true)) {`
`50`	`50`	`READWRITE(block_height);`
`51`	`51`	`}`
`52`	`52`	`READWRITE(nBits);`