highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-25 16:31:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #16609: descriptor: fix missed m_script_arg arg renaming in #14934

Browse Source 
396385657cf053ac6c947a5d0640c887f20ae5bb descriptor: fix missed m_script_arg arg renaming in #14934 (fanquake)

Pull request description:

  Fixes a missed renaming from #14934.

ACKs for top commit:
  Sjors:
    ACK 3963856

Tree-SHA512: da2972301b2b83556f1f3f3b72758bb69570422cdd57c65aa7657b4e3dcc597dde03e7f1cf8988e8c3b6737737b4c0bee4aefb329376e24e7dedc2cab73fcf88
This commit is contained in:
MarcoFalke 2019-08-14 08:01:26 -04:00
commit 034575e9c7
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/descriptor.cpp
View File

@ -492,9 +492,9 @@ public:
if (!p->GetPrivKey(pos, provider, key)) continue;
out.keys.emplace(key.GetPubKey().GetID(), key);
}
if (m_script_arg) {
if (m_subdescriptor_arg) {
FlatSigningProvider subprovider;
m_script_arg->ExpandPrivate(pos, provider, subprovider);
m_subdescriptor_arg->ExpandPrivate(pos, provider, subprovider);
out = Merge(out, subprovider);
}
}