From 6be0fb4b3f865e80e0465c2266b0560bd6bbb406 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Fri, 2 Nov 2018 18:00:35 -0700 Subject: [refactor] Add a base DescriptorImpl with most common logic --- src/script/sign.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/script/sign.cpp') diff --git a/src/script/sign.cpp b/src/script/sign.cpp index e5651710f..635e4fa3d 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; } -- cgit v1.2.3