diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-24 13:34:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-24 14:03:40 +0100 |
| commit | 69ec021969a4cc0abd6e8ed7c3aa1db315164169 (patch) | |
| tree | efa2758e3d23d94a8c348d61cf2f76cda80be9f8 /test/functional/nulldummy.py | |
| parent | 6e89de5ba7ce706a9b6897eaf061e19319bc887f (diff) | |
| parent | 1df206f854d222230dcffd58e1b496567e570978 (diff) | |
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
Diffstat (limited to 'test/functional/nulldummy.py')
| -rwxr-xr-x | test/functional/nulldummy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/nulldummy.py b/test/functional/nulldummy.py index cbdcfdcf5f..fac620bc8d 100755 --- a/test/functional/nulldummy.py +++ b/test/functional/nulldummy.py @@ -46,7 +46,7 @@ class NULLDUMMYTest(BitcoinTestFramework): def run_test(self): self.address = self.nodes[0].getnewaddress() - self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address]) + 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) |