mirror of
https://github.com/dashpay/dash.git
synced 2024-12-29 13:59:06 +01:00
0b3c3e8406
* Merge #11415: [RPC] Disallow using addresses in createmultisig
1df206f
Disallow using addresses in createmultisig (Andrew Chow)
Pull request description:
This PR should be the last part of #7965.
This PR makes createmultisig only accept public keys and marks the old functionality of accepting addresses as deprecated.
It also splits `_createmultisig_redeemscript` into two functions, `_createmultisig_getpubkeys` and `_createmultisig_getaddr_pubkeys`. `_createmultisig_getpubkeys` retrieves public keys from the RPC parameters and `_createmultisig_getaddr_pubkeys` retrieves addresses' public keys from the wallet. `_createmultisig_getaddr_pubkeys` requires the wallet and is only used by `addwitnessaddress` (except when `createmultisig` is used in deprecated mode).
`addwitnessaddress`'s API is also changed. Instead of returning just an address, it now returns the same thing as `createmultisig`: a JSON object with two fields, address and redeemscript.
Tree-SHA512: a5796e41935ad5e47d8165ff996a8b20d5112b5fc1a06a6d3c7f5513c13e7628a4fd37ec30fde05d8b15abfed51bc250710140f6834b13f64d0a0e47a3817969
* fix backport
Signed-off-by: pasta <pasta@dashboost.org>
* fix backport
Signed-off-by: pasta <pasta@dashboost.org>
* fix backport
Signed-off-by: pasta <pasta@dashboost.org>
* Dashify
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com>
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
120 lines
5.3 KiB
Python
Executable File
120 lines
5.3 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.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
|
|
from test_framework.script import CScript
|
|
from io import BytesIO
|
|
|
|
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
|
|
self.extra_args = [['-whitelist=127.0.0.1']]
|
|
|
|
def run_test(self):
|
|
self.address = self.nodes[0].getnewaddress()
|
|
self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address])['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 = self.mocktime + 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()), 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()), True)
|
|
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 = 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()), 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], 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()), True)
|
|
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(bytes_to_hex_str(i.serialize()), True)
|
|
self.block_submit(self.nodes[0], test6txs, 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, 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()
|
|
node.submitblock(bytes_to_hex_str(block.serialize()))
|
|
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()
|