From a4ad37d4ef4bcd81bc9d867b277efdebc86bc2e8 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 15 Oct 2016 17:51:05 -0400
Subject: [PATCH] [qa] Build v4 blocks in p2p-compactblocktests

This fixes an issue in backporting to 0.13 as 0.13 enforces SF
activation by block version lockin instead of through a hard-coded
block height.
---
 qa/rpc-tests/p2p-compactblocks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index 1beab609b68ef..131654c333d4d 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -128,6 +128,7 @@ def build_block_on_tip(self, node, segwit=False):
         tip = node.getbestblockhash()
         mtp = node.getblockheader(tip)['mediantime']
         block = create_block(int(tip, 16), create_coinbase(height + 1), mtp + 1)
+        block.nVersion = 4
         if segwit:
             add_witness_commitment(block)
         block.solve()