GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merging of global unknown data in PSBTs

Browse source 
Actually merge the global unknown key-value pairs.

Add a test for merging unknown key-value pairs.
This commit is contained in:
Andrew Chow 2018-07-19 18:49:51 -07:00
parent 41df035ee1
commit fad231ad41
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/script/sign.cpp
View file

@ -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