diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -152,7 +152,6 @@
'preciousblock.py',
'importprunedfunds.py',
'signmessages.py',
- 'nulldummy.py',
'import-rescan.py',
'rpcnamedargs.py',
'listsinceblock.py',
diff --git a/qa/rpc-tests/nulldummy.py b/qa/rpc-tests/nulldummy.py
deleted file mode 100755
--- a/qa/rpc-tests/nulldummy.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/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.
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-from test_framework.mininode import CTransaction, NetworkThread
-from test_framework.blocktools import create_coinbase, create_block
-from test_framework.script import CScript
-from io import BytesIO
-import time
-
-NULLDUMMY_ERROR = "64: 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()
-
-'''
-This test is meant to exercise 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.
-'''
-
-
-class NULLDUMMYTest(BitcoinTestFramework):
-
- def __init__(self):
- super().__init__()
- self.num_nodes = 1
- self.setup_clean_chain = True
- self.extra_args = [['-whitelist=127.0.0.1', '-walletprematurewitness']]
-
- def run_test(self):
- self.address = self.nodes[0].getnewaddress()
- self.ms_address = self.nodes[0].addmultisigaddress(1, [self.address])
-
- NetworkThread().start() # Start up network handling in another thread
- 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 = int(time.time()) + 429
-
- self.log.info(
- "Test 1: NULLDUMMY compliant base transactions should be accepted to mempool and mined before activation [430]")
- test1txs = [self.create_transaction(
- self.nodes[0], coinbase_txid[0], self.ms_address, 49)]
- txid1 = self.tx_submit(self.nodes[0], test1txs[0])
- test1txs.append(self.create_transaction(
- self.nodes[0], txid1, self.ms_address, 48))
- txid2 = self.tx_submit(self.nodes[0], test1txs[1])
- self.block_submit(self.nodes[0], test1txs, False, True)
-
- self.log.info(
- "Test 2: Non-NULLDUMMY base multisig transaction should not be accepted to mempool before activation")
- test2tx = self.create_transaction(
- self.nodes[0], txid2, self.ms_address, 48)
- trueDummy(test2tx)
- txid4 = self.tx_submit(self.nodes[0], test2tx, NULLDUMMY_ERROR)
-
- 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], False, True)
-
- def create_transaction(self, node, txid, to_address, amount):
- inputs = [{"txid": txid, "vout": 0}]
- outputs = {to_address: amount}
- rawtx = node.createrawtransaction(inputs, outputs)
- signresult = node.signrawtransaction(rawtx, None, None, "ALL|FORKID")
- tx = CTransaction()
- f = BytesIO(hex_str_to_bytes(signresult['hex']))
- tx.deserialize(f)
- return tx
-
- def tx_submit(self, node, tx, msg=""):
- tx.rehash()
- try:
- node.sendrawtransaction(
- bytes_to_hex_str(tx.serialize_with_witness()), True)
- except JSONRPCException as exp:
- assert_equal(exp.error["message"], msg)
- else:
- assert_equal('', msg)
- return tx.hash
-
- def block_submit(self, node, txs, witness=False, accept=False):
- block = create_block(self.tip, create_coinbase(
- self.lastblockheight + 1), 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()
- node.submitblock(bytes_to_hex_str(block.serialize(True)))
- 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()
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1838,6 +1838,7 @@
// signature script are push only.
if (IsCashHFEnabled(config, pindex->pprev)) {
flags |= SCRIPT_VERIFY_LOW_S;
+ flags |= SCRIPT_VERIFY_NULLDUMMY;
flags |= SCRIPT_VERIFY_NULLFAIL;
}