mirror of
https://github.com/dashpay/dash.git
synced 2024-12-29 05:49:11 +01:00
1df206f854
Make createmultisig only accept public keys with the old functionality marked as deprecated. Splits _createmultisig_redeemscript into two functions, one for getting public keys from UniValue and one for getting addresses from UniValue and then their respective public keys. The one for retrieving address's public keys is located in rpcwallet.cpp Changes addwitnessaddress's output to be a JSON object with two fields, address and redeemscript. Adds a test to deprecated_rpc.py for testing the deprecation. Update the tests to use addwitnessaddress or give only public keys to createmultisig. Anything that used addwitnessaddress was also updated to reflect the new API.
134 lines
6.5 KiB
Python
Executable File
134 lines
6.5 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2016-2017 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.test_framework import BitcoinTestFramework
|
|
from test_framework.util import *
|
|
from test_framework.mininode import CTransaction, network_thread_start
|
|
from test_framework.blocktools import create_coinbase, create_block, add_witness_commitment
|
|
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()
|
|
|
|
class NULLDUMMYTest(BitcoinTestFramework):
|
|
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
self.setup_clean_chain = True
|
|
# This script tests NULLDUMMY activation, which is part of the 'segwit' deployment, so we go through
|
|
# normal segwit activation here (and don't use the default always-on behaviour).
|
|
self.extra_args = [['-whitelist=127.0.0.1', '-walletprematurewitness', '-vbparams=segwit:0:999999999999', '-addresstype=legacy']]
|
|
|
|
def run_test(self):
|
|
self.address = self.nodes[0].getnewaddress()
|
|
self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address])['address']
|
|
self.wit_address = self.nodes[0].addwitnessaddress(self.address)
|
|
self.wit_ms_address = self.nodes[0].addwitnessaddress(self.ms_address)
|
|
|
|
network_thread_start()
|
|
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.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[0].serialize_with_witness()), True)
|
|
test1txs.append(self.create_transaction(self.nodes[0], txid1, self.ms_address, 48))
|
|
txid2 = self.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[1].serialize_with_witness()), True)
|
|
test1txs.append(self.create_transaction(self.nodes[0], coinbase_txid[1], self.wit_ms_address, 49))
|
|
txid3 = self.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[2].serialize_with_witness()), True)
|
|
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, 47)
|
|
trueDummy(test2tx)
|
|
assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test2tx.serialize_with_witness()), True)
|
|
|
|
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)
|
|
|
|
self.log.info("Test 4: Non-NULLDUMMY base multisig transaction is invalid after activation")
|
|
test4tx = self.create_transaction(self.nodes[0], test2tx.hash, self.address, 46)
|
|
test6txs=[CTransaction(test4tx)]
|
|
trueDummy(test4tx)
|
|
assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test4tx.serialize_with_witness()), True)
|
|
self.block_submit(self.nodes[0], [test4tx])
|
|
|
|
self.log.info("Test 5: Non-NULLDUMMY P2WSH multisig transaction invalid after activation")
|
|
test5tx = self.create_transaction(self.nodes[0], txid3, self.wit_address, 48)
|
|
test6txs.append(CTransaction(test5tx))
|
|
test5tx.wit.vtxinwit[0].scriptWitness.stack[0] = b'\x01'
|
|
assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test5tx.serialize_with_witness()), True)
|
|
self.block_submit(self.nodes[0], [test5tx], True)
|
|
|
|
self.log.info("Test 6: NULLDUMMY compliant base/witness transactions should be accepted to mempool and in block after activation [432]")
|
|
for i in test6txs:
|
|
self.nodes[0].sendrawtransaction(bytes_to_hex_str(i.serialize_with_witness()), True)
|
|
self.block_submit(self.nodes[0], test6txs, True, 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)
|
|
tx = CTransaction()
|
|
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
|
tx.deserialize(f)
|
|
return tx
|
|
|
|
|
|
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()
|
|
witness and add_witness_commitment(block)
|
|
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()
|