Merge c27330897d into merged_master (Bitcoin PR #18027)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:11 +00:00
commit 4839db857d
24 changed files with 592 additions and 93 deletions

View file

@ -350,9 +350,10 @@ public:
bool sign,
bool bip32derivs,
PartiallySignedTransaction& psbtx,
bool& complete) override
bool& complete,
size_t* n_signed) override
{
return m_wallet->FillPSBT(psbtx, complete, sighash_type, sign, bip32derivs);
return m_wallet->FillPSBT(psbtx, complete, sighash_type, sign, bip32derivs, n_signed);
}
WalletBalances getBalances() override
{