diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-12-10 12:11:28 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-10 12:12:10 -0500 |
commit | fae94785d99ef0f24c9c97a58fce6af0d4a0d452 (patch) | |
tree | 6c3eb31b910f42f8074e32defc3f2a143cefb913 /src/node/psbt.cpp | |
parent | 1189b6acab115a7fe7bd67f8b4c6e3f55e53274e (diff) | |
parent | 773d4572a4864ab7b6380858d07d9579ff6dd9a2 (diff) | |
download | bitcoin-fae94785d99ef0f24c9c97a58fce6af0d4a0d452.tar.xz |
Merge #17524: psbt: handle unspendable psbts
773d4572a4864ab7b6380858d07d9579ff6dd9a2 Mark PSBTs spending unspendable outputs as invalid in analysis (Andrew Chow)
638e40cb6080800c7b0a7f4028f63326acbe4700 Have a PSBTAnalysis state that indicates invalid PSBT (Andrew Chow)
Pull request description:
When analyzing an unspendable PSBT, report that it is unspendable and exit analysis early.
ACKs for top commit:
Sjors:
ACK 773d457
instagibbs:
After some thought ACK https://github.com/bitcoin/bitcoin/commit/773d4572a4864ab7b6380858d07d9579ff6dd9a2
Tree-SHA512: 99b0cb2fa1ea37593fc65a20effe881639d69ddeeecf5197bc87bc7f2220cbeb40f1d429d517e4d27f2e9fb563a00cd845d2b4b1ce05246a75a6cb56fb9b0ba5
Diffstat (limited to 'src/node/psbt.cpp')
-rw-r--r-- | src/node/psbt.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/node/psbt.cpp b/src/node/psbt.cpp index 12559c5a5f..9a30c3f083 100644 --- a/src/node/psbt.cpp +++ b/src/node/psbt.cpp @@ -7,6 +7,7 @@ #include <node/psbt.h> #include <policy/policy.h> #include <policy/settings.h> +#include <tinyformat.h> #include <numeric> @@ -39,6 +40,11 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx) calc_fee = false; } + if (!utxo.IsNull() && utxo.scriptPubKey.IsUnspendable()) { + result.SetInvalid(strprintf("PSBT is not valid. Input %u spends unspendable output", i)); + return result; + } + // Check if it is final if (!utxo.IsNull() && !PSBTInputSigned(input)) { input_analysis.is_final = false; |