Fix change detection of imported internal descriptors
This commit is contained in:
parent
42b66a6b81
commit
bd93fc9945
4 changed files with 16 additions and 4 deletions
|
@ -1559,7 +1559,7 @@ static UniValue ProcessDescriptorImport(CWallet * const pwallet, const UniValue&
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add descriptor to the wallet
|
// Add descriptor to the wallet
|
||||||
auto spk_manager = pwallet->AddWalletDescriptor(w_desc, keys, label);
|
auto spk_manager = pwallet->AddWalletDescriptor(w_desc, keys, label, internal);
|
||||||
if (spk_manager == nullptr) {
|
if (spk_manager == nullptr) {
|
||||||
throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Could not add descriptor '%s'", descriptor));
|
throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Could not add descriptor '%s'", descriptor));
|
||||||
}
|
}
|
||||||
|
|
|
@ -4510,7 +4510,7 @@ DescriptorScriptPubKeyMan* CWallet::GetDescriptorScriptPubKeyMan(const WalletDes
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptPubKeyMan* CWallet::AddWalletDescriptor(WalletDescriptor& desc, const FlatSigningProvider& signing_provider, const std::string& label)
|
ScriptPubKeyMan* CWallet::AddWalletDescriptor(WalletDescriptor& desc, const FlatSigningProvider& signing_provider, const std::string& label, bool internal)
|
||||||
{
|
{
|
||||||
if (!IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
|
if (!IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
|
||||||
WalletLogPrintf("Cannot add WalletDescriptor to a non-descriptor wallet\n");
|
WalletLogPrintf("Cannot add WalletDescriptor to a non-descriptor wallet\n");
|
||||||
|
@ -4567,7 +4567,7 @@ ScriptPubKeyMan* CWallet::AddWalletDescriptor(WalletDescriptor& desc, const Flat
|
||||||
}
|
}
|
||||||
|
|
||||||
CTxDestination dest;
|
CTxDestination dest;
|
||||||
if (ExtractDestination(script_pub_keys.at(0), dest)) {
|
if (!internal && ExtractDestination(script_pub_keys.at(0), dest)) {
|
||||||
SetAddressBook(dest, label, "receive");
|
SetAddressBook(dest, label, "receive");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1280,7 +1280,7 @@ public:
|
||||||
DescriptorScriptPubKeyMan* GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const;
|
DescriptorScriptPubKeyMan* GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const;
|
||||||
|
|
||||||
//! Add a descriptor to the wallet, return a ScriptPubKeyMan & associated output type
|
//! Add a descriptor to the wallet, return a ScriptPubKeyMan & associated output type
|
||||||
ScriptPubKeyMan* AddWalletDescriptor(WalletDescriptor& desc, const FlatSigningProvider& signing_provider, const std::string& label);
|
ScriptPubKeyMan* AddWalletDescriptor(WalletDescriptor& desc, const FlatSigningProvider& signing_provider, const std::string& label, bool internal);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -15,6 +15,7 @@ variants.
|
||||||
- `test_address()` is called to call getaddressinfo for an address on node1
|
- `test_address()` is called to call getaddressinfo for an address on node1
|
||||||
and test the values returned."""
|
and test the values returned."""
|
||||||
|
|
||||||
|
from test_framework.address import key_to_p2pkh
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.descriptors import descsum_create
|
from test_framework.descriptors import descsum_create
|
||||||
from test_framework.util import (
|
from test_framework.util import (
|
||||||
|
@ -105,6 +106,17 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||||
error_code=-8,
|
error_code=-8,
|
||||||
error_message="Internal addresses should not have a label")
|
error_message="Internal addresses should not have a label")
|
||||||
|
|
||||||
|
self.log.info("Internal addresses should be detected as such")
|
||||||
|
key = get_generate_key()
|
||||||
|
addr = key_to_p2pkh(key.pubkey)
|
||||||
|
self.test_importdesc({"desc": descsum_create("pkh(" + key.pubkey + ")"),
|
||||||
|
"timestamp": "now",
|
||||||
|
"internal": True},
|
||||||
|
success=True)
|
||||||
|
info = w1.getaddressinfo(addr)
|
||||||
|
assert_equal(info["ismine"], True)
|
||||||
|
assert_equal(info["ischange"], True)
|
||||||
|
|
||||||
# # Test importing of a P2SH-P2WPKH descriptor
|
# # Test importing of a P2SH-P2WPKH descriptor
|
||||||
key = get_generate_key()
|
key = get_generate_key()
|
||||||
self.log.info("Should not import a p2sh-p2wpkh descriptor without checksum")
|
self.log.info("Should not import a p2sh-p2wpkh descriptor without checksum")
|
||||||
|
|
Loading…
Reference in a new issue