From fad231ad41e12b7047deb64220942ca8cb8357bc Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Thu, 19 Jul 2018 18:49:51 -0700
Subject: Fix merging of global unknown data in PSBTs

Actually merge the global unknown key-value pairs.

Add a test for merging unknown key-value pairs.
---
 src/script/sign.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/script/sign.cpp')

diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index f1ac1f411a..bef7bda26c 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -481,6 +481,7 @@ void PartiallySignedTransaction::Merge(const PartiallySignedTransaction& psbt)
     for (unsigned int i = 0; i < outputs.size(); ++i) {
         outputs[i].Merge(psbt.outputs[i]);
     }
+    unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
 }
 
 bool PartiallySignedTransaction::IsSane() const
-- 
cgit v1.2.3