Merge global xpubs in joinpsbts and combinepsbts

achow101 · achow101 · commit 81521173ba83 · 2021-12-10T08:29:47.000-05:00
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -32,6 +32,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.m_xpubs) {
+        if (m_xpubs.count(xpub_pair.first) == 0) {
+            m_xpubs[xpub_pair.first] = xpub_pair.second;
+        } else {
+            m_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
@@ -1858,6 +1858,13 @@ static RPCHelpMan joinpsbts()
         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.m_xpubs) {
+            if (merged_psbt.m_xpubs.count(xpub_pair.first) == 0) {
+                merged_psbt.m_xpubs[xpub_pair.first] = xpub_pair.second;
+            } else {
+                merged_psbt.m_xpubs[xpub_pair.first].insert(xpub_pair.second.begin(), xpub_pair.second.end());
+            }
+        }
         merged_psbt.unknown.insert(psbt.unknown.begin(), psbt.unknown.end());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1858,6 +1858,13 @@ static RPCHelpMan joinpsbts()`
`1858`	`1858`	`for (unsigned int i = 0; i < psbt.tx->vout.size(); ++i) {`
`1859`	`1859`	`merged_psbt.AddOutput(psbt.tx->vout[i], psbt.outputs[i]);`
`1860`	`1860`	`}`
	`1861`	`+ for (auto& xpub_pair : psbt.m_xpubs) {`
	`1862`	`+ if (merged_psbt.m_xpubs.count(xpub_pair.first) == 0) {`
	`1863`	`+ merged_psbt.m_xpubs[xpub_pair.first] = xpub_pair.second;`
	`1864`	`+ } else {`
	`1865`	`+ merged_psbt.m_xpubs[xpub_pair.first].insert(xpub_pair.second.begin(), xpub_pair.second.end());`
	`1866`	`+ }`
	`1867`	`+ }`
`1861`	`1868`	`merged_psbt.unknown.insert(psbt.unknown.begin(), psbt.unknown.end());`
`1862`	`1869`	`}`
`1863`	`1870`