diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-09-10 11:24:41 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2020-08-14 08:47:19 +1200 |
| commit | fec8336ad97dc717ea123f84ecfc10d9ee4a11db (patch) | |
| tree | 761a9a8e0f4c0e55ea37cb997fc920a780552f44 /src | |
| parent | b887060d06290abf4983a487f8da6b0986b058ab (diff) | |
| download | bitcoin-fec8336ad97dc717ea123f84ecfc10d9ee4a11db.tar.xz | |
Remove GetScriptForWitness function
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/standard.cpp | 12 | ||||
| -rw-r--r-- | src/script/standard.h | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 3a4882f280..96a3d311a6 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -313,18 +313,6 @@ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys) return script; } -CScript GetScriptForWitness(const CScript& redeemscript) -{ - std::vector<std::vector<unsigned char> > vSolutions; - TxoutType typ = Solver(redeemscript, vSolutions); - if (typ == TxoutType::PUBKEY) { - return GetScriptForDestination(WitnessV0KeyHash(Hash160(vSolutions[0]))); - } else if (typ == TxoutType::PUBKEYHASH) { - return GetScriptForDestination(WitnessV0KeyHash(uint160{vSolutions[0]})); - } - return GetScriptForDestination(WitnessV0ScriptHash(redeemscript)); -} - bool IsValidDestination(const CTxDestination& dest) { return dest.which() != 0; } diff --git a/src/script/standard.h b/src/script/standard.h index 992e37675f..6dbcd04968 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -263,14 +263,4 @@ CScript GetScriptForRawPubKey(const CPubKey& pubkey); /** Generate a multisig script. */ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys); -/** - * Generate a pay-to-witness script for the given redeem script. If the redeem - * script is P2PK or P2PKH, this returns a P2WPKH script, otherwise it returns a - * P2WSH script. - * - * TODO: replace calls to GetScriptForWitness with GetScriptForDestination using - * the various witness-specific CTxDestination subtypes. - */ -CScript GetScriptForWitness(const CScript& redeemscript); - #endif // BITCOIN_SCRIPT_STANDARD_H |