diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2018-11-02 18:00:35 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-11-28 15:16:17 -0800 |
| commit | 6be0fb4b3f865e80e0465c2266b0560bd6bbb406 (patch) | |
| tree | 7ca0ca903e762665355c6a90b240db6cc866efb3 /src/script/sign.cpp | |
| parent | 60b20c869f8df9a81b5080ebcbe8c9cf4e6b9d77 (diff) | |
| download | bitcoin-6be0fb4b3f865e80e0465c2266b0560bd6bbb406.tar.xz | |
[refactor] Add a base DescriptorImpl with most common logic
Diffstat (limited to 'src/script/sign.cpp')
| -rw-r--r-- | src/script/sign.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index e5651710f1..635e4fa3d2 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -705,5 +705,7 @@ FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvide ret.pubkeys.insert(b.pubkeys.begin(), b.pubkeys.end()); ret.keys = a.keys; ret.keys.insert(b.keys.begin(), b.keys.end()); + ret.origins = a.origins; + ret.origins.insert(b.origins.begin(), b.origins.end()); return ret; } |