Revert "Store p2sh scripts in AddAndGetDestinationForScript"

This reverts commit 4a7e43e.

Author: ryanofsky

src/outputtype.cpp

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