mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
6ad9bdf722
e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 [docs] Add release notes for burying bip 9 soft fork deployments (John Newbery) 8319e738f9f118025b332e4fa804d4c31e4113f4 [tests] Add coverage for the content of getblockchaininfo.softforks (James O'Beirne) 0328dcdcfcb56dc8918697716d7686be048ad0b3 [Consensus] Bury segwit deployment (John Newbery) 1c93b9b31c2ab7358f9d55f52dd46340397c906d [Consensus] Bury CSV deployment height (John Newbery) 3862e473f0cb71a762c0306b171b591341d58142 [rpc] Tidy up reporting of buried and ongoing softforks (John Newbery) Pull request description: This hardcodes CSV and segwit activation heights, similar to the BIP 90 buried deployments for BIPs 34, 65 and 66. CSV and segwit have been active for over 18 months. Hardcoding the activation height is a code simplification, makes it easier to understand segwit activation status, and reduces technical debt. This was originally attempted by jl2012 in #11398 and again by me in #12360. ACKs for top commit: ajtowns: ACK e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 ; checked diff to previous acked commit, checked tests still work ariard: ACK e78aaf4, check diff, run the tests again and successfully activated csv/segwit heights on mainnet as expected. MarcoFalke: ACK e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 (still didn't check if the mainnet block heights are correct, but the code looks good now) Tree-SHA512: 7e951829106e21a81725f7d3e236eddbb59349189740907bb47e33f5dbf95c43753ac1231f47ae7bee85c8c81b2146afcdfdc11deb1503947f23093a9c399912
159 lines
6.4 KiB
Python
Executable File
159 lines
6.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2015-2016 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Test BIP65 (CHECKLOCKTIMEVERIFY).
|
|
|
|
Test that the CHECKLOCKTIMEVERIFY soft-fork activates at (regtest) block height
|
|
1351.
|
|
"""
|
|
|
|
from test_framework.blocktools import create_coinbase, create_block, create_transaction
|
|
from test_framework.messages import CTransaction, msg_block, ToHex
|
|
from test_framework.mininode import P2PInterface
|
|
from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP, CScriptNum
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
assert_raises_rpc_error,
|
|
hex_str_to_bytes,
|
|
)
|
|
|
|
from io import BytesIO
|
|
|
|
CLTV_HEIGHT = 1351
|
|
|
|
|
|
def cltv_invalidate(tx):
|
|
'''Modify the signature in vin 0 of the tx to fail CLTV
|
|
|
|
Prepends -1 CLTV DROP in the scriptSig itself.
|
|
|
|
TODO: test more ways that transactions using CLTV could be invalid (eg
|
|
locktime requirements fail, sequence time requirements fail, etc).
|
|
'''
|
|
tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP] +
|
|
list(CScript(tx.vin[0].scriptSig)))
|
|
|
|
def cltv_validate(node, tx, height):
|
|
'''Modify the signature in vin 0 of the tx to pass CLTV
|
|
Prepends <height> CLTV DROP in the scriptSig, and sets
|
|
the locktime to height'''
|
|
tx.vin[0].nSequence = 0
|
|
tx.nLockTime = height
|
|
|
|
# Need to re-sign, since nSequence and nLockTime changed
|
|
signed_result = node.signrawtransactionwithwallet(ToHex(tx))
|
|
new_tx = CTransaction()
|
|
new_tx.deserialize(BytesIO(hex_str_to_bytes(signed_result['hex'])))
|
|
|
|
new_tx.vin[0].scriptSig = CScript([CScriptNum(height), OP_CHECKLOCKTIMEVERIFY, OP_DROP] +
|
|
list(CScript(new_tx.vin[0].scriptSig)))
|
|
return new_tx
|
|
|
|
|
|
class BIP65Test(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
self.extra_args = [[
|
|
'-whitelist=noban@127.0.0.1',
|
|
'-dip3params=9000:9000',
|
|
'-par=1', # Use only one script thread to get the exact reject reason for testing
|
|
'-acceptnonstdtxn=1', # cltv_invalidate is nonstandard
|
|
]]
|
|
self.setup_clean_chain = True
|
|
self.rpc_timeout = 120
|
|
|
|
def test_cltv_info(self, *, is_active):
|
|
assert_equal(self.nodes[0].getblockchaininfo()['softforks']['bip65'],
|
|
{
|
|
"active": is_active,
|
|
"height": CLTV_HEIGHT,
|
|
"type": "buried",
|
|
},
|
|
)
|
|
|
|
def skip_test_if_missing_module(self):
|
|
self.skip_if_no_wallet()
|
|
|
|
def run_test(self):
|
|
self.nodes[0].add_p2p_connection(P2PInterface())
|
|
|
|
self.test_cltv_info(is_active=False)
|
|
|
|
self.log.info("Mining %d blocks", CLTV_HEIGHT - 2)
|
|
self.coinbase_txids = [self.nodes[0].getblock(b)['tx'][0] for b in self.nodes[0].generate(CLTV_HEIGHT - 2)]
|
|
self.nodeaddress = self.nodes[0].getnewaddress()
|
|
|
|
self.log.info("Test that an invalid-according-to-CLTV transaction can still appear in a block")
|
|
|
|
spendtx = create_transaction(self.nodes[0], self.coinbase_txids[0],
|
|
self.nodeaddress, amount=1.0)
|
|
cltv_invalidate(spendtx)
|
|
spendtx.rehash()
|
|
|
|
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.nVersion = 3
|
|
block.vtx.append(spendtx)
|
|
block.hashMerkleRoot = block.calc_merkle_root()
|
|
block.solve()
|
|
|
|
self.test_cltv_info(is_active=False) # Not active as of current tip and next block does not need to obey rules
|
|
self.nodes[0].p2p.send_and_ping(msg_block(block))
|
|
self.test_cltv_info(is_active=True) # Not active as of current tip, but next block must obey rules
|
|
assert_equal(self.nodes[0].getbestblockhash(), block.hash)
|
|
|
|
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.nVersion = 3
|
|
block.solve()
|
|
|
|
with self.nodes[0].assert_debug_log(expected_msgs=['{}, bad-version(0x00000003)'.format(block.hash)]):
|
|
self.nodes[0].p2p.send_and_ping(msg_block(block))
|
|
assert_equal(int(self.nodes[0].getbestblockhash(), 16), tip)
|
|
self.nodes[0].p2p.sync_with_ping()
|
|
|
|
self.log.info("Test that invalid-according-to-cltv transactions cannot appear in a block")
|
|
block.nVersion = 4
|
|
|
|
spendtx = create_transaction(self.nodes[0], self.coinbase_txids[1],
|
|
self.nodeaddress, amount=1.0)
|
|
cltv_invalidate(spendtx)
|
|
spendtx.rehash()
|
|
|
|
# First we show that this tx is valid except for CLTV by getting it
|
|
# rejected from the mempool for exactly that reason.
|
|
assert_raises_rpc_error(-26, 'non-mandatory-script-verify-flag (Negative locktime)', self.nodes[0].sendrawtransaction, spendtx.serialize().hex(), 0)
|
|
|
|
# Now we verify that a block with this transaction is also invalid.
|
|
block.vtx.append(spendtx)
|
|
block.hashMerkleRoot = block.calc_merkle_root()
|
|
block.solve()
|
|
|
|
with self.nodes[0].assert_debug_log(expected_msgs=['CheckInputScripts on {} failed with non-mandatory-script-verify-flag (Negative locktime)'.format(block.vtx[-1].hash)]):
|
|
self.nodes[0].p2p.send_and_ping(msg_block(block))
|
|
assert_equal(int(self.nodes[0].getbestblockhash(), 16), tip)
|
|
self.nodes[0].p2p.sync_with_ping()
|
|
|
|
self.log.info("Test that a version 4 block with a valid-according-to-CLTV transaction is accepted")
|
|
spendtx = cltv_validate(self.nodes[0], spendtx, CLTV_HEIGHT - 1)
|
|
spendtx.rehash()
|
|
|
|
block.vtx.pop(1)
|
|
block.vtx.append(spendtx)
|
|
block.hashMerkleRoot = block.calc_merkle_root()
|
|
block.solve()
|
|
|
|
self.test_cltv_info(is_active=True) # Not active as of current tip, but next block must obey rules
|
|
self.nodes[0].p2p.send_and_ping(msg_block(block))
|
|
self.test_cltv_info(is_active=True) # Active as of current tip
|
|
assert_equal(int(self.nodes[0].getbestblockhash(), 16), block.sha256)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
BIP65Test().main()
|