fix: Check if blocksSinceExpired to get expired domains

This shoudl make it easier to use curl to access info

account.py

@@ -45,9 +45,7 @@ if HSD_INTERNAL_NODE:
         HSD_API = "firewallet-" + str(int(time.time()))
     HSD_IP = "localhost"
 
-SHOW_EXPIRED = os.getenv("SHOW_EXPIRED")
+SHOW_EXPIRED = os.getenv("SHOW_EXPIRED","false").lower() in ["1","true","yes"]
-if SHOW_EXPIRED is None:
-    SHOW_EXPIRED = False
 
 HSD_PROCESS = None
 SPV_MODE = None
@@ -119,6 +117,8 @@ def check_account(cookie: str | None):
         return False
 
     account = cookie.split(":")[0]
+    if len(account) < 1:
+        return False
     # Check if the account is valid
     info = hsw.getAccountInfo(account, 'default')
     if 'error' in info:
@@ -366,7 +366,7 @@ def getBalance(account: str):
     available = available / 1000000
     logger.debug(f"Initial balance for account {account}: total={total}, available={available}, locked={locked}")
 
-    domains = getDomains(account)
+    domains = getDomains(account,True,True)
     domainValue = 0
     domains_to_update = []  # Track domains that need cache updates
     
@@ -473,22 +473,27 @@ def getPendingTX(account: str):
     return pending
 
 
-def getDomains(account, own=True):
+def getDomains(account, own: bool = True, expired: bool = SHOW_EXPIRED):
     if own:
         response = requests.get(get_wallet_api_url(f"/wallet/{account}/name?own=true"))
     else:
         response = requests.get(get_wallet_api_url(f"/wallet/{account}/name"))
     info = response.json()
 
-    if SHOW_EXPIRED:
+    if expired:
         return info
 
     # Remove any expired domains
     domains = []
     for domain in info:
-        if 'stats' in domain:
+        if 'stats' in domain and domain['stats'] is not None:
             if 'daysUntilExpire' in domain['stats']:
                 if domain['stats']['daysUntilExpire'] < 0:
+                    logger.debug(f"Excluding expired domain: {domain['name']} due to daysUntilExpire")
+                    continue
+            if 'blocksSinceExpired' in domain['stats']:
+                if domain['stats']['blocksSinceExpired'] > 0:
+                    logger.debug(f"Excluding expired domain: {domain['name']} due to blocksSinceExpired")
                     continue
         domains.append(domain)
 
@@ -927,11 +932,14 @@ def getNodeSync():
     return sync
 
 
-def getWalletStatus():
+def getWalletStatus(verbose: bool = False):
     response = hsw.rpc_getWalletInfo()
+
     if 'error' in response and response['error'] is not None:
         return "Error"
-
+    
+    if verbose:
+        return response.get('result', {})
     # return response
     walletHeight = response['result']['height']
     # Get the current block height
@@ -1568,9 +1576,15 @@ def getMempoolBids():
 
 
 # region settingsAPIs
-def rescan():
+def rescan(height:int = 0):
     try:
-        response = hsw.walletRescan(0)
+        response = hsw.walletRescan(height)
+        if 'success' in response and response['success'] is False:
+            return {
+                "error": {
+                    "message": "Rescan already in progress"
+                }
+            }
         return response
     except Exception as e:
         return {

main.py

@@ -1607,14 +1607,7 @@ def plugin_function(ptype,plugin,function):
 #region API Routes
 @app.route('/api/v1/hsd/<function>', methods=["GET"])
 def api_hsd(function):
-    # Check if the user is logged in
+
-    if request.cookies.get("account") is None:
-        return jsonify({"error": "Not logged in"})
-    
-    account = account_module.check_account(request.cookies.get("account"))
-    if not account:
-        return jsonify({"error": "Invalid account"})
-    
     if function == "sync":
         return jsonify({"result": account_module.getNodeSync()})
     if function == "version":
@@ -1623,8 +1616,22 @@ def api_hsd(function):
         return jsonify({"result": account_module.getBlockHeight()})
     if function == "mempool":
         return jsonify({"result": account_module.getMempoolTxs()})
-    if function == "mempoolBids":
+    
+    # Check if the user is logged in for all other functions
+    account = None
+    if request.cookies.get("account") is not None:
+        account = account_module.check_account(request.cookies.get("account"))
+    
+    # Allow login using http basic auth
+    if account is None and request.authorization is not None:
+        account = account_module.check_account(f"{request.authorization.username}:{request.authorization.password}")
+
+    if not account:
+        return jsonify({"error": "Not logged in"})
+        
+    if function == "mempoolBids": # This is a heavy function so only allow for logged in users
         return jsonify({"result": account_module.getMempoolBids()})
+    
     if function == "nextAuctionState":
         # Get the domain from the query parameters
         domain = request.args.get('domain')
@@ -1708,21 +1715,30 @@ def api_hsd_mobile(function):
 
 @app.route('/api/v1/wallet/<function>', methods=["GET"])
 def api_wallet(function):
-    # Check if the user is logged in
+
-    if request.cookies.get("account") is None:
+    if function == "sync":
+        # Check if arg verbose is set
+        verbose = request.args.get('verbose', 'false').lower() == 'true'
+        return jsonify({"result": account_module.getWalletStatus(verbose)})
+    
+    # Check if the user is logged in for all other functions
+    account = None
+    password = None
+    if request.cookies.get("account") is not None:
+        account = account_module.check_account(request.cookies.get("account"))
+        password = request.cookies.get("account","").split(":")[1]
+    
+    # Allow login using http basic auth
+    if account is None and request.authorization is not None:
+        account = account_module.check_account(f"{request.authorization.username}:{request.authorization.password}")
+        password = request.authorization.password
+
+    if not account:
         return jsonify({"error": "Not logged in"})
     
-    account = account_module.check_account(request.cookies.get("account"))
+    if function == "balance":
-    if not account:
+        return jsonify({"result": account_module.getBalance(account)})
-        return jsonify({"error": "Invalid account"})
 
-    password = request.cookies.get("account","").split(":")[1]
-    if not account:
-        return jsonify({"error": "Invalid account"})
-    
-    if function == "sync":
-        return jsonify({"result": account_module.getWalletStatus()})
-    
     if function == "available":
         return jsonify({"result": account_module.getBalance(account)['available']})
     if function == "total":
@@ -2021,8 +2037,8 @@ def get_alerts(account:str) -> list:
     wallet_status = account_module.getWalletStatus()
     if wallet_status != "Ready":
         alerts.append({
-            "name": "Wallet",
+            "name": "Wallet Not Synced",
-            "output": f"The wallet is not synced ({wallet_status}). Please wait for it to sync."
+            "output": "Please wait for it to sync."
         })
     # Try to read from notifications sqlite database
     if os.path.exists("user_data/notifications.db"):