Skip to content

Commit 09239a1

Browse files
Merge #6108: fix: remove keypool replenishment stat and warning for descriptor wallet
b7c7bff rpc: remove keypool replenishment stat and warning for descriptor wallet (Kittywhiskers Van Gogh) Pull request description: ## Breaking Changes - `getcoinjoininfo` will no longer report `keys_left` and will not incorrectly warn about keypool depletion with descriptor wallets ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK b7c7bff knst: utACK b7c7bff UdjinM6: re-utACK b7c7bff PastaPastaPasta: utACK b7c7bff Tree-SHA512: d6e55698a30288308e206566bafb7ea4cd465f37c3f6975410ff15b246500e576ee006da712d28eaa1d4845451f19b218e8c4d11f311b860ed674ad52dca1e0c
2 parents f16025f + b7c7bff commit 09239a1

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

doc/release-notes-6108.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
RPC changes
2+
-----------
3+
4+
- `getcoinjoininfo` will no longer report `keys_left` and will not incorrectly warn about keypool depletion with descriptor wallets

src/rpc/coinjoin.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static RPCHelpMan getcoinjoininfo()
227227
{RPCResult::Type::NUM, "entries_count", "The number of entries in the mixing session"},
228228
}},
229229
}},
230-
{RPCResult::Type::NUM, "keys_left", "How many new keys are left since last automatic backup"},
230+
{RPCResult::Type::NUM, "keys_left", /* optional */ true, "How many new keys are left since last automatic backup (if applicable)"},
231231
{RPCResult::Type::STR, "warnings", "Warnings if any"},
232232
}},
233233
RPCResult{"for masternodes",
@@ -267,9 +267,14 @@ static RPCHelpMan getcoinjoininfo()
267267
CHECK_NONFATAL(manager != nullptr);
268268
manager->GetJsonInfo(obj);
269269

270-
obj.pushKV("keys_left", wallet->nKeysLeftSinceAutoBackup);
271-
obj.pushKV("warnings", wallet->nKeysLeftSinceAutoBackup < COINJOIN_KEYS_THRESHOLD_WARNING
272-
? "WARNING: keypool is almost depleted!" : "");
270+
std::string warning_msg{""};
271+
if (wallet->IsLegacy()) {
272+
obj.pushKV("keys_left", wallet->nKeysLeftSinceAutoBackup);
273+
if (wallet->nKeysLeftSinceAutoBackup < COINJOIN_KEYS_THRESHOLD_WARNING) {
274+
warning_msg = "WARNING: keypool is almost depleted!";
275+
}
276+
}
277+
obj.pushKV("warnings", warning_msg);
273278
#endif // ENABLE_WALLET
274279

275280
return obj;

0 commit comments

Comments
 (0)