Remove need for additional create_block arg by extracting the block height directly from coinbase

instagibbs · instagibbs · commit 79a45334eb3a · 2018-11-26T12:07:12.000-05:00
diff --git a/test/functional/example_test.py b/test/functional/example_test.py
@@ -166,7 +166,7 @@ def run_test(self):
             # Use the mininode and blocktools functionality to manually build a block
             # Calling the generate() rpc is easier, but this allows us to exactly
             # control the blocks and transactions.
-            block = create_block(self.tip, create_coinbase(height+1), height+1, self.block_time)
+            block = create_block(self.tip, create_coinbase(height+1), self.block_time)
             block.solve()
             block_message = msg_block(block)
             # Send message is used to send a P2P message to the node over our P2PInterface
diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py
@@ -110,7 +110,7 @@ def run_test(self):
 
         # Create the first block with a coinbase output to our key
         height = self.nodes[0].getblockcount() + 1
-        block = create_block(self.tip, create_coinbase(height, coinbase_pubkey), height, self.block_time)
+        block = create_block(self.tip, create_coinbase(height, coinbase_pubkey), self.block_time)
         self.blocks.append(block)
         self.block_time += 1
         block.solve()
@@ -121,7 +121,7 @@ def run_test(self):
 
         # Bury the block 100 deep so the coinbase output is spendable
         for i in range(100):
-            block = create_block(self.tip, create_coinbase(height), height, self.block_time)
+            block = create_block(self.tip, create_coinbase(height), self.block_time)
             block.solve()
             self.blocks.append(block)
             self.tip = block.sha256
@@ -134,7 +134,7 @@ def run_test(self):
         tx.vout.append(CTxOut(49 * 100000000, CScript([OP_TRUE])))
         tx.calc_sha256()
 
-        block102 = create_block(self.tip, create_coinbase(height), height, self.block_time)
+        block102 = create_block(self.tip, create_coinbase(height), self.block_time)
         self.block_time += 1
         block102.vtx.extend([tx])
         block102.hashMerkleRoot = block102.calc_merkle_root()
@@ -147,7 +147,7 @@ def run_test(self):
 
         # Bury the assumed valid block 2100 deep
         for i in range(2100):
-            block = create_block(self.tip, create_coinbase(height), height, self.block_time)
+            block = create_block(self.tip, create_coinbase(height), self.block_time)
             block.nVersion = 4
             block.solve()
             self.blocks.append(block)
diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py
@@ -306,7 +306,7 @@ def test_nonzero_locks(orig_tx, node, relayfee, use_height_lock):
         tip = int(self.nodes[0].getblockhash(self.nodes[0].getblockcount()-1), 16)
         height = self.nodes[0].getblockcount()
         for i in range(2):
-            block = create_block(tip, create_coinbase(height), height, cur_time)
+            block = create_block(tip, create_coinbase(height), cur_time)
             block.nVersion = 3
             block.rehash()
             block.solve()
@@ -361,7 +361,7 @@ def test_bip68_not_consensus(self):
 
         # make a block that violates bip68; ensure that the tip updates
         tip = int(self.nodes[0].getbestblockhash(), 16)
