diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-01-24 09:00:37 -1000 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-01-24 09:00:51 -1000 |
| commit | eadb2dacc3c61fe1b4fd7a87a1331202ad3fe12c (patch) | |
| tree | 6d9ec6ea6689755d874691c0bd425ac08478fb39 /src/wallet/coincontrol.h | |
| parent | cc5870a4057f0322509dde5877fb08258bf4ec50 (diff) | |
| parent | f523c6bec005b2c999651787d029dee0fe719eb1 (diff) | |
| download | bitcoin-eadb2dacc3c61fe1b4fd7a87a1331202ad3fe12c.tar.xz | |
Merge #12213: Add address type option to addmultisigaddress
f523c6bec [qa] Use address type in addmultisigaddress to avoid addwitnessaddress (João Barbosa)
886a92f25 [rpc] Add address type option to addmultisigaddress (João Barbosa)
Pull request description:
Adds the option `address_type` to `addmultisigaddress` and `createmultisg` RPC. This also allows to avoid `addwitnessaddress` to obtain an `p2sh-segwit` or `bech32` multsig address.
Related to #12210 as this reduces `addwitnessaddress` usage.
Tree-SHA512: 8f8f85dfcff66bb6c7e1e9865e37c285dead1d6dadb9672a89b92fa209d03cc35817ca1d656588c6c2146b728daaf7540b851929b640294653c62836cbefe7ee
Diffstat (limited to 'src/wallet/coincontrol.h')
0 files changed, 0 insertions, 0 deletions