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

Merge dcf2ccbfde into merged_master (Bitcoin PR #18115)

Browse source 
I really like this PR, but it wound up being pretty nontrivial to merge.
The crux is that it pulls PSBT signing logic into scriptpubkey manager,
which is where it belongs, but for us this means reasoning about pegins
inside script/sign.cpp.

However, sign.cpp is part of libbitcoin_common, which does not include
anything for reasoning about PoW or RPC (lol) or anything heavy about
that. This means that some pegin validation had to remain split between
the wallet/rpc layer and sign.cpp. I added a new file script/pegins.cpp
which has the (one) method we actually need in sign.cpp.

Aside from that, this diff is very large but is mostly just moving our
code changes to wallet/psbtwallet.* into wallet/wallet.* where those
functions now live. As far as review, it's probably not worthwhile to
spend too much too much time on this since it's going to be change
again in #16528 and others. The test coverage is pretty extensive.
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:51 +00:00
commit 5b9f316537
27 changed files with 716 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/script/sign.cpp
View file

@ -6,8 +6,10 @@
#include <script/sign.h>
#include <key.h>
#include <pegins.h>
#include <policy/policy.h>
#include <primitives/transaction.h>
#include <script/pegins.h> // for GetPeginOutputFromWitness()
#include <script/signingprovider.h>
#include <script/standard.h>
#include <uint256.h>
@ -474,3 +476,60 @@ bool IsSegWitOutput(const SigningProvider& provider, const CScript& script)
}
return false;
}
bool SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore, const std::map<COutPoint, Coin>& coins, int nHashType, std::map<int, std::string>& input_errors)
{
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
// Use CTransaction for the constant parts of the
// transaction to avoid rehashing.
const CTransaction txConst(mtx);
// Sign what we can, including pegin inputs:
mtx.witness.vtxinwit.resize(mtx.vin.size());
for (unsigned int i = 0; i < mtx.vin.size(); i++) {
CTxIn& txin = mtx.vin[i];
const CTxInWitness& inWitness = mtx.witness.vtxinwit[i];
CTxOut prevTxOut;
if (txin.m_is_pegin) {
prevTxOut = GetPeginOutputFromWitness(mtx.witness.vtxinwit[i].m_pegin_witness);
} else {
auto coin = coins.find(txin.prevout);
prevTxOut = coin->second.out;
}
const CScript& prevPubKey = prevTxOut.scriptPubKey;
const CConfidentialValue& amount = prevTxOut.nValue;
SignatureData sigdata = DataFromTransaction(mtx, i, prevTxOut);
// Only sign SIGHASH_SINGLE if there's a corresponding output:
if (!fHashSingle || (i < mtx.vout.size())) {
ProduceSignature(*keystore, MutableTransactionSignatureCreator(&mtx, i, amount, nHashType), prevPubKey, sigdata);
}
UpdateTransaction(mtx, i, sigdata); // ELEMENTS: is UpdateInput in Core
// amount must be specified for valid segwit signature
if (amount.IsExplicit() && amount.GetAmount() == MAX_MONEY && !mtx.witness.vtxinwit[i].scriptWitness.IsNull()) {
input_errors[i] = "Missing amount";
continue;
}
ScriptError serror = SCRIPT_ERR_OK;
if (!VerifyScript(txin.scriptSig, prevPubKey, &inWitness.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
if (serror == SCRIPT_ERR_INVALID_STACK_OPERATION) {
// Unable to sign input and verification failed (possible attempt to partially sign).
input_errors[i] = "Unable to sign input, invalid stack size (possibly missing key)";
} else if (serror == SCRIPT_ERR_SIG_NULLFAIL) {
// Verification failed (possibly due to insufficient signatures).
input_errors[i] = "CHECK(MULTI)SIG failing with non-zero signature (possibly need more signatures)";
} else {
input_errors[i] = ScriptErrorString(serror);
}
} else {
// If this input succeeds, make sure there is no error set for it
input_errors.erase(i);
}
}
return input_errors.empty();
}