diff options
author | Andrew Chow <achow101-github@achow101.com> | 2020-03-03 17:16:40 -0500 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2020-03-07 10:13:47 -0500 |
commit | 66c2cadc91d26074b89e5ada68350b5c8676efac (patch) | |
tree | 2dd25a3e423ee68a50ee40474ad9f3867f9d8b20 /src | |
parent | df55d44d0de2174ba74ed3a28bef5e83b0a51b47 (diff) | |
download | bitcoin-66c2cadc91d26074b89e5ada68350b5c8676efac.tar.xz |
Rename BIP32PubkeyProvider.m_extkey to m_root_extkey
Renaming clarifies that m_extkey is actually the root
extkey that keys are derived from.
Diffstat (limited to 'src')
-rw-r--r-- | src/script/descriptor.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index b528aa2ce8..95291ef317 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -254,18 +254,19 @@ enum class DeriveType { /** An object representing a parsed extended public key in a descriptor. */ class BIP32PubkeyProvider final : public PubkeyProvider { - CExtPubKey m_extkey; + // Root xpub, path, and final derivation step type being used, if any + CExtPubKey m_root_extkey; KeyPath m_path; DeriveType m_derive; bool GetExtKey(const SigningProvider& arg, CExtKey& ret) const { CKey key; - if (!arg.GetKey(m_extkey.pubkey.GetID(), key)) return false; - ret.nDepth = m_extkey.nDepth; - std::copy(m_extkey.vchFingerprint, m_extkey.vchFingerprint + sizeof(ret.vchFingerprint), ret.vchFingerprint); - ret.nChild = m_extkey.nChild; - ret.chaincode = m_extkey.chaincode; + if (!arg.GetKey(m_root_extkey.pubkey.GetID(), key)) return false; + ret.nDepth = m_root_extkey.nDepth; + std::copy(m_root_extkey.vchFingerprint, m_root_extkey.vchFingerprint + sizeof(ret.vchFingerprint), ret.vchFingerprint); + ret.nChild = m_root_extkey.nChild; + ret.chaincode = m_root_extkey.chaincode; ret.key = key; return true; } @@ -280,7 +281,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider } public: - BIP32PubkeyProvider(uint32_t exp_index, const CExtPubKey& extkey, KeyPath path, DeriveType derive) : PubkeyProvider(exp_index), m_extkey(extkey), m_path(std::move(path)), m_derive(derive) {} + BIP32PubkeyProvider(uint32_t exp_index, const CExtPubKey& extkey, KeyPath path, DeriveType derive) : PubkeyProvider(exp_index), m_root_extkey(extkey), m_path(std::move(path)), m_derive(derive) {} bool IsRange() const override { return m_derive != DeriveType::NO; } size_t GetSize() const override { return 33; } bool GetPubKey(int pos, const SigningProvider& arg, CPubKey* key, KeyOriginInfo& info) const override @@ -292,7 +293,7 @@ public: *key = priv_key.GetPubKey(); } else { // TODO: optimize by caching - CExtPubKey extkey = m_extkey; + CExtPubKey extkey = m_root_extkey; for (auto entry : m_path) { extkey.Derive(extkey, entry); } @@ -301,7 +302,7 @@ public: *key = extkey.pubkey; } } - CKeyID keyid = m_extkey.pubkey.GetID(); + CKeyID keyid = m_root_extkey.pubkey.GetID(); std::copy(keyid.begin(), keyid.begin() + sizeof(info.fingerprint), info.fingerprint); info.path = m_path; if (m_derive == DeriveType::UNHARDENED) info.path.push_back((uint32_t)pos); @@ -310,7 +311,7 @@ public: } std::string ToString() const override { - std::string ret = EncodeExtPubKey(m_extkey) + FormatHDKeypath(m_path); + std::string ret = EncodeExtPubKey(m_root_extkey) + FormatHDKeypath(m_path); if (IsRange()) { ret += "/*"; if (m_derive == DeriveType::HARDENED) ret += '\''; |