highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-17 21:32:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 28a4fcb03c0fb1cd5112eca1eb36dcb13e0b4ff2 into 5f4422d68dc3530c353af1f87499de1c864b60ad

Browse Source
This commit is contained in:
pythcoiner 2025-03-17 03:54:18 +01:00 committed by GitHub
commit 32d4861387
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/script/descriptor.cpp
View File

@ -1279,20 +1279,33 @@ class StringMaker {
const SigningProvider* m_arg; const SigningProvider* m_arg;
//! Keys contained in the Miniscript (a reference to DescriptorImpl::m_pubkey_args). //! Keys contained in the Miniscript (a reference to DescriptorImpl::m_pubkey_args).
const std::vector<std::unique_ptr<PubkeyProvider>>& m_pubkeys; const std::vector<std::unique_ptr<PubkeyProvider>>& m_pubkeys;
//! Whether to serialize keys as private or public. //! StringType to serialize keys
bool m_private; const DescriptorImpl::StringType m_type;
const DescriptorCache* m_cache;
public: public:
StringMaker(const SigningProvider* arg LIFETIMEBOUND, const std::vector<std::unique_ptr<PubkeyProvider>>& pubkeys LIFETIMEBOUND, bool priv) StringMaker(const SigningProvider* arg LIFETIMEBOUND,
: m_arg(arg), m_pubkeys(pubkeys), m_private(priv) {} const std::vector<std::unique_ptr<PubkeyProvider>>& pubkeys LIFETIMEBOUND,
DescriptorImpl::StringType type,
const DescriptorCache* cache LIFETIMEBOUND)
: m_arg(arg), m_pubkeys(pubkeys), m_type(type), m_cache(cache) {}
std::optional<std::string> ToString(uint32_t key) const std::optional<std::string> ToString(uint32_t key) const
{ {
std::string ret; std::string ret;
if (m_private) { switch (m_type) {
if (!m_pubkeys[key]->ToPrivateString(*m_arg, ret)) return {}; case DescriptorImpl::StringType::PUBLIC:
} else {
ret = m_pubkeys[key]->ToString(); ret = m_pubkeys[key]->ToString();
break;
case DescriptorImpl::StringType::PRIVATE:
if (!m_pubkeys[key]->ToPrivateString(*m_arg, ret)) return {};
break;
case DescriptorImpl::StringType::NORMALIZED:
if (!m_pubkeys[key]->ToNormalizedString(*m_arg, ret, m_cache)) return {};
break;
case DescriptorImpl::StringType::COMPAT:
ret = m_pubkeys[key]->ToString(PubkeyProvider::StringType::COMPAT);
break;
} }
return ret; return ret;
} }
@ -1325,7 +1338,7 @@ public:
bool ToStringHelper(const SigningProvider* arg, std::string& out, const StringType type, bool ToStringHelper(const SigningProvider* arg, std::string& out, const StringType type,
const DescriptorCache* cache = nullptr) const override const DescriptorCache* cache = nullptr) const override
{ {
if (const auto res = m_node->ToString(StringMaker(arg, m_pubkey_args, type == StringType::PRIVATE))) { if (const auto res = m_node->ToString(StringMaker(arg, m_pubkey_args, type, cache))) {
out = *res; out = *res;
return true; return true;
} }

20
test/functional/wallet_listdescriptors.py
View File

@ -133,6 +133,26 @@ class ListDescriptorsTest(BitcoinTestFramework):
} }
assert_equal(expected, wallet.listdescriptors()) assert_equal(expected, wallet.listdescriptors())
self.log.info('Test taproot descriptor do not have mixed hardened derivation marker')
node.createwallet(wallet_name='w5', descriptors=True, disable_private_keys=True)
wallet = node.get_wallet_rpc('w5')
wallet.importdescriptors([{
'desc': "tr([1dce71b2/48'/1'/0'/2']tpubDEeP3GefjqbaDTTaVAF5JkXWhoFxFDXQ9KuhVrMBViFXXNR2B3Lvme2d2AoyiKfzRFZChq2AGMNbU1qTbkBMfNv7WGVXLt2pnYXY87gXqcs/0/*,and_v(v:pk([c658b283/48'/1'/0'/2']tpubDFL5wzgPBYK5pZ2Kh1T8qrxnp43kjE5CXfguZHHBrZSWpkfASy5rVfj7prh11XdqkC1P3kRwUPBeX7AHN8XBNx8UwiprnFnEm5jyswiRD4p/0/*),older(65535)))#xl20m6md",
'timestamp': TIME_GENESIS_BLOCK,
}])
expected = {
'wallet_name': 'w5',
'descriptors': [
{'active': False,
'desc': 'tr([1dce71b2/48h/1h/0h/2h]tpubDEeP3GefjqbaDTTaVAF5JkXWhoFxFDXQ9KuhVrMBViFXXNR2B3Lvme2d2AoyiKfzRFZChq2AGMNbU1qTbkBMfNv7WGVXLt2pnYXY87gXqcs/0/*,and_v(v:pk([c658b283/48h/1h/0h/2h]tpubDFL5wzgPBYK5pZ2Kh1T8qrxnp43kjE5CXfguZHHBrZSWpkfASy5rVfj7prh11XdqkC1P3kRwUPBeX7AHN8XBNx8UwiprnFnEm5jyswiRD4p/0/*),older(65535)))#m4uznndk',
'timestamp': TIME_GENESIS_BLOCK,
'range': [0, 0],
'next': 0,
'next_index': 0},
]
}
assert_equal(expected, wallet.listdescriptors())
if __name__ == '__main__': if __name__ == '__main__':
ListDescriptorsTest(__file__).main() ListDescriptorsTest(__file__).main()