mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
091d813e00
9075d13153ce06cd59a45644831ecc43126e1e82 [docs] Add release notes for removal of REJECT reasons (John Newbery)
04a2f326ec0f06fb4fce1c4f93500752f05dede8 [validation] Fix REJECT message comments (John Newbery)
e9d5a59e34ff2d538d8f5315efd9908bf24d0fdc [validation] Remove REJECT code from CValidationState (John Newbery)
0053e16714323c1694c834fdca74f064a1a33529 [logging] Don't log REJECT code when transaction is rejected (John Newbery)
a1a07cfe99fc8cee30ba5976dc36b47b1f6532ab [validation] Fix peer punishment for bad blocks (John Newbery)
Pull request description:
We no longer send BIP 61 REJECT messages, so there's no need to set
a REJECT code in the CValidationState object.
Note that there is a minor bug fix in p2p behaviour here. Because the
call to `MaybePunishNode()` in `PeerLogicValidation::BlockChecked()` only
previously happened if the REJECT code was > 0 and < `REJECT_INTERNAL`,
then there are cases were `MaybePunishNode()` can get called where it
wasn't previously:
- when `AcceptBlockHeader()` fails with `CACHED_INVALID`.
- when `AcceptBlockHeader()` fails with `BLOCK_MISSING_PREV`.
Note that `BlockChecked()` cannot fail with an 'internal' reject code. The
only internal reject code was `REJECT_HIGHFEE`, which was only set in
ATMP.
This reverts a minor bug introduced in 5d08c9c579.
ACKs for top commit:
ariard:
ACK 9075d13, changes since last reviewed are splitting them in separate commits to ease understanding and fix nits
fjahr:
ACK 9075d13153ce06cd59a45644831ecc43126e1e82, confirmed diff to last review was fixing nits in docs/comments.
ryanofsky:
Code review ACK 9075d13153ce06cd59a45644831ecc43126e1e82. Only changes since last review are splitting the main commit and updating comments
Tree-SHA512: 58e8a1a4d4e6f156da5d29fb6ad6a62fc9c594bbfc6432b3252e962d0e9e10149bf3035185dc5320c46c09f3e49662bc2973ec759679c0f3412232087cb8a3a7
111 lines
4.9 KiB
Python
Executable File
111 lines
4.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 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 NULLDUMMY softfork.
|
|
|
|
Connect to a single node.
|
|
Generate 2 blocks (save the coinbases for later).
|
|
Generate 427 more blocks.
|
|
[Policy/Consensus] Check that NULLDUMMY compliant transactions are accepted in the 430th block.
|
|
[Policy] Check that non-NULLDUMMY transactions are rejected before activation.
|
|
[Consensus] Check that the new NULLDUMMY rules are not enforced on the 431st block.
|
|
[Policy/Consensus] Check that the new NULLDUMMY rules are enforced on the 432nd block.
|
|
"""
|
|
|
|
from test_framework.blocktools import create_coinbase, create_block, create_transaction
|
|
from test_framework.messages import CTransaction
|
|
from test_framework.script import CScript
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import assert_equal, assert_raises_rpc_error
|
|
|
|
|
|
NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero)"
|
|
|
|
def trueDummy(tx):
|
|
scriptSig = CScript(tx.vin[0].scriptSig)
|
|
newscript = []
|
|
for i in scriptSig:
|
|
if (len(newscript) == 0):
|
|
assert len(i) == 0
|
|
newscript.append(b'\x51')
|
|
else:
|
|
newscript.append(i)
|
|
tx.vin[0].scriptSig = CScript(newscript)
|
|
tx.rehash()
|
|
|
|
class NULLDUMMYTest(BitcoinTestFramework):
|
|
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
self.setup_clean_chain = True
|
|
self.extra_args = [['-whitelist=127.0.0.1']]
|
|
|
|
def skip_test_if_missing_module(self):
|
|
self.skip_if_no_wallet()
|
|
|
|
def run_test(self):
|
|
self.address = self.nodes[0].getnewaddress()
|
|
self.ms_address = self.nodes[0].addmultisigaddress(1, [self.address])['address']
|
|
|
|
self.coinbase_blocks = self.nodes[0].generate(2) # Block 2
|
|
coinbase_txid = []
|
|
for i in self.coinbase_blocks:
|
|
coinbase_txid.append(self.nodes[0].getblock(i)['tx'][0])
|
|
self.nodes[0].generate(427) # Block 429
|
|
self.lastblockhash = self.nodes[0].getbestblockhash()
|
|
self.tip = int("0x" + self.lastblockhash, 0)
|
|
self.lastblockheight = 429
|
|
self.lastblocktime = self.mocktime + 429
|
|
|
|
self.log.info("Test 1: NULLDUMMY compliant base transactions should be accepted to mempool and mined before activation [430]")
|
|
test1txs = [create_transaction(self.nodes[0], coinbase_txid[0], self.ms_address, amount=49)]
|
|
txid1 = self.nodes[0].sendrawtransaction(test1txs[0].serialize().hex(), 0)
|
|
test1txs.append(create_transaction(self.nodes[0], txid1, self.ms_address, amount=48))
|
|
txid2 = self.nodes[0].sendrawtransaction(test1txs[1].serialize().hex(), 0)
|
|
self.block_submit(self.nodes[0], test1txs, True)
|
|
|
|
self.log.info("Test 2: Non-NULLDUMMY base multisig transaction should not be accepted to mempool before activation")
|
|
test2tx = create_transaction(self.nodes[0], txid2, self.ms_address, amount=47)
|
|
trueDummy(test2tx)
|
|
assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, test2tx.serialize().hex(), 0)
|
|
|
|
self.log.info("Test 3: Non-NULLDUMMY base transactions should be accepted in a block before activation [431]")
|
|
self.block_submit(self.nodes[0], [test2tx], True)
|
|
|
|
self.log.info("Test 4: Non-NULLDUMMY base multisig transaction is invalid after activation")
|
|
test4tx = create_transaction(self.nodes[0], test2tx.hash, self.address, amount=46)
|
|
test6txs=[CTransaction(test4tx)]
|
|
trueDummy(test4tx)
|
|
assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, test4tx.serialize().hex(), 0)
|
|
self.block_submit(self.nodes[0], [test4tx])
|
|
|
|
self.log.info("Test 6: NULLDUMMY compliant transactions should be accepted to mempool and in block after activation [432]")
|
|
for i in test6txs:
|
|
self.nodes[0].sendrawtransaction(i.serialize().hex(), 0)
|
|
self.block_submit(self.nodes[0], test6txs, True)
|
|
|
|
|
|
def block_submit(self, node, txs, accept = False):
|
|
dip4_activated = self.lastblockheight + 1 >= 432
|
|
block = create_block(self.tip, create_coinbase(self.lastblockheight + 1, dip4_activated=dip4_activated), self.lastblocktime + 1)
|
|
block.nVersion = 4
|
|
for tx in txs:
|
|
tx.rehash()
|
|
block.vtx.append(tx)
|
|
block.hashMerkleRoot = block.calc_merkle_root()
|
|
block.rehash()
|
|
block.solve()
|
|
assert_equal(None if accept else 'block-validation-failed', node.submitblock(block.serialize().hex()))
|
|
if (accept):
|
|
assert_equal(node.getbestblockhash(), block.hash)
|
|
self.tip = block.sha256
|
|
self.lastblockhash = block.hash
|
|
self.lastblocktime += 1
|
|
self.lastblockheight += 1
|
|
else:
|
|
assert_equal(node.getbestblockhash(), self.lastblockhash)
|
|
|
|
if __name__ == '__main__':
|
|
NULLDUMMYTest().main()
|