-        block = create_block(tip, create_coinbase(self.nodes[0].getblockcount()+1), self.nodes[0].getblockcount()+1)
+        block = create_block(tip, create_coinbase(self.nodes[0].getblockcount()+1))
         block.nVersion = 3
         block.vtx.extend([tx1, tx2, tx3])
         block.hashMerkleRoot = block.calc_merkle_root()
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
@@ -1245,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, height, block_time)
+            block = create_block(base_block_hash, coinbase, 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, height, block_time)
+            block = create_block(base_block_hash, coinbase, 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), CLTV_HEIGHT-1, block_time)
+        block = create_block(int(tip, 16), create_coinbase(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), CLTV_HEIGHT, block_time)
+        block = create_block(tip, create_coinbase(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.tipheight + 1, self.last_block_time + 600)
+        block = create_block(self.tip, create_coinbase(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_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.lastblockheight + 1, self.lastblocktime + 1)
+        block = create_block(self.tip, create_coinbase(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), height+1, block_time)
+            block = create_block(tip, create_coinbase(height + 1), block_time)
             block.nVersion = version
             block.solve()
             peer.send_message(msg_block(block))
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), height+1, mtp + 1)
+        block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
         block.nVersion = 4
         if segwit:
             add_witness_commitment(block)
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, prev_height + 1, block_time)
+            block = create_block(int(prev_hash, 16), coinbase, 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), height, block_time)
+        block = create_block(tip, create_coinbase(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), height, block_time)
+        block2 = create_block(tip, create_coinbase(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), height, block_time)
+        block3 = create_block(tip, create_coinbase(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), height, block_time)
+        block = create_block(tip, create_coinbase(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), height, block_time)
+        block = create_block(int(tip, 16), create_coinbase(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["height"]+1, tip["mediantime"] + 1)
+        block = create_block(int(tip["hash"], 16), create_coinbase(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), height+1, block_time)
+                new_block = create_block(tip, create_coinbase(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), height, block_time))
+                    blocks.append(create_block(tip, create_coinbase(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), height, block_time))
+            blocks.append(create_block(tip, create_coinbase(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), height, block_time))
+            blocks.append(create_block(tip, create_coinbase(height), block_time))
             blocks[-1].solve()
             tip = blocks[-1].sha256
             block_time += 1
@@ -494,7 +494,7 @@ def test_nonnull_locators(self, test_node, inv_node):
 
         # Create extra blocks for later
         for b in range(20):
