From deb791c7ba057a3765d09b12bf3e55547a5298e4 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 26 Feb 2020 16:52:03 -0500 Subject: Only cache xpubs that have a hardened last step Also adds tests for this: For ranged descriptors with unhardened derivation, we expect to find parent keys in the cache but no child keys. For descriptors containing an xpub but do not have unhardened derivation (i.e. hardened derivation or single xpub with or without derivation), we expect to find all of the keys in the cache, and the same number of keys in the cache as in the SigningProvider. For everything else (no xpub), nothing should be cached at all. --- src/script/descriptor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/script') diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 30384fbd06..588e583339 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -345,10 +345,11 @@ public: key_out = final_extkey.pubkey; if (write_cache) { - write_cache->CacheDerivedExtPubKey(m_expr_index, pos, final_extkey); // Only cache parent if there is any unhardened derivation if (m_derive != DeriveType::HARDENED) { write_cache->CacheParentExtPubKey(m_expr_index, parent_extkey); + } else if (final_info_out.path.size() > 0) { + write_cache->CacheDerivedExtPubKey(m_expr_index, pos, final_extkey); } } -- cgit v1.2.3