Merge remote-tracking branch 'origin/dev' into danger

2025-10-13 15:08:19 -04:00
parent 02a26751bb 2980108cdc
commit c078d1606d
29 changed files with 1428 additions and 2435 deletions
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.h
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.h
@@ -84,7 +84,6 @@ private:
    void sign_send_raw_transaction(UniValue obj);     // throws exception if there was an error

    void lock_utxos();
-
    void unlock_utxos();
 };