Skip to content

Don't write invalid policy change position when change dropped #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
instagibbs wants to merge 1 commit into from
Closed

Don't write invalid policy change position when change dropped #787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3029,6 +3029,7 @@ bool fillBlindDetails(BlindDetails* det, CWallet* wallet, CMutableTransaction& t
if (det->ignore_blind_failure) {
det->num_to_blind--;
det->change_to_blind--;
assert(det->only_change_pos != -1);
txNew.vout[det->only_change_pos].nNonce.SetNull();
det->o_pubkeys[det->only_change_pos] = CPubKey();
det->o_amount_blinds[det->only_change_pos] = uint256();
Expand Down Expand Up @@ -3359,24 +3360,26 @@ bool CWallet::CreateTransaction(interfaces::Chain::Lock& locked_chain, const std
}

vChangePosInOut[assetChange.first] = newPos;

// Now that change placement is assured, put in place
// blinding details
if (blind_details) {
CPubKey blind_pub = GetBlindingPubKey(itScript->second.second);
blind_details->o_pubkeys.insert(blind_details->o_pubkeys.begin() + vChangePosInOut[assetChange.first], blind_pub);
assert(blind_pub.IsFullyValid());
blind_details->num_to_blind++;
blind_details->change_to_blind++;
blind_details->only_change_pos = vChangePosInOut[assetChange.first];
// Place the blinding pubkey here in case of fundraw calls
newTxOut.nNonce.vchCommitment = std::vector<unsigned char>(blind_pub.begin(), blind_pub.end());
}
}
else if ((unsigned int)itPos->second > txNew.vout.size())
{
strFailReason = _("Change index out of range");
return false;
}

std::vector<CTxOut>::iterator position = txNew.vout.begin()+vChangePosInOut[assetChange.first];
if (blind_details) {
CPubKey blind_pub = GetBlindingPubKey(itScript->second.second);
blind_details->o_pubkeys.insert(blind_details->o_pubkeys.begin() + vChangePosInOut[assetChange.first], blind_pub);
assert(blind_pub.IsFullyValid());
blind_details->num_to_blind++;
blind_details->change_to_blind++;
blind_details->only_change_pos = vChangePosInOut[assetChange.first];
// Place the blinding pubkey here in case of fundraw calls
newTxOut.nNonce.vchCommitment = std::vector<unsigned char>(blind_pub.begin(), blind_pub.end());
}
txNew.vout.insert(position, newTxOut);
}
}
Expand Down