diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-30 16:48:45 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-01-03 05:43:06 -0800 |
| commit | 3eaa003c888f80207e8ff132f78417ff373ddfa3 (patch) | |
| tree | f8437dcea4d6de4eafa82891e96309324ea2f124 /src/script | |
| parent | 30a27dc5b18a3ab82a9768710b24d4e7e9661658 (diff) | |
| download | bitcoin-3eaa003c888f80207e8ff132f78417ff373ddfa3.tar.xz | |
Extend validateaddress information for P2SH-embedded witness
This adds new fields 'pubkeys' and 'embedded' to the RPC's output, and improves the
documentation for previously added 'witness_version' and 'witness_program' fields.
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/standard.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/standard.h b/src/script/standard.h index b1c314fa72..f46d692259 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -155,6 +155,10 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) * addressRet is populated with a single value and nRequiredRet is set to 1. * Returns true if successful. Currently does not extract address from * pay-to-witness scripts. + * + * Note: this function confuses destinations (a subset of CScripts that are + * encodable as an address) with key identifiers (of keys involved in a + * CScript), and its use should be phased out. */ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet); |