mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +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>
98 lines
4.8 KiB
Python
Executable File
98 lines
4.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2014-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 the listtransactions API."""
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import *
|
|
from test_framework.mininode import CTransaction, COIN
|
|
from io import BytesIO
|
|
|
|
def txFromHex(hexstring):
|
|
tx = CTransaction()
|
|
f = BytesIO(hex_str_to_bytes(hexstring))
|
|
tx.deserialize(f)
|
|
return tx
|
|
|
|
class ListTransactionsTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 2
|
|
self.set_cache_mocktime()
|
|
|
|
def run_test(self):
|
|
# Simple send, 0 to 1:
|
|
txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)
|
|
self.sync_all()
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"txid":txid},
|
|
{"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":0})
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"txid":txid},
|
|
{"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":0})
|
|
# mine a block, confirmations should change:
|
|
self.nodes[0].generate(1)
|
|
self.sync_all()
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"txid":txid},
|
|
{"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":1})
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"txid":txid},
|
|
{"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":1})
|
|
|
|
# send-to-self:
|
|
txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 0.2)
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"txid":txid, "category":"send"},
|
|
{"amount":Decimal("-0.2")})
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"txid":txid, "category":"receive"},
|
|
{"amount":Decimal("0.2")})
|
|
|
|
# sendmany from node1: twice to self, twice to node2:
|
|
send_to = { self.nodes[0].getnewaddress() : 0.11,
|
|
self.nodes[1].getnewaddress() : 0.22,
|
|
self.nodes[0].getaccountaddress("from1") : 0.33,
|
|
self.nodes[1].getaccountaddress("toself") : 0.44 }
|
|
txid = self.nodes[1].sendmany("", send_to)
|
|
self.sync_all()
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"send","amount":Decimal("-0.11")},
|
|
{"txid":txid} )
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"category":"receive","amount":Decimal("0.11")},
|
|
{"txid":txid} )
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"send","amount":Decimal("-0.22")},
|
|
{"txid":txid} )
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"receive","amount":Decimal("0.22")},
|
|
{"txid":txid} )
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"send","amount":Decimal("-0.33")},
|
|
{"txid":txid} )
|
|
assert_array_result(self.nodes[0].listtransactions(),
|
|
{"category":"receive","amount":Decimal("0.33")},
|
|
{"txid":txid, "account" : "from1"} )
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"send","amount":Decimal("-0.44")},
|
|
{"txid":txid, "account" : ""} )
|
|
assert_array_result(self.nodes[1].listtransactions(),
|
|
{"category":"receive","amount":Decimal("0.44")},
|
|
{"txid":txid, "account" : "toself"} )
|
|
|
|
pubkey = self.nodes[1].validateaddress(self.nodes[1].getnewaddress())['pubkey']
|
|
multisig = self.nodes[1].createmultisig(1, [pubkey])
|
|
self.nodes[0].importaddress(multisig["redeemScript"], "watchonly", False, True)
|
|
txid = self.nodes[1].sendtoaddress(multisig["address"], 0.1)
|
|
self.nodes[1].generate(1)
|
|
self.sync_all()
|
|
assert(len(self.nodes[0].listtransactions("watchonly", 100, 0, False)) == 0)
|
|
assert_array_result(self.nodes[0].listtransactions("watchonly", 100, 0, True),
|
|
{"category":"receive","amount":Decimal("0.1")},
|
|
{"txid":txid, "account" : "watchonly"} )
|
|
|
|
if __name__ == '__main__':
|
|
ListTransactionsTest().main()
|
|
|