Add GetVersion helper to PSBT

achow101 · achow101 · commit df84fa99c5a5 · 2021-12-10T08:29:26.000-05:00
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -401,3 +401,11 @@ bool DecodeRawPSBT(PartiallySignedTransaction& psbt, const std::string& tx_data,
     }
     return true;
 }
+
+uint32_t PartiallySignedTransaction::GetVersion() const
+{
+    if (m_version != std::nullopt) {
+        return *m_version;
+    }
+    return 0;
+}
diff --git a/src/psbt.h b/src/psbt.h
@@ -405,6 +405,7 @@ struct PartiallySignedTransaction
     std::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. */
@@ -436,7 +437,7 @@ struct PartiallySignedTransaction
         SerializeToVector(os, *tx);
 
         // PSBT version
-        if (m_version != std::nullopt && *m_version > 0) {
+        if (GetVersion() > 0) {
             SerializeToVector(s, CompactSizeWriter(PSBT_GLOBAL_VERSION));
             SerializeToVector(s, *m_version);
         }

Original file line number	Diff line number	Diff line change
`@@ -401,3 +401,11 @@ bool DecodeRawPSBT(PartiallySignedTransaction& psbt, const std::string& tx_data,`
`401`	`401`	`}`
`402`	`402`	`return true;`
`403`	`403`	`}`
	`404`	`+`
	`405`	`+uint32_t PartiallySignedTransaction::GetVersion() const`
	`406`	`+{`
	`407`	`+ if (m_version != std::nullopt) {`
	`408`	`+ return *m_version;`
	`409`	`+ }`
	`410`	`+ return 0;`
	`411`	`+}`