GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow FillOutputs to continue on failure to deblind output

Browse source
This commit is contained in:
Gregory Sanders 2017-03-10 14:21:59 -05:00
parent f9dfc025cb
commit a3899da08d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rpc/rawtransaction.cpp
View file

@ -581,7 +581,6 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
}
// Rewind the outputs to unblinded, and push placeholders for blinding info
// Failure if any are unable to be unblinded
void FillOutputBlinds(CMutableTransaction& tx, bool fUseWallet, std::vector<uint256>& output_value_blinds, std::vector<uint256>& output_asset_blinds, std::vector<CPubKey>& output_pubkeys) {
for (size_t nOut = 0; nOut < tx.vout.size(); nOut++) {
if (!tx.vout[nOut].nValue.IsExplicit()) {
@ -603,12 +602,13 @@ void FillOutputBlinds(CMutableTransaction& tx, bool fUseWallet, std::vector<uint
output_pubkeys.push_back(pubkey);
output_value_blinds.push_back(uint256());
output_asset_blinds.push_back(uint256());
} else if (fUseWallet)
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter: transaction outputs must be unblinded or to wallet"));
continue;
}
#endif
if (!fUseWallet)
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter: transaction outputs must be unblinded"));
// If no wallet, or unable to unblind, leave it alone in next blinding step
output_pubkeys.push_back(CPubKey());
output_value_blinds.push_back(uint256());
output_asset_blinds.push_back(uint256());
} else if (tx.vout[nOut].nNonce.vchCommitment.size() == 0) {
output_pubkeys.push_back(CPubKey());
output_value_blinds.push_back(uint256());