diff options
author | Andrew Chow <achow101-github@achow101.com> | 2020-06-04 23:43:39 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2020-06-24 16:31:42 -0400 |
commit | 5279d8bc07d601fe6a67ad665fbc7591fe73c7de (patch) | |
tree | 0980c73654effe41bd15ecf24a787df16ddff939 /src/psbt.h | |
parent | 72f6bec1da198764d4648a10a61c485e7ab65e9e (diff) |
psbt: Allow both non_witness_utxo and witness_utxo
Diffstat (limited to 'src/psbt.h')
-rw-r--r-- | src/psbt.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/psbt.h b/src/psbt.h index 0a8ea2ea0b..401889e2fe 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -62,7 +62,6 @@ struct PSBTInput void FillSignatureData(SignatureData& sigdata) const; void FromSignatureData(const SignatureData& sigdata); void Merge(const PSBTInput& input); - bool IsSane() const; PSBTInput() {} template <typename Stream> @@ -284,7 +283,6 @@ struct PSBTOutput void FillSignatureData(SignatureData& sigdata) const; void FromSignatureData(const SignatureData& sigdata); void Merge(const PSBTOutput& output); - bool IsSane() const; PSBTOutput() {} template <typename Stream> @@ -401,7 +399,6 @@ struct PartiallySignedTransaction /** Merge psbt into this. The two psbts must have the same underlying CTransaction (i.e. the * same actual Bitcoin transaction.) Returns true if the merge succeeded, false otherwise. */ NODISCARD bool Merge(const PartiallySignedTransaction& psbt); - bool IsSane() const; bool AddInput(const CTxIn& txin, PSBTInput& psbtin); bool AddOutput(const CTxOut& txout, const PSBTOutput& psbtout); PartiallySignedTransaction() {} @@ -551,10 +548,6 @@ struct PartiallySignedTransaction if (outputs.size() != tx->vout.size()) { throw std::ios_base::failure("Outputs provided does not match the number of outputs in transaction."); } - // Sanity check - if (!IsSane()) { - throw std::ios_base::failure("PSBT is not sane."); - } } template <typename Stream> |