test

Author: ComputerCraftr

test/functional/data/invalid_txs.py

@@ -117,8 +117,8 @@ def get_tx(self):
 # tree depth commitment (CVE-2017-12842)
 class SizeTooSmall(BadTxTemplate):
     reject_reason = "tx-size-small"
-    expect_disconnect = False
-    valid_in_block = True
+    expect_disconnect = True
+    valid_in_block = False
 
     def get_tx(self):
         tx = CTransaction()

test/functional/feature_block.py

@@ -160,7 +160,7 @@ def run_test(self):
             blockname = f"for_invalid.{TxTemplate.__name__}"
             self.next_block(blockname)
             badtx = template.get_tx()
-            if TxTemplate != invalid_txs.InputMissing:
+            if TxTemplate != invalid_txs.InputMissing and TxTemplate != invalid_txs.SizeTooSmall:
                 self.sign_tx(badtx, attempt_spend_tx)
             badtx.rehash()
             badblock = self.update_block(blockname, [badtx])

test/functional/p2p_ibd_stalling.py

@@ -82,7 +82,7 @@ def run_test(self):
 
         # Need to wait until 1023 blocks are received - the magic total bytes number is a workaround in lack of an rpc
         # returning the number of downloaded (but not connected) blocks.
-        bytes_recv = 172761 if not self.options.v2transport else 169692
+        bytes_recv = 174555 if not self.options.v2transport else 171486
         self.wait_until(lambda: self.total_bytes_recv_for_blocks() == bytes_recv)
 
         self.all_sync_send_with_ping(peers)

test/functional/p2p_invalid_tx.py

@@ -165,7 +165,7 @@ def run_test(self):
             node.p2ps[0].send_txs_and_test([rejected_parent], node, success=False)
 
         self.log.info('Test that a peer disconnection causes erase its transactions from the orphan pool')
-        with node.assert_debug_log(['Erased 100 orphan transaction(s) from peer=26']):
+        with node.assert_debug_log(['Erased 100 orphan transaction(s) from peer=']):
             self.reconnect_p2p(num_connections=1)
 
         self.log.info('Test that a transaction in the orphan pool is included in a new tip block causes erase this transaction from the orphan pool')

test/functional/test_framework/blocktools.py

@@ -135,12 +135,21 @@ def add_witness_commitment(block, nonce=0):
     block.rehash()
 
 
-def script_BIP34_coinbase_height(height):
+def script_BIP34_coinbase_height(height, pad=False):
     if height <= 16:
         res = CScriptOp.encode_op_n(height)
         # Append dummy to increase scriptSig size to 2 (see bad-cb-length consensus rule)
-        return CScript([res, OP_0])
-    return CScript([CScriptNum(height)])
+        script_array = [res, OP_0]
+        if pad:
+            script_array.append(OP_0)
+            script_array.append(OP_0)
+        return CScript(script_array)
+
+    script_array = [CScriptNum(height)]
+    if pad:
+        script_array.append(OP_0)
+        script_array.append(OP_0)
+    return CScript(script_array)
 
 
 def create_coinbase(height, pubkey=None, *, script_pubkey=None, extra_output_script=None, fees=0, nValue=50, retarget_period=REGTEST_RETARGET_PERIOD):
@@ -171,6 +180,11 @@ def create_coinbase(height, pubkey=None, *, script_pubkey=None, extra_output_scr
         coinbaseoutput2.nValue = 0
         coinbaseoutput2.scriptPubKey = extra_output_script
         coinbase.vout.append(coinbaseoutput2)
+
+    # Add padding if coinbase is exactly 64 bytes long to comply with XEP consensus rules
+    if len(coinbase.serialize_without_witness()) == 64:
+        coinbase.vin = [CTxIn(COutPoint(0, 0xffffffff), script_BIP34_coinbase_height(height, True), SEQUENCE_FINAL)]
+
     coinbase.calc_sha256()
     return coinbase