phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 664657ed13 into c5e44a0435

Browse source
This commit is contained in:
scgbckbone 2025-04-29 11:58:13 +02:00 • committed by GitHub
commit fd2ebf5143
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/rpc/backup.cpp
View file

@ -1487,6 +1487,7 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
} }
// Range check // Range check
std::optional<bool> is_ranged;
int64_t range_start = 0, range_end = 1, next_index = 0; int64_t range_start = 0, range_end = 1, next_index = 0;
if (!parsed_descs.at(0)->IsRange() && data.exists("range")) { if (!parsed_descs.at(0)->IsRange() && data.exists("range")) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Range should not be specified for an un-ranged descriptor"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Range should not be specified for an un-ranged descriptor");
@ -1501,6 +1502,7 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
range_end = wallet.m_keypool_size; range_end = wallet.m_keypool_size;
} }
next_index = range_start; next_index = range_start;
is_ranged = true;
if (data.exists("next_index")) { if (data.exists("next_index")) {
next_index = data["next_index"].getInt<int64_t>(); next_index = data["next_index"].getInt<int64_t>();
@ -1522,12 +1524,13 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
} }
// Ranged descriptors should not have a label // Ranged descriptors should not have a label
if (data.exists("range") && data.exists("label")) { if (is_ranged.has_value() && is_ranged.value() && data.exists("label")) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Ranged descriptors should not have a label"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Ranged descriptors should not have a label");
} }
bool desc_internal = internal.has_value() && internal.value();
// Internal addresses should not have a label either // Internal addresses should not have a label either
if (internal && data.exists("label")) { if (desc_internal && data.exists("label")) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Internal addresses should not have a label"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Internal addresses should not have a label");
} }
@ -1543,7 +1546,6 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
for (size_t j = 0; j < parsed_descs.size(); ++j) { for (size_t j = 0; j < parsed_descs.size(); ++j) {
auto parsed_desc = std::move(parsed_descs[j]); auto parsed_desc = std::move(parsed_descs[j]);
bool desc_internal = internal.has_value() && internal.value();
if (parsed_descs.size() == 2) { if (parsed_descs.size() == 2) {
desc_internal = j == 1; desc_internal = j == 1;
} else if (parsed_descs.size() > 2) { } else if (parsed_descs.size() > 2) {

13
test/functional/wallet_importdescriptors.py
View file

@ -115,6 +115,9 @@ 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("External non-ranged addresses can have labels")
self.test_importdesc({**import_request, "internal": False}, success=True)
self.log.info("Internal addresses should be detected as such") self.log.info("Internal addresses should be detected as such")
key = get_generate_key() key = get_generate_key()
self.test_importdesc({"desc": descsum_create("pkh(" + key.pubkey + ")"), self.test_importdesc({"desc": descsum_create("pkh(" + key.pubkey + ")"),
@ -216,6 +219,16 @@ class ImportDescriptorsTest(BitcoinTestFramework):
error_code=-8, error_code=-8,
error_message='Ranged descriptors should not have a label') error_message='Ranged descriptors should not have a label')
self.log.info("Ranged descriptors cannot have labels - even if range not provided by user and only implied by asterisk (*)")
self.test_importdesc({"desc":descsum_create("wpkh(" + xpub + "/100/0/*)"),
"timestamp": "now",
"label": "test",
"active": True},
success=False,
warnings=['Range not given, using default keypool range'],
error_code=-8,
error_message='Ranged descriptors should not have a label')
self.log.info("Private keys required for private keys enabled wallet") self.log.info("Private keys required for private keys enabled wallet")
self.test_importdesc({"desc":descsum_create(desc), self.test_importdesc({"desc":descsum_create(desc),
"timestamp": "now", "timestamp": "now",

3
test/functional/wallet_rescan_unconfirmed.py
View file

@ -62,7 +62,8 @@ class WalletRescanUnconfirmed(BitcoinTestFramework):
assert tx_parent_to_reorg["txid"] in node.getrawmempool() assert tx_parent_to_reorg["txid"] in node.getrawmempool()
self.log.info("Import descriptor wallet on another node") self.log.info("Import descriptor wallet on another node")
descriptors_to_import = [{"desc": w0.getaddressinfo(parent_address)['parent_desc'], "timestamp": 0, "label": "w0 import"}] # descriptor is ranged - label not allowed
descriptors_to_import = [{"desc": w0.getaddressinfo(parent_address)['parent_desc'], "timestamp": 0}]
node.createwallet(wallet_name="w1", disable_private_keys=True) node.createwallet(wallet_name="w1", disable_private_keys=True)
w1 = node.get_wallet_rpc("w1") w1 = node.get_wallet_rpc("w1")