diff options
| author | Pieter Wuille <[email protected]> | 2019-04-04 12:45:32 -0700 |
|---|---|---|
| committer | MeshCollider <[email protected]> | 2019-04-16 19:34:22 +1200 |
| commit | 7fcbe7dc112b3d35a5066e6d181f286fb630f744 (patch) | |
| tree | c4c33b4ec32fac6995ce3cb1a4159e7614a14118 /src/script/sign.cpp | |
| parent | Merge #15775: [0.18] Doc Backports (diff) | |
| download | discoin-7fcbe7dc112b3d35a5066e6d181f286fb630f744.tar.xz discoin-7fcbe7dc112b3d35a5066e6d181f286fb630f744.zip | |
Keep full pubkeys in FlatSigningProvider::origins
Github-Pull: #15749
Rebased-From: 9a93c91c882265c908ea18496cd1bc271be914d4
Diffstat (limited to 'src/script/sign.cpp')
| -rw-r--r-- | src/script/sign.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 320956d0c..36dd68a3d 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -483,7 +483,13 @@ bool HidingSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& inf bool FlatSigningProvider::GetCScript(const CScriptID& scriptid, CScript& script) const { return LookupHelper(scripts, scriptid, script); } bool FlatSigningProvider::GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const { return LookupHelper(pubkeys, keyid, pubkey); } -bool FlatSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const { return LookupHelper(origins, keyid, info); } +bool FlatSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const +{ + std::pair<CPubKey, KeyOriginInfo> out; + bool ret = LookupHelper(origins, keyid, out); + if (ret) info = std::move(out.second); + return ret; +} bool FlatSigningProvider::GetKey(const CKeyID& keyid, CKey& key) const { return LookupHelper(keys, keyid, key); } FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b) |