-            blocks.append(create_block(tip, create_coinbase(height), height, block_time))
+            blocks.append(create_block(tip, create_coinbase(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), height, block_time))
+                blocks.append(create_block(tip, create_coinbase(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), height, block_time))
+            blocks.append(create_block(tip, create_coinbase(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
@@ -90,7 +90,7 @@ def run_test(self):
         blocks_h2 = []  # the height 2 blocks on each node's chain
         block_time = int(time.time()) + 1
         for i in range(2):
-            blocks_h2.append(create_block(tips[i], create_coinbase(2), 2, block_time))
+            blocks_h2.append(create_block(tips[i], create_coinbase(2), block_time))
             blocks_h2[i].solve()
             block_time += 1
         test_node.send_message(msg_block(blocks_h2[0]))
@@ -103,7 +103,7 @@ def run_test(self):
         self.log.info("First height 2 block accepted by node0; correctly rejected by node1")
 
         # 3. Send another block that builds on genesis.
-        block_h1f = create_block(int("0x" + self.nodes[0].getblockhash(0), 0), create_coinbase(1), 1, block_time)
+        block_h1f = create_block(int("0x" + self.nodes[0].getblockhash(0), 0), create_coinbase(1), block_time)
         block_time += 1
         block_h1f.solve()
         test_node.send_message(msg_block(block_h1f))
@@ -118,7 +118,7 @@ def run_test(self):
         assert_raises_rpc_error(-1, "Block not found on disk", self.nodes[0].getblock, block_h1f.hash)
 
         # 4. Send another two block that build on the fork.
-        block_h2f = create_block(block_h1f.sha256, create_coinbase(2), 2, block_time)
+        block_h2f = create_block(block_h1f.sha256, create_coinbase(2), block_time)
         block_time += 1
         block_h2f.solve()
         test_node.send_message(msg_block(block_h2f))
@@ -138,7 +138,7 @@ def run_test(self):
         self.log.info("Second height 2 block accepted, but not reorg'ed to")
 
         # 4b. Now send another block that builds on the forking chain.
-        block_h3 = create_block(block_h2f.sha256, create_coinbase(3), 3, block_h2f.nTime+1)
+        block_h3 = create_block(block_h2f.sha256, create_coinbase(3), block_h2f.nTime+1)
         block_h3.solve()
         test_node.send_message(msg_block(block_h3))
 
@@ -162,7 +162,7 @@ def run_test(self):
         tip = block_h3
         all_blocks = []
         for i in range(288):
-            next_block = create_block(tip.sha256, create_coinbase(i + 4), i+4, tip.nTime+1)
+            next_block = create_block(tip.sha256, create_coinbase(i + 4), tip.nTime+1)
             next_block.solve()
             all_blocks.append(next_block)
             tip = next_block
@@ -237,16 +237,16 @@ def run_test(self):
 
         # 8. Create a chain which is invalid at a height longer than the
         # current chain, but which has more blocks on top of that
-        block_289f = create_block(all_blocks[284].sha256, create_coinbase(289), 289, all_blocks[284].nTime+1)
+        block_289f = create_block(all_blocks[284].sha256, create_coinbase(289), all_blocks[284].nTime+1)
         block_289f.solve()
-        block_290f = create_block(block_289f.sha256, create_coinbase(290), 290, block_289f.nTime+1)
+        block_290f = create_block(block_289f.sha256, create_coinbase(290), block_289f.nTime+1)
         block_290f.solve()
-        block_291 = create_block(block_290f.sha256, create_coinbase(291), 291, block_290f.nTime+1)
+        block_291 = create_block(block_290f.sha256, create_coinbase(291), block_290f.nTime+1)
         # block_291 spends a coinbase below maturity!
         block_291.vtx.append(create_tx_with_script(block_290f.vtx[0], 0, script_sig=b"42", amount=1))
         block_291.hashMerkleRoot = block_291.calc_merkle_root()
         block_291.solve()
-        block_292 = create_block(block_291.sha256, create_coinbase(292), 292, block_291.nTime+1)
+        block_292 = create_block(block_291.sha256, create_coinbase(292), block_291.nTime+1)
         block_292.solve()
 
         # Now send all the headers on the chain and enough blocks to trigger reorg
@@ -293,7 +293,7 @@ def run_test(self):
         assert_equal(self.nodes[0].getblock(block_291.hash)["confirmations"], -1)
 
         # Now send a new header on the invalid chain, indicating we're forked off, and expect to get disconnected
-        block_293 = create_block(block_292.sha256, create_coinbase(293), 293, block_292.nTime+1)
+        block_293 = create_block(block_292.sha256, create_coinbase(293), block_292.nTime+1)
         block_293.solve()
         headers_message = msg_headers()
         headers_message.headers.append(CBlockHeader(block_293))
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -269,7 +269,7 @@ def _test_waitforblockheight(self):
         b20 = node.getblock(b20hash)
 
         def solve_and_send_block(prevhash, height, time):
-            b = create_block(prevhash, create_coinbase(height), height, time)
+            b = create_block(prevhash, create_coinbase(height), time)
             b.solve()
             node.p2p.send_message(msg_block(b))
             node.p2p.sync_with_ping()
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
@@ -30,6 +30,7 @@
 )
 from .script import (
     CScript,
+    CScriptNum,
     OP_0,
     OP_1,
     OP_CHECKMULTISIG,
@@ -44,15 +45,20 @@
 # From BIP141
 WITNESS_COMMITMENT_HEADER = b"\xaa\x21\xa9\xed"
 
-def create_block(hashprev, coinbase, block_height, ntime=None):
+# Assumes a BIP34 valid commitment exists
+def get_coinbase_height(coinbase):
+    # deserialize first?
+    return CScriptNum.decode(coinbase.vin[0].scriptSig)
+
+def create_block(hashprev, coinbase, ntime=None):
     """Create a block (with regtest difficulty)."""
     block = CBlock()
     if ntime is None:
         import time
         block.nTime = int(time.time() + 600)
     else:
         block.nTime = ntime
-    block.block_height = block_height
+    block.block_height = get_coinbase_height(coinbase)
     block.hashPrevBlock = hashprev
     block.nBits = 0x207fffff  # difficulty retargeting is disabled in REGTEST chainparams
     block.vtx.append(coinbase)
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
@@ -290,7 +290,7 @@ def submit_block_with_tx(node, tx):
     tip = node.getbestblockhash()
     height = node.getblockcount() + 1
     block_time = node.getblockheader(tip)["mediantime"] + 1
-    block = create_block(int(tip, 16), create_coinbase(height), height, block_time)
+    block = create_block(int(tip, 16), create_coinbase(height), block_time)
     block.vtx.append(ctx)
     block.rehash()
     block.hashMerkleRoot = block.calc_merkle_root()
