diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2018-07-19 18:49:51 -0700 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2018-07-19 18:49:51 -0700 |
| commit | fad231ad41e12b7047deb64220942ca8cb8357bc (patch) | |
| tree | 3eb501f1bd6072264b017d82949e88c919663868 /src/script | |
| parent | 41df035ee1694715ee1e0f89b08ac8c73987807b (diff) | |
| download | bitcoin-fad231ad41e12b7047deb64220942ca8cb8357bc.tar.xz | |
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.
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/sign.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 |