aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-04-18 19:45:42 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2019-04-18 19:45:45 +0200
commit6ce77a3668b95cd26ad7a56fe9f1024ac84a79fc (patch)
tree8e3ad87bf306b595b87470905d3d45377a514233
parentf5aaeae0cdfc2be807b8010ecf4530b73ee3169b (diff)
parent2d8ba4f8678b0248a5c6b2bb7ce66b6f081c6c17 (diff)
downloadbitcoin-6ce77a3668b95cd26ad7a56fe9f1024ac84a79fc.tar.xz
Merge #15833: [doc] remove out-of-date comment on pay-to-witness support
2d8ba4f8678b0248a5c6b2bb7ce66b6f081c6c17 remove out-of-date comment on pay-to-witness support (r8921039) Pull request description: The comment below on function 'ExtractDestinations' was added 2017-08-15 while the support was added later on 2017-08-25 through function 'ExtractDestination'. ``` Currently does not extract address from pay-to-witness scripts ``` ACKs for commit 2d8ba4: Tree-SHA512: ce8eb9660c56a8998cc94c8cbc5d47f875045b4aa558f2325cb125ec77794a100f7b73ead12a48a7630aa80483237bb67eb8ee6b0f9a527275ed546718b7a0e1
-rw-r--r--src/script/standard.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script/standard.h b/src/script/standard.h
index fc20fb6a08..f16068c413 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -153,8 +153,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
* multisig scripts, this populates the addressRet vector with the pubkey IDs
* and nRequiredRet with the n required to spend. For other destinations,
* 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.
+ * Returns true if successful.
*
* Note: this function confuses destinations (a subset of CScripts that are
* encodable as an address) with key identifiers (of keys involved in a