trivial: realign AddAndGetDestinationForScript() signature with upstream

This does little for us now but realignment opens up the ability to use
different output types in future versions by retaining the skeleton.

Author: kwvg

src/outputtype.cpp

@@ -51,10 +51,16 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
     return Vector(std::move(p2pkh));
 }
 
-CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script)
+CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType type)
 {
     // Add script to keystore
     keystore.AddCScript(script);
+    ScriptHash sh(script);
     // Note that scripts over 520 bytes are not yet supported.
-    return ScriptHash(script);
+    switch (type) {
+    case OutputType::LEGACY:
+        keystore.AddCScript(GetScriptForDestination(sh));
+        return sh;
+    default: assert(false);
+    }
 }

src/outputtype.h

@@ -37,6 +37,6 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
  * This function will automatically add the script (and any other
  * necessary scripts) to the keystore.
  */
-CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script);
+CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType);
 
 #endif // BITCOIN_OUTPUTTYPE_H

src/rpc/util.cpp

@@ -291,8 +291,7 @@ CTxDestination AddAndGetMultisigDestination(const int required, const std::vecto
         throw JSONRPCError(RPC_INVALID_PARAMETER, (strprintf("redeemScript exceeds size limit: %d > %d", script_out.size(), MAX_SCRIPT_ELEMENT_SIZE)));
     }
 
-    // Make the address (simpler implementation in compare to bitcoin)
-    return AddAndGetDestinationForScript(keystore, script_out);
+    return AddAndGetDestinationForScript(keystore, script_out, OutputType::LEGACY);
 }
 
 class DescribeAddressVisitor