Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/bip65-cltv-p2p.py

@@ -5,35 +5,23 @@
 #
 
 from test_framework.test_framework import ComparisonTestFramework
-from test_framework.util import *
+from test_framework.util import start_nodes
 from test_framework.mininode import CTransaction, NetworkThread
 from test_framework.blocktools import create_coinbase, create_block
 from test_framework.comptool import TestInstance, TestManager
 from test_framework.script import CScript, OP_1NEGATE, OP_NOP2, OP_DROP
-from binascii import hexlify, unhexlify
+from binascii import unhexlify
 import cStringIO
-import time
 
-def cltv_invalidate(tx):
-    '''Modify the signature in vin 0 of the tx to fail CLTV
-
-    Prepends -1 CLTV DROP in the scriptSig itself.
-    '''
-    tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP2, OP_DROP] +
-                                  list(CScript(tx.vin[0].scriptSig)))
 
 '''
-This test is meant to exercise BIP65 (CHECKLOCKTIMEVERIFY)
+This test is meant to exercise BIP65 (CHECKLOCKTIMEVERIFY).
 Connect to a single node.
-Mine 2 (version 3) blocks (save the coinbases for later).
-Generate 98 more version 3 blocks, verify the node accepts.
-Mine 749 version 4 blocks, verify the node accepts.
-Check that the new CLTV rules are not enforced on the 750th version 4 block.
-Check that the new CLTV rules are enforced on the 751st version 4 block.
-Mine 199 new version blocks.
-Mine 1 old-version block.
-Mine 1 new version block.
-Mine 1 old version block, see that the node rejects.
+Mine a coinbase block, and then ...
+Mine 1 version 4 block.
+Check that the CLTV rules are enforced.
+
+TODO: factor out common code from {bipdersig-p2p,bip65-cltv-p2p}.py.
 '''
 
 class BIP65Test(ComparisonTestFramework):
@@ -42,10 +30,10 @@ class BIP65Test(ComparisonTestFramework):
         self.num_nodes = 1
 
     def setup_network(self):
-        # Must set the blockversion for this test
         self.nodes = start_nodes(1, self.options.tmpdir,
-                                 extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=3']],
+                                 extra_args=[['-debug', '-whitelist=127.0.0.1']],
                                  binary=[self.options.testbinary])
+        self.is_network_split = False
 
     def run_test(self):
         test = TestManager(self, self.options.tmpdir)
@@ -64,112 +52,45 @@ class BIP65Test(ComparisonTestFramework):
         tx.deserialize(f)
         return tx
 
-    def get_tests(self):
+    def invalidate_transaction(self, tx):
+        '''
+        Modify the signature in vin 0 of the tx to fail CLTV
 
-        self.coinbase_blocks = self.nodes[0].generate(2)
+        Prepends -1 CLTV DROP in the scriptSig itself.
+        '''
+        tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP2, OP_DROP] +
+                                      list(CScript(tx.vin[0].scriptSig)))
+
+    def get_tests(self):
+        self.coinbase_blocks = self.nodes[0].generate(1)
+        self.nodes[0].generate(100)
         self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
         self.nodeaddress = self.nodes[0].getnewaddress()
-        self.last_block_time = time.time()
 
-        ''' 98 more version 3 blocks '''
-        test_blocks = []
-        for i in xrange(98):
-            block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1)
-            block.nVersion = 3
-            block.rehash()
-            block.solve()
-            test_blocks.append([block, True])
-            self.last_block_time += 1
-            self.tip = block.sha256
-        yield TestInstance(test_blocks, sync_every_block=False)
+        '''Check that the rules are enforced.'''
+        for valid in (True, False):
+            spendtx = self.create_transaction(self.nodes[0],
+                                              self.coinbase_blocks[0],
+                                              self.nodeaddress, 1.0)
+            if not valid:
+                self.invalidate_transaction(spendtx)
+                spendtx.rehash()
 
-        ''' Mine 749 version 4 blocks '''
-        test_blocks = []
-        for i in xrange(749):
-            block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1)
+            gbt = self.nodes[0].getblocktemplate()
+            self.block_time = gbt["mintime"] + 1
+            self.block_bits = int("0x" + gbt["bits"], 0)
+
+            block = create_block(self.tip, create_coinbase(101),
+                                 self.block_time, self.block_bits)
             block.nVersion = 4
+            block.vtx.append(spendtx)
+            block.hashMerkleRoot = block.calc_merkle_root()
             block.rehash()
             block.solve()
-            test_blocks.append([block, True])
-            self.last_block_time += 1
+            self.block_time += 1
             self.tip = block.sha256
-        yield TestInstance(test_blocks, sync_every_block=False)
+            yield TestInstance([[block, valid]])
 
-        '''
-        Check that the new CLTV rules are not enforced in the 750th
-        version 3 block.
-        '''
-        spendtx = self.create_transaction(self.nodes[0],
-                self.coinbase_blocks[0], self.nodeaddress, 1.0)
-        cltv_invalidate(spendtx)
-        spendtx.rehash()
-
-        block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1)
-        block.nVersion = 4
-        block.vtx.append(spendtx)
-        block.hashMerkleRoot = block.calc_merkle_root()
-        block.rehash()
-        block.solve()
-
-        self.last_block_time += 1
-        self.tip = block.sha256
-        yield TestInstance([[block, True]])
-
-        '''
-        Check that the new CLTV rules are enforced in the 751st version 4
-        block.
-        '''
-        spendtx = self.create_transaction(self.nodes[0],
-                self.coinbase_blocks[1], self.nodeaddress, 1.0)
-        cltv_invalidate(spendtx)
-        spendtx.rehash()
-
-        block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1)
-        block.nVersion = 4
-        block.vtx.append(spendtx)
-        block.hashMerkleRoot = block.calc_merkle_root()
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        yield TestInstance([[block, False]])
-
-        ''' Mine 199 new version blocks on last valid tip '''
-        test_blocks = []
-        for i in xrange(199):
-            block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1)
-            block.nVersion = 4
-            block.rehash()
-            block.solve()
-            test_blocks.append([block, True])
-            self.last_block_time += 1
-            self.tip = block.sha256
-        yield TestInstance(test_blocks, sync_every_block=False)
-
-        ''' Mine 1 old version block '''
-        block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1)
-        block.nVersion = 3
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        self.tip = block.sha256
-        yield TestInstance([[block, True]])
-
-        ''' Mine 1 new version block '''
-        block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1)
-        block.nVersion = 4
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        self.tip = block.sha256
-        yield TestInstance([[block, True]])
-
-        ''' Mine 1 old version block, should be invalid '''
-        block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1)
-        block.nVersion = 3
-        block.rehash()
-        block.solve()
-        self.last_block_time += 1
-        yield TestInstance([[block, False]])
 
 if __name__ == '__main__':
     BIP65Test().main()