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

Merge 6eed792d43 into merged_master (Elements PR ElementsProject/elements#1050)

Browse source 
Conflicts were mostly obvious, except for those in CreateTransactionInternal.
(This function was moved from wallet.cpp to spend.cpp, and substantially
rewritten, between 0.21 and 22.0.) For those I manually applied the changes
from the diff, which wound up taking a slightly different form.

Also had to update the new test because the `addresses` field of the RPC
output was removed.
This commit is contained in:
Andrew Poelstra 2021-10-02 15:28:13 +00:00
commit b64ca7f411
7 changed files with 175 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/wallet/rpcwallet.cpp
View file

@ -5025,8 +5025,16 @@ static RPCHelpMan walletcreatefundedpsbt()
// Automatically select coins, unless at least one is manually selected. Can
// be overridden by options.add_inputs.
coin_control.m_add_inputs = rawTx.vin.size() == 0;
// FundTransaction expects blinding keys, if present, to appear in the output nonces
for (CTxOut& txout : rawTx.vout) {
auto search_it = psbt_outs.find(txout);
assert (search_it != psbt_outs.end());
CPubKey& blind_pub = search_it->second.m_blinding_pubkey;
if (blind_pub.IsFullyValid()) {
txout.nNonce.vchCommitment = std::vector<unsigned char>(blind_pub.begin(), blind_pub.end());
}
}
FundTransaction(wallet, rawTx, fee, change_position, request.params[3], coin_control, /* solving_data */ request.params[5], /* override_min_fee */ true);
PartiallySignedTransaction psbtx(rawTx, psbt_version);
// Find an input that is ours
unsigned int blinder_index = 0;
{
@ -5039,6 +5047,17 @@ static RPCHelpMan walletcreatefundedpsbt()
}
}
assert(blinder_index < rawTx.vin.size()); // We added inputs, or existing inputs are ours, we should have a blinder index at this point.
// It may add outputs (change, and in some edge case OP_RETURN) which need to be
// blinded. So pull these into `psbt_outs`.
for (const CTxOut& txout : rawTx.vout) {
if (!txout.nNonce.IsNull() && !psbt_outs.count(txout)) {
PSBTOutput new_out{2}; // psbtv2 output
new_out.m_blinding_pubkey.Set(txout.nNonce.vchCommitment.begin(), txout.nNonce.vchCommitment.end());
new_out.m_blinder_index = blinder_index;
psbt_outs.insert(std::make_pair(txout, new_out));
}
}
PartiallySignedTransaction psbtx(rawTx, psbt_version);
for (unsigned int i = 0; i < rawTx.vout.size(); ++i) {
PSBTOutput& output = psbtx.outputs[i];
auto it = psbt_outs.find(rawTx.vout.at(i));