mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Add GetVersion helper to PSBT

Browse source
This commit is contained in:
Andrew Chow 2021-01-04 17:21:29 -05:00
parent c3eb416b88
commit df84fa99c5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/psbt.cpp
View file

@ -401,3 +401,11 @@ bool DecodeRawPSBT(PartiallySignedTransaction& psbt, const std::string& tx_data,
} }
return true; return true;
} }
uint32_t PartiallySignedTransaction::GetVersion() const
{
if (m_version != std::nullopt) {
return *m_version;
}
return 0;
}

3
src/psbt.h
View file

@ -405,6 +405,7 @@ struct PartiallySignedTransaction
std::optional<uint32_t> m_version; std::optional<uint32_t> m_version;
bool IsNull() const; bool IsNull() const;
uint32_t GetVersion() const;
/** Merge psbt into this. The two psbts must have the same underlying CTransaction (i.e. the /** 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. */ * same actual Bitcoin transaction.) Returns true if the merge succeeded, false otherwise. */
@ -436,7 +437,7 @@ struct PartiallySignedTransaction
SerializeToVector(os, *tx); SerializeToVector(os, *tx);
// PSBT version // PSBT version
if (m_version != std::nullopt && *m_version > 0) { if (GetVersion() > 0) {
SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_VERSION)); SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_VERSION));
SerializeToVector(s, *m_version); SerializeToVector(s, *m_version);
} }