mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-23 15:20:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Store p2sh scripts in AddAndGetDestinationForScript"

Browse source 
This reverts commit 4a7e43e846.
This commit is contained in:
Russell Yanofsky 2020-02-04 17:27:41 -05:00
parent eb7d8a5b07
commit a304a3632f
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/outputtype.cpp
View file

@ -82,30 +82,22 @@ CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore,
{ {
// Add script to keystore // Add script to keystore
keystore.AddCScript(script); keystore.AddCScript(script);
ScriptHash sh(script);
// Note that scripts over 520 bytes are not yet supported. // Note that scripts over 520 bytes are not yet supported.
switch (type) { switch (type) {
case OutputType::LEGACY: case OutputType::LEGACY:
keystore.AddCScript(GetScriptForDestination(sh)); return ScriptHash(script);
return sh;
case OutputType::P2SH_SEGWIT: case OutputType::P2SH_SEGWIT:
case OutputType::BECH32: { case OutputType::BECH32: {
CTxDestination witdest = WitnessV0ScriptHash(script); CTxDestination witdest = WitnessV0ScriptHash(script);
CScript witprog = GetScriptForDestination(witdest); CScript witprog = GetScriptForDestination(witdest);
// Check if the resulting program is solvable (i.e. doesn't use an uncompressed key) // Check if the resulting program is solvable (i.e. doesn't use an uncompressed key)
if (!IsSolvable(keystore, witprog)) { if (!IsSolvable(keystore, witprog)) return ScriptHash(script);
// Since the wsh is invalid, add and return the sh instead.
keystore.AddCScript(GetScriptForDestination(sh));
return sh;
}
// Add the redeemscript, so that P2WSH and P2SH-P2WSH outputs are recognized as ours. // Add the redeemscript, so that P2WSH and P2SH-P2WSH outputs are recognized as ours.
keystore.AddCScript(witprog); keystore.AddCScript(witprog);
if (type == OutputType::BECH32) { if (type == OutputType::BECH32) {
return witdest; return witdest;
} else { } else {
ScriptHash sh_w = ScriptHash(witprog); return ScriptHash(witprog);
keystore.AddCScript(GetScriptForDestination(sh_w));
return sh_w;
} }
} }
default: assert(false); default: assert(false);