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

Add GetVersion helper to PSBT

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

8
src/psbt.cpp
View file

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

3
src/psbt.h
View file

@ -402,6 +402,7 @@ struct PartiallySignedTransaction
Optional<uint32_t> m_version;
bool IsNull() const;
uint32_t GetVersion() const;
/** 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. */
@ -433,7 +434,7 @@ struct PartiallySignedTransaction
SerializeToVector(os, *tx);
// PSBT version
if (m_version != nullopt && *m_version > 0) {
if (GetVersion() > 0) {
SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_VERSION));
SerializeToVector(s, *m_version);
}