Merge 735d6b57e7 into merged_master (Bitcoin PR #16227)

This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:21 +00:00
commit a50b652932
38 changed files with 607 additions and 607 deletions

View file

@ -147,7 +147,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)
}
// Construct using pay-to-script-hash:
CBasicKeyStore keystore;
FillableSigningProvider keystore;
CScript inner;
const CTxDestination dest = AddAndGetMultisigDestination(required, pubkeys, output_type, keystore, inner);