Merge global xpubs in joinpsbts and combinepsbts

bitcoin · Nov 20, 2019 · 951f5ee · 951f5ee
1 parent f0c14dc
commit 951f5ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -30,6 +30,13 @@ bool PartiallySignedTransaction::Merge(const PartiallySignedTransaction& psbt)
     for (unsigned int i = 0; i < outputs.size(); ++i) {
         outputs[i].Merge(psbt.outputs[i]);
     }
+    for (auto xpub_pair : psbt.xpubs) {
+        if (xpubs.count(xpub_pair.first) == 0) {
+            xpubs[xpub_pair.first] = xpub_pair.second;
+        } else {
+            xpubs[xpub_pair.first].insert(xpub_pair.second.begin(), xpub_pair.second.end());
+        }
+    }
     unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
 
     return true;

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1638,6 +1638,13 @@ UniValue joinpsbts(const JSONRPCRequest& request)
         for (unsigned int i = 0; i < psbt.tx->vout.size(); ++i) {
             merged_psbt.AddOutput(psbt.tx->vout[i], psbt.outputs[i]);
         }
+        for (auto xpub_pair : psbt.xpubs) {
+            if (merged_psbt.xpubs.count(xpub_pair.first) == 0) {
+                merged_psbt.xpubs[xpub_pair.first] = xpub_pair.second;
+            } else {
+                merged_psbt.xpubs[xpub_pair.first].insert(xpub_pair.second.begin(), xpub_pair.second.end());
+            }
+        }
         merged_psbt.unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
     }