feat: Pull updates from main

Merges updates from #1

account.py

@@ -7,11 +7,14 @@ import re
 import domainLookup
 import json
 import time
+import concurrent.futures
 
 dotenv.load_dotenv()
 
-HSD_API = os.getenv("HSD_API","")
+HSD_API = os.getenv("HSD_API")
-HSD_IP = os.getenv("HSD_IP","localhost")
+HSD_IP = os.getenv("HSD_IP")
+if HSD_IP is None:
+    HSD_IP = "localhost"
 
 HSD_NETWORK = os.getenv("HSD_NETWORK")
 HSD_WALLET_PORT = 12039
@@ -45,7 +48,9 @@ cacheTime = 3600
 # Verify the connection
 response = hsd.getInfo()
 
-EXCLUDE = os.getenv("EXCLUDE","primary").split(",")
+EXCLUDE = ["primary"]
+if os.getenv("EXCLUDE") is not None:
+    EXCLUDE = os.getenv("EXCLUDE").split(",")
 
 
 def hsdConnected():
@@ -64,7 +69,7 @@ def hsdVersion(format=True):
         return info['version']
 
 
-def check_account(cookie: str | None):
+def check_account(cookie: str):
     if cookie is None:
         return False
 
@@ -80,12 +85,7 @@ def check_account(cookie: str | None):
     return account
 
 
-def check_password(cookie: str|None, password: str|None):
+def check_password(cookie: str, password: str):
-    if cookie is None:
-        return False
-    if password is None:
-        password = ""
-    
     account = check_account(cookie)
     if account == False:
         return False
@@ -404,30 +404,17 @@ def check_hip2(domain: str):
         return 'Invalid domain'
 
     address = domainLookup.hip2(domain)
-    if not address.startswith("Hip2: "):
+    if address.startswith("Hip2: "):
-        if not check_address(address, False, True):
-            return 'Hip2: Lookup succeeded but address is invalid'
         return address
-    # Try using WALLET TXT record
-    address = domainLookup.wallet_txt(domain)
-    if not address.startswith("hs1"):
-        return "No HIP2 or WALLET record found for this domain"
-    if not check_address(address, False, True):
-        return 'WALLET DNS record found but address is invalid'
-    return address
 
-    
+    if not check_address(address, False, True):
+        return 'Hip2: Lookup succeeded but address is invalid'
+    return address
 
 
 def send(account, address, amount):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
-    if not account_name:
-        return {
-            "error": {
-                "message": "Invalid account"
-            }
-        }
     response = hsw.rpc_selectWallet(account_name)
     if response['error'] is not None:
         return {
@@ -474,23 +461,6 @@ def isOwnDomain(account, name: str):
         return True
     return False
 
-def isOwnPrevout(account, prevout: dict):
-    if 'hash' not in prevout or 'index' not in prevout:
-        return False
-    # Get the address from the prevout
-    address = getAddressFromCoin(prevout['hash'], prevout['index'])
-    # Select the account
-    hsw.rpc_selectWallet(account)
-    account = hsw.rpc_getAccount(address)
-
-    if 'error' in account and account['error'] is not None:
-        return False
-    if 'result' not in account:
-        return False
-    if account['result'] == 'default':
-        return True
-    return False
-    
 
 def getDomain(domain: str):
     # Get the domain
@@ -642,45 +612,202 @@ def getWalletStatus():
         return "Error wallet ahead of node"
 
 
+# Add a simple cache for bid data
+_bid_cache = {}
+_bid_cache_time = {}
+_cache_duration = 300  # Increased cache duration to 5 minutes for bids
+
+# Add domain info cache
+_domain_info_cache = {}
+_domain_info_time = {}
+_domain_info_duration = 600  # Cache domain info for 10 minutes
+
+# Add wallet authentication cache
+_wallet_auth_cache = {}
+_wallet_auth_time = {}
+_wallet_auth_duration = 300  # Increased to 5 minutes for wallet auth
+
 def getBids(account, domain="NONE"):
-    if domain == "NONE":
+    cache_key = f"{account}:{domain}"
-        response = hsw.getWalletBids(account)
+    current_time = time.time()
-    else:
+    
-        response = hsw.getWalletBidsByName(domain, account)
+    # Return cached data if available and fresh
-    # Add backup for bids with no value
+    if cache_key in _bid_cache and current_time - _bid_cache_time.get(cache_key, 0) < _cache_duration:
-    bids = []
+        return _bid_cache[cache_key]
-    for bid in response:
+    
-        if 'value' not in bid:
+    try:
-            bid['value'] = -1000000
+        if domain == "NONE":
+            response = hsw.getWalletBids(account)
+        else:
+            response = hsw.getWalletBidsByName(domain, account)
+        
+        # Add backup for bids with no value
+        bids = []
+        for bid in response:
+            if 'value' not in bid:
+                bid['value'] = -1000000
+            
+            # Backup for older HSD versions
+            if 'height' not in bid:
+                bid['height'] = 0
+            bids.append(bid)
+        
+        # Cache the results
+        _bid_cache[cache_key] = bids
+        _bid_cache_time[cache_key] = current_time
+        
+        return bids
+    except Exception as e:
+        print(f"Error fetching bids: {str(e)}")
+        return []
 
-        # Backup for older HSD versions
+def _fetch_domain_info(domain):
-        if 'height' not in bid:
+    """Helper function to fetch domain info with caching"""
-            bid['height'] = 0
+    current_time = time.time()
-        bids.append(bid)
+    
-    return bids
+    # Check cache first
+    if (domain in _domain_info_cache and 
+        current_time - _domain_info_time.get(domain, 0) < _domain_info_duration):
+        return _domain_info_cache[domain]
+    
+    # Fetch domain info
+    domain_info = getDomain(domain)
+    
+    # Store in cache
+    _domain_info_cache[domain] = domain_info
+    _domain_info_time[domain] = current_time
+    
+    return domain_info
 
+def _fetch_domain_batch(domains, max_workers=10):
+    """Fetch multiple domains in parallel"""
+    results = {}
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
+        # Create a mapping of futures to domains
+        future_to_domain = {executor.submit(_fetch_domain_info, domain): domain for domain in domains}
+        
+        # Process as they complete
+        for future in concurrent.futures.as_completed(future_to_domain):
+            domain = future_to_domain[future]
+            try:
+                results[domain] = future.result()
+            except Exception as e:
+                print(f"Error fetching domain {domain}: {str(e)}")
+                results[domain] = {"error": str(e)}
+    
+    return results
+
+def getPossibleOutbids(account):
+    # Get all bids
+    bids = getBids(account)
+    if not bids or 'error' in bids:
+        return []
+    
+    # Get current height
+    current_height = getBlockHeight()
+
+    # Sort out bids older than 720 blocks and extract domain names
+    filtered_bids = []
+    domains_to_check = set()
+    
+    for bid in bids:
+        if (current_height - bid['height']) <= 720:
+            filtered_bids.append(bid)
+            domains_to_check.add(bid['name'])
+    
+    if not domains_to_check:
+        return []
+    
+    # Fetch all domain info in parallel
+    domain_info_map = _fetch_domain_batch(domains_to_check)
+    
+    # Pre-filter domains in bidding state
+    bidding_domains = {
+        domain: info for domain, info in domain_info_map.items()
+        if ('info' in info and 'state' in info['info'] and 
+            info['info']['state'] == "BIDDING")
+    }
+    
+    # Process the results
+    possible_outbids = []
+    processed_domains = set()
+    
+    # Group bids by domain name for efficient processing
+    bids_by_domain = {}
+    for bid in filtered_bids:
+        domain = bid['name']
+        if domain not in bids_by_domain:
+            bids_by_domain[domain] = []
+        bids_by_domain[domain].append(bid)
+    
+    # Analyze each domain in bidding state
+    for domain, info in bidding_domains.items():
+        if domain in processed_domains or domain not in bids_by_domain:
+            continue
+            
+        processed_domains.add(domain)
+        
+        # Get all bids for this domain in one call
+        domain_bids = getBids(account, domain)
+        
+        # Find the highest bid we've made
+        our_highest_bid = max(
+            (bid['value'] for bid in domain_bids if bid.get("own", False)), 
+            default=0
+        )
+        
+        # Quick check if any unrevealed bids could outbid us
+        if any(
+            bid["lockup"] > our_highest_bid
+            for bid in domain_bids 
+            if not bid.get("own", False) and bid.get('value', 0) == -1000000
+        ):
+            possible_outbids.append(domain)
+    
+    return possible_outbids
 
 def getReveals(account, domain):
     return hsw.getWalletRevealsByName(domain, account)
 
-
 def getPendingReveals(account):
     bids = getBids(account)
-    domains = getDomains(account, False)
+    # Only get domains in REVEAL state to reduce API calls
+    domains = [d for d in getDomains(account, False) if d['state'] == "REVEAL"]
+    
+    if not domains:  # Early return if no domains in REVEAL state
+        return []
+    
     pending = []
-    for domain in domains:
+    
-        if domain['state'] == "REVEAL":
+    # Create a dictionary for O(1) lookups
-            reveals = getReveals(account, domain['name'])
+    domain_names = {domain['name']: domain for domain in domains}
-            for bid in bids:
+    
-                if bid['name'] == domain['name']:
+    # Group bids by name to batch process reveals
-                    state_found = False
+    bids_by_name = {}
-                    for reveal in reveals:
+    for bid in bids:
-                        if reveal['own'] == True:
+        if bid['name'] in domain_names:
-                            if bid['value'] == reveal['value']:
+            if bid['name'] not in bids_by_name:
-                                state_found = True
+                bids_by_name[bid['name']] = []
-
+            bids_by_name[bid['name']].append(bid)
-                    if not state_found:
+    
-                        pending.append(bid)
+    # Fetch reveals for each domain once
+    reveals_by_name = {}
+    for domain_name in bids_by_name:
+        reveals_by_name[domain_name] = getReveals(account, domain_name)
+    
+    # Check each bid against the reveals
+    for domain_name, domain_bids in bids_by_name.items():
+        domain_reveals = reveals_by_name[domain_name]
+        for bid in domain_bids:
+            # Check if this bid has been revealed
+            bid_revealed = any(
+                reveal['own'] == True and bid['value'] == reveal['value'] 
+                for reveal in domain_reveals
+            )
+            
+            if not bid_revealed:
+                pending.append(bid)
+    
     return pending
 
 
@@ -693,20 +820,27 @@ def getPendingRedeems(account, password):
 
     pending = []
     try:
+        # Collect all nameHashes first
+        name_hashes = []
         for output in tx['result']['outputs']:
             if output['covenant']['type'] != 5:
                 continue
             if output['covenant']['action'] != "REDEEM":
                 continue
-            nameHash = output['covenant']['items'][0]
+            name_hashes.append(output['covenant']['items'][0])
-            # Try to get the name from hash
+        
-            name = hsd.rpc_getNameByHash(nameHash)
+        # Batch processing name hashes
+        name_lookup = {}
+        for name_hash in name_hashes:
+            name = hsd.rpc_getNameByHash(name_hash)
             if name['error']:
-                pending.append(nameHash)
+                pending.append(name_hash)
             else:
                 pending.append(name['result'])
-    except:
+                name_lookup[name_hash] = name['result']
-        print("Failed to parse redeems")
+                
+    except Exception as e:
+        print(f"Failed to parse redeems: {str(e)}")
 
     return pending
 
@@ -714,13 +848,22 @@ def getPendingRedeems(account, password):
 def getPendingRegisters(account):
     bids = getBids(account)
     domains = getDomains(account, False)
+    
+    # Create dictionaries for O(1) lookups
+    bids_by_name = {}
+    for bid in bids:
+        if bid['name'] not in bids_by_name:
+            bids_by_name[bid['name']] = []
+        bids_by_name[bid['name']].append(bid)
+    
     pending = []
     for domain in domains:
         if domain['state'] == "CLOSED" and domain['registered'] == False:
-            for bid in bids:
+            if domain['name'] in bids_by_name:
-                if bid['name'] == domain['name']:
+                for bid in bids_by_name[domain['name']]:
                     if bid['value'] == domain['highest']:
                         pending.append(bid)
+    
     return pending
 
 
@@ -731,24 +874,26 @@ def getPendingFinalizes(account, password):
 
     pending = []
     try:
+        # Collect all nameHashes first
+        name_hashes = []
         for output in tx['outputs']:
-            if type(output) != dict:
+            if output['covenant']['type'] != 10:
                 continue
-            if not 'covenant' in output:
+            if output['covenant']['action'] != "FINALIZE":
                 continue
-            if output['covenant'].get("type") != 10:
+            name_hashes.append(output['covenant']['items'][0])
-                continue
+        
-            if output['covenant'].get('action') != "FINALIZE":
+        # Batch lookup for name hashes
-                continue
+        for name_hash in name_hashes:
-            nameHash = output['covenant']['items'][0]
+            name = hsd.rpc_getNameByHash(name_hash)
-            # Try to get the name from hash
-            name = hsd.rpc_getNameByHash(nameHash)
             if name['error']:
-                pending.append(nameHash)
+                pending.append(name_hash)
             else:
                 pending.append(name['result'])
-    except:
+                
-        print("Failed to parse finalizes")
+    except Exception as e:
+        print(f"Failed to parse finalizes: {str(e)}")
+        
     return pending
 
 
@@ -902,12 +1047,10 @@ def rescan_auction(account, domain):
         return {
             "error": "Invalid domain"
         }
-    if 'height' not in response['result']['info']:
+    if 'bidPeriodStart' not in response['result']['info']['stats']:
         return {
-            "error": "Can't find start"
+            "error": "Not in auction"
         }
-
-
     height = response['result']['info']['height']-1
     response = hsw.rpc_importName(domain, height)
     return response
@@ -1093,19 +1236,51 @@ def revoke(account, domain):
         }
 
 
-def sendBatch(account, batch):
+def _prepare_wallet_for_batch(account_name, password):
-    account_name = check_account(account)
+    """Helper function to prepare wallet for batch operations with caching"""
-    password = ":".join(account.split(":")[1:])
+    cache_key = f"{account_name}:{password}"
-
+    current_time = time.time()
-    if account_name == False:
+    
-        return {
+    # Return cached authentication if available and fresh
-            "error": {
+    if (cache_key in _wallet_auth_cache and 
-                "message": "Invalid account"
+        current_time - _wallet_auth_time.get(cache_key, 0) < _wallet_auth_duration):
-            }
+        return _wallet_auth_cache[cache_key]
-        }
+    
+    # Select and unlock wallet
+    result = {'success': False, 'error': None}
+    
+    # Try to select the wallet
+    select_response = hsw.rpc_selectWallet(account_name)
+    if select_response['error'] is not None:
+        result['error'] = {"message": select_response['error']['message']}
+        return result
+    
+    # Try to unlock the wallet
+    unlock_response = hsw.rpc_walletPassphrase(password, 30)  # Increased timeout to reduce future unlocks
+    if (unlock_response['error'] is not None and 
+        unlock_response['error']['message'] != "Wallet is not encrypted."):
+        result['error'] = {"message": unlock_response['error']['message']}
+        return result
+    
+    # Authentication successful
+    result['success'] = True
+    
+    # Cache the authentication result
+    _wallet_auth_cache[cache_key] = result
+    _wallet_auth_time[cache_key] = current_time
+    
+    return result
 
+def _execute_batch_operation(account_name, batch, operation_type="sendbatch"):
+    """Execute a batch operation with the specified wallet"""
+    # Make the batch request
     try:
-        response = hsw.rpc_selectWallet(account_name)
+        response = requests.post(
+            get_wallet_api_url(), 
+            json={"method": operation_type, "params": [batch]},
+            timeout=30  # Add timeout to prevent hanging
+        ).json()
+        
         if response['error'] is not None:
             return {
                 "error": {
@@ -1127,31 +1302,42 @@ def sendBatch(account, batch):
         if response['error'] is not None:
             return response
         if 'result' not in response:
-            return {
+            return {"error": {"message": "No result"}}
-                "error": {
+        
-                    "message": "No result"
-                }
-            }
-
         return response['result']
     except Exception as e:
-        return {
+        return {"error": {"message": str(e)}}
-            "error": {
-                "message": str(e)
-            }
-        }
 
+def sendBatch(account, batch):
+    account_name = check_account(account)
+    if account_name == False:
+        return {"error": {"message": "Invalid account"}}
+    
+    password = ":".join(account.split(":")[1:])
+    
+    # Prepare the wallet (this uses caching)
+    auth_result = _prepare_wallet_for_batch(account_name, password)
+    if not auth_result['success']:
+        return auth_result['error']
+    
+    # Execute the batch operation
+    return _execute_batch_operation(account_name, batch, "sendbatch")
 
 def createBatch(account, batch):
     account_name = check_account(account)
-    password = ":".join(account.split(":")[1:])
-
     if account_name == False:
-        return {
+        return {"error": {"message": "Invalid account"}}
-            "error": {
+    
-                "message": "Invalid account"
+    password = ":".join(account.split(":")[1:])
-            }
+    
-        }
+    # Prepare the wallet (this uses caching)
+    auth_result = _prepare_wallet_for_batch(account_name, password)
+    if not auth_result['success']:
+        return auth_result['error']
+    
+    # Execute the batch operation
+    return _execute_batch_operation(account_name, batch, "createbatch")
+
 
     try:
         response = hsw.rpc_selectWallet(account_name)
@@ -1190,80 +1376,6 @@ def createBatch(account, batch):
             }
         }
 
-# region Mempool
-def getMempoolTxs():
-    # hsd-cli rpc getrawmempool
-    response = hsd.rpc_getRawMemPool()
-    if 'error' in response and response['error'] is not None:
-        return []
-
-    return response['result'] if 'result' in response else []
-
-
-def getMempoolBids():
-    mempoolTxs = getMempoolTxs()
-    bids = {}
-    for txid in mempoolTxs:
-        tx = hsd.getTxByHash(txid)
-        if 'error' in tx and tx['error'] is not None:
-            print(f"Error getting tx {txid}: {tx['error']}")
-            continue
-        if 'outputs' not in tx:
-            print(f"Error getting outputs for tx {txid}")
-            continue
-        for output in tx['outputs']:
-            if output['covenant']['action'] not in ["BID", "REVEAL"]:
-                continue
-            if output['covenant']['action'] == "REVEAL":
-                # Try to find bid tx from inputs
-                namehash = output['covenant']['items'][0]
-                for txInput in tx['inputs']:
-                    if txInput['coin']['covenant']['action'] != "BID":
-                        continue
-                    if txInput['coin']['covenant']['items'][0] != namehash:
-                        continue
-                    name = txInput['coin']['covenant']['items'][2]
-                    # Convert name from hex to ascii
-                    name = bytes.fromhex(name).decode('ascii')
-
-                    bid = {
-                        'txid': txid,
-                        'lockup': txInput['coin']['value'],
-                        'revealed': True,
-                        'height': -1,
-                        'value': output['value'],
-                        'sort_value': txInput['coin']['value'],
-                        'owner': "Unknown"
-                    }
-                    if name not in bids:
-                        bids[name] = []
-                    bids[name].append(bid)               
-                continue
-
-            name = output['covenant']['items'][2]
-            # Convert name from hex to ascii
-            name = bytes.fromhex(name).decode('ascii')
-            if name not in bids:
-                bids[name] = []
-            bid = {
-                'txid': txid,
-                'value': -1000000,  # Default value if not found
-                'lockup': output['value'],
-                'revealed': False,
-                'height': -1,
-                'sort_value': output['value'],
-                'owner': "Unknown"
-            }
-            bids[name].append(bid)
-    return bids
-
-
-
-
-# endregion
-
-
-
 
 # region settingsAPIs
 def rescan():

domainLookup.py

@@ -6,14 +6,10 @@ import subprocess
 import binascii
 import datetime
 import dns.asyncresolver
-import dns.message
-import dns.query
-import dns.rdatatype
 import httpx
 from requests_doh import DNSOverHTTPSSession, add_dns_provider
 import requests
 import urllib3
-from cryptography.x509.oid import ExtensionOID
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) # Disable insecure request warnings (since we are manually verifying the certificate)
 
@@ -60,7 +56,7 @@ def hip2(domain: str):
 
             domains = []
             for ext in cert_obj.extensions:
-                if ext.oid == ExtensionOID.SUBJECT_ALTERNATIVE_NAME:
+                if ext.oid == x509.ExtensionOID.SUBJECT_ALTERNATIVE_NAME:
                     san_list = ext.value.get_values_for_type(x509.DNSName)
                     domains.extend(san_list)
             
@@ -124,39 +120,13 @@ def hip2(domain: str):
         print(f"Hip2: Lookup failed with error: {e}",flush=True)
         return "Hip2: Lookup failed."
 
-def wallet_txt(domain: str, doh_url="https://hnsdoh.com/dns-query"):
-    with httpx.Client() as client:
-        q = dns.message.make_query(domain, dns.rdatatype.from_text("TYPE262"))
-        r = dns.query.https(q, doh_url, session=client)
-
-        if not r.answer:
-            return "No wallet address found for this domain"
-
-        wallet_record = "No WALLET record found"
-        for ans in r.answer:
-            raw = ans[0].to_wire() # type: ignore
-            try:
-                data = raw[1:].decode("utf-8", errors="ignore")
-            except UnicodeDecodeError:
-                return f"Unknown WALLET record format: {raw.hex()}"
-            
-            if data.startswith("HNS:"):
-                wallet_record = data[4:]
-                break
-            elif data.startswith("HNS "):
-                wallet_record = data[4:]
-                break
-            elif data.startswith('"HNS" '):
-                wallet_record = data[6:].strip('"')
-                break
-        return wallet_record
 
 def resolve_with_doh(query_name, doh_url="https://hnsdoh.com/dns-query"):
     with httpx.Client() as client:
         q = dns.message.make_query(query_name, dns.rdatatype.A)
         r = dns.query.https(q, doh_url, session=client)
 
-        ip = r.answer[0][0].address # type: ignore
+        ip = r.answer[0][0].address
         return ip
     
 def resolve_TLSA_with_doh(query_name, doh_url="https://hnsdoh.com/dns-query"):

main.py

@@ -46,26 +46,30 @@ def blocks_to_time(blocks: int) -> str:
     elif blocks < 144:
         hours = blocks // 6
         minutes = (blocks % 6) * 10
-        if minutes == 0:
-            return f"{hours} hrs"
-
         return f"{hours} hrs {minutes} mins"
     else:
         days = blocks // 144
         hours = (blocks % 144) // 6
-        if hours == 0:
-            return f"{days} days"
         return f"{days} days {hours} hrs"
         
     
     
 
 
+# Add a cache for transactions with a timeout
+tx_cache = {}
+TX_CACHE_TIMEOUT = 60*5  # Cache timeout in seconds
+
+# Add a cache for outbids with a timeout
+outbids_cache = {}
+OUTBIDS_CACHE_TIMEOUT = 60*2  # Cache timeout in seconds
+
 @app.route('/')
 def index():
     # Check if the user is logged in
     if request.cookies.get("account") is None:
         return redirect("/login")
+    
     account = account_module.check_account(request.cookies.get("account"))
     if not account:
         return redirect("/logout")
@@ -98,10 +102,6 @@ def reverseDirection(direction: str):
 
 
 #region Transactions
-# Add a cache for transactions with a timeout
-tx_cache = {}
-TX_CACHE_TIMEOUT = 60*5  # Cache timeout in seconds
-
 @app.route('/tx')
 def transactions():
     # Check if the user is logged in
@@ -113,7 +113,7 @@ def transactions():
         return redirect("/logout")
     
     # Get the page parameter
-    page = request.args.get('page', 1)
+    page = request.args.get('page')
     try:
         page = int(page)
     except:
@@ -134,8 +134,6 @@ def send_page():
         return redirect("/login")
 
     account = account_module.check_account(request.cookies.get("account"))
-    if not account:
-        return redirect("/logout")
     max = account_module.getBalance(account)['available']
     # Subtract approx fee
     max = max - fees
@@ -171,28 +169,28 @@ def send():
     amount = request.form.get("amount")
 
     if address is None or amount is None:
-        return redirect(f"/send?message=Invalid address or amount&address={address}&amount={amount}")
+        return redirect("/send?message=Invalid address or amount&address=" + address + "&amount=" + amount)
     
     address_check = account_module.check_address(address.strip(),True,True)
     if not address_check:
-        return redirect(f"/send?message=Invalid address&address={address}&amount={amount}")
+        return redirect("/send?message=Invalid address&address=" + address + "&amount=" + amount)
     
     address = address_check
     # Check if the amount is valid
     if re.match(r"^\d+(\.\d+)?$", amount) is None:
-        return redirect(f"/send?message=Invalid amount&address={address}&amount={amount}")
+        return redirect("/send?message=Invalid amount&address=" + address + "&amount=" + amount)
     
     # Check if the amount is valid
     amount = float(amount)
     if amount <= 0:
-        return redirect(f"/send?message=Invalid amount&address={address}&amount={amount}")
+        return redirect("/send?message=Invalid amount&address=" + address + "&amount=" + str(amount))
     
     if amount > account_module.getBalance(account)['available'] - fees:
-        return redirect(f"/send?message=Not enough funds to transfer&address={address}&amount={amount}")
+        return redirect("/send?message=Not enough funds to transfer&address=" + address + "&amount=" + str(amount))
     
     toAddress = address
     if request.form.get('address') != address:
-        toAddress = f"{request.form.get('address')}<br>{address}"
+        toAddress = request.form.get('address') + "<br>" + address
 
     action = f"Send HNS to {request.form.get('address')}"
     content = f"Are you sure you want to send {amount} HNS to {toAddress}<br><br>"
@@ -203,6 +201,7 @@ def send():
 
 
     return render_template("confirm.html", account=account_module.check_account(request.cookies.get("account")),
+                            
                             action=action,
                             content=content,cancel=cancel,confirm=confirm)
     
@@ -211,20 +210,20 @@ def send():
 def sendConfirmed():
 
     address = request.args.get("address")
-    amount = float(request.args.get("amount","0"))
+    amount = float(request.args.get("amount"))
     response = account_module.send(request.cookies.get("account"),address,amount)
     if 'error' in response and response['error'] != None:
         # If error is a dict get the message
         if isinstance(response['error'], dict):
             if 'message' in response['error']:
-                return redirect(f"/send?message={response['error']['message']}&address={address}&amount={amount}")
+                return redirect("/send?message=" + response['error']['message'] + "&address=" + address + "&amount=" + str(amount))
             else:
-                return redirect(f"/send?message={response['error']}&address={address}&amount={amount}")
+                return redirect("/send?message=" + str(response['error']) + "&address=" + address + "&amount=" + str(amount))
         
         # If error is a string
-        return redirect(f"/send?message={response['error']}&address={address}&amount={amount}")
+        return redirect("/send?message=" + response['error'] + "&address=" + address + "&amount=" + str(amount))
     
-    return redirect(f"/success?tx={response['tx']}")
+    return redirect("/success?tx=" + response['tx'])
     
 
 
@@ -323,8 +322,12 @@ def auctions():
         sort_time = direction
         sort_time_next = reverseDirection(direction)
 
+        # Check if bids list is empty to avoid IndexError
+        if not bids:
+            domains = sorted(domains, key=lambda k: k['height'],reverse=reverse)
+            sortbyDomain = True
         # If older HSD version sort by domain height
-        if bids[0]['height'] == 0:
+        elif bids[0]['height'] == 0:
             domains = sorted(domains, key=lambda k: k['height'],reverse=reverse)
             sortbyDomain = True
         else:
@@ -335,7 +338,27 @@ def auctions():
         sort_domain = direction
         sort_domain_next = reverseDirection(direction)
     
-    bidsHtml = render.bidDomains(bids,domains,sortbyDomain)
+    # Check if outbids set to true
+    outbids = request.args.get("outbids")
+    if outbids is not None and outbids.lower() == "true":
+        # Check cache before making expensive call
+        cache_key = f"outbids_{account}"
+        current_time = time.time()
+        
+        if cache_key in outbids_cache and (current_time - outbids_cache[cache_key]['time'] < OUTBIDS_CACHE_TIMEOUT):
+            outbids = outbids_cache[cache_key]['data']
+        else:
+            # Get outbid domains
+            outbids = account_module.getPossibleOutbids(account)
+            # Store in cache
+            outbids_cache[cache_key] = {
+                'data': outbids,
+                'time': current_time
+            }
+    else:
+        outbids = []
+
+    bidsHtml = render.bidDomains(bids,domains,sortbyDomain,outbids)
     plugins = ""
     message = ''
     if 'message' in request.args:
@@ -363,14 +386,12 @@ def revealAllBids():
         return redirect("/logout")
 
     response = account_module.revealAll(request.cookies.get("account"))
-    if not response:
+    # Simplified error handling
-        return redirect("/auctions?message=Failed to reveal bids")
+    if 'error' in response and response['error']:
-
+        error_msg = response['error'].get('message', str(response['error']))
-    if 'error' in response:
+        if error_msg == "Nothing to do.":
-        if response['error'] != None:
+            return redirect("/auctions?message=No reveals pending")
-            if response['error']['message'] == "Nothing to do.":
+        return redirect("/auctions?message=" + error_msg)
-                return redirect("/auctions?message=No reveals pending")
-            return redirect("/auctions?message=" + response['error']['message'])
             
     return redirect("/success?tx=" + response['result']['hash'])
 
@@ -386,9 +407,6 @@ def redeemAllBids():
         return redirect("/logout")
 
     response = account_module.redeemAll(request.cookies.get("account"))
-    if not response:
-        return redirect("/auctions?message=Failed to redeem bids")
-
     if 'error' in response:
         if response['error'] != None:
             if response['error']['message'] == "Nothing to do.":
@@ -408,16 +426,13 @@ def registerAllDomains():
         return redirect("/logout")
 
     response = account_module.registerAll(request.cookies.get("account"))
-    if not response:
-        return redirect("/auctions?message=Failed to register domains")
-
     if 'error' in response:
         if response['error'] != None:
             if response['error']['message'] == "Nothing to do.":
                 return redirect("/auctions?message=No domains to register")
             return redirect("/auctions?message=" + response['error']['message'])
             
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/all/finalize')
 def finalizeAllBids():
@@ -436,7 +451,7 @@ def finalizeAllBids():
                 return redirect("/dashboard?message=No domains to finalize")
             return redirect("/dashboard?message=" + response['error']['message'])
         
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 #endregion
 
 @app.route('/search')
@@ -450,8 +465,6 @@ def search():
         return redirect("/logout")
     
     search_term = request.args.get("q")
-    if search_term is None:
-        return redirect("/")
     search_term = search_term.lower().strip()
 
     # Replace spaces with hyphens
@@ -468,7 +481,7 @@ def search():
     # Execute domain plugins
     searchFunctions = plugins_module.getSearchFunctions()
     for function in searchFunctions:
-        functionOutput = plugins_module.runPluginFunction(function["plugin"],function["function"],{"domain":search_term},account)
+        functionOutput = plugins_module.runPluginFunction(function["plugin"],function["function"],{"domain":search_term},account_module.check_account(request.cookies.get("account")))
         plugins += render.plugin_output(functionOutput,plugins_module.getPluginFunctionReturns(function["plugin"],function["function"]))
 
     plugins += "</div>"
@@ -486,7 +499,6 @@ def search():
 
     state = domain['info']['state']
     stats = domain['info']['stats']
-    next = ""
     if state == 'CLOSED':
         if domain['info']['registered']:
             state = 'REGISTERED'
@@ -518,10 +530,7 @@ def search():
     
     dns = account_module.getDNS(search_term)
 
-    own_domains = account_module.getDomains(account)
+    if account_module.isOwnDomain(account, search_term):
-    own_domains = [x['name'] for x in own_domains]
-    own_domains = [x.lower() for x in own_domains]
-    if search_term in own_domains:
         owner = "You"
 
     dns = render.dns(dns)
@@ -583,7 +592,7 @@ def manage(domain: str):
     # Execute domain plugins
     domainFunctions = plugins_module.getDomainFunctions()
     for function in domainFunctions:
-        functionOutput = plugins_module.runPluginFunction(function["plugin"],function["function"],{"domain":domain},account)
+        functionOutput = plugins_module.runPluginFunction(function["plugin"],function["function"],{"domain":domain},account_module.check_account(request.cookies.get("account")))
         plugins += render.plugin_output(functionOutput,plugins_module.getPluginFunctionReturns(function["plugin"],function["function"]))
 
     plugins += "</div>"
@@ -688,7 +697,7 @@ def revokeConfirm(domain: str):
             print(response)
             return redirect("/manage/" + domain + "?error=" + response['error']['message'])
 
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/manage/<domain>/renew')
 def renew(domain: str):
@@ -702,7 +711,7 @@ def renew(domain: str):
     
     domain = domain.lower()
     response = account_module.renewDomain(request.cookies.get("account"),domain)
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/manage/<domain>/edit')
 def editPage(domain: str):
@@ -716,10 +725,7 @@ def editPage(domain: str):
     
     domain = domain.lower()
     
-    own_domains = account_module.getDomains(account)
+    if not account_module.isOwnDomain(account, domain):
-    own_domains = [x['name'] for x in own_domains]
-    own_domains = [x.lower() for x in own_domains]
-    if domain not in own_domains:
         return redirect("/search?q=" + domain)
        
 
@@ -728,11 +734,8 @@ def editPage(domain: str):
         dns = urllib.parse.unquote(user_edits)
     else:
         dns = account_module.getDNS(domain)
-
+    
-    if dns and isinstance(dns, str):
+    dns = json.loads(dns)
-        dns = json.loads(dns)
-    else:
-        dns = []
 
     # Check if new records have been added
     dnsType = request.args.get("type")
@@ -748,14 +751,14 @@ def editPage(domain: str):
                 return redirect("/manage/" + domain + "/edit?dns=" + urllib.parse.quote(str(raw_dns)) + "&error=Invalid DS record")
             
             try:
-                key_tag = int(ds[0])
+                ds[0] = int(ds[0])
-                algorithm = int(ds[1])
+                ds[1] = int(ds[1])
-                digest_type = int(ds[2])
+                ds[2] = int(ds[2])
             except:
                 raw_dns = str(dns).replace("'",'"')
                 return redirect("/manage/" + domain + "/edit?dns=" + urllib.parse.quote(str(raw_dns)) + "&error=Invalid DS record")
-            
+            finally:
-            dns.append({"type": dnsType, "keyTag": key_tag, "algorithm": algorithm, "digestType": digest_type, "digest": ds[3]})
+                dns.append({"type": dnsType, "keyTag": ds[0], "algorithm": ds[1], "digestType": ds[2], "digest": ds[3]})
 
         dns = json.dumps(dns).replace("'",'"')
         return redirect("/manage/" + domain + "/edit?dns=" + urllib.parse.quote(dns))
@@ -785,15 +788,13 @@ def editSave(domain: str):
     
     domain = domain.lower()
     dns = request.args.get("dns")
-    if dns is None:
-        return redirect(f"/manage/{domain}/edit?error=No DNS records provided")
     raw_dns = dns
     dns = urllib.parse.unquote(dns)
     response = account_module.setDNS(request.cookies.get("account"),domain,dns)
     if 'error' in response:
         print(response)
-        return redirect(f"/manage/{domain}/edit?dns={raw_dns}&error={response['error']}")
+        return redirect("/manage/" + domain + "/edit?dns="+raw_dns+"&error=" + str(response['error']))
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/manage/<domain>/transfer')
 def transfer(domain):
@@ -818,7 +819,7 @@ def transfer(domain):
         
     toAddress = address
     if request.form.get('address') != address:
-        toAddress = f"{request.args.get('address')}<br>{address}"
+        toAddress = request.args.get('address') + "<br>" + address
 
     action = f"Send {domain}/ to {request.form.get('address')}"
     content = f"Are you sure you want to send {domain}/ to {toAddress}<br><br>"
@@ -828,7 +829,9 @@ def transfer(domain):
     confirm = f"/manage/{domain}/transfer/confirm?address={address}"
 
 
-    return render_template("confirm.html", account=account,action=action,
+    return render_template("confirm.html", account=account_module.check_account(request.cookies.get("account")),
+                            
+                            action=action,
                             content=content,cancel=cancel,confirm=confirm)
 
 @app.route('/manage/<domain>/sign')
@@ -851,7 +854,7 @@ def signMessage(domain):
     signedMessage = account_module.signMessage(request.cookies.get("account"),domain,message)
     if signedMessage["error"] != None:
         return redirect("/manage/" + domain + "?error=" + signedMessage["error"])
-    content += f"Signature:<br><code>{signedMessage["result"]}</code><br><br>"
+    content += "Signature:<br><code>" + signedMessage["result"] + "</code><br><br>"
 
     data = {
         "domain": domain,
@@ -868,7 +871,8 @@ def signMessage(domain):
 
     
 
-    return render_template("message.html", account=account,                           
+    return render_template("message.html", account=account,
+                           
                                title="Sign Message",content=content)
     
 
@@ -887,7 +891,7 @@ def transferConfirm(domain):
     if 'error' in response:
         return redirect("/manage/" + domain + "?error=" + response['error'])
     
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 
 @app.route('/auction/<domain>')
@@ -931,9 +935,19 @@ def auction(domain):
 
     state = domainInfo['info']['state']
     next_action = ''
-    next = ""
 
-    bids = []
+    bids = account_module.getBids(account,search_term)
+    if bids == []:
+        bids = "No bids found"
+        next_action = f'<a href="/auction/{domain}/scan">Rescan Auction</a>'
+    else:
+        reveals = account_module.getReveals(account,search_term)
+        for reveal in reveals:
+            # Get TX
+            revealInfo = account_module.getRevealTX(reveal)
+            reveal['bid'] = revealInfo
+        bids = render.bids(bids,reveals)
+
     stats = domainInfo['info']['stats'] if 'stats' in domainInfo['info'] else {}
     if state == 'CLOSED':
         if not domainInfo['info']['registered']:
@@ -1013,8 +1027,8 @@ def bid(domain):
         return redirect("/logout")
     
     domain = domain.lower()
-    bid = request.args.get("bid","")
+    bid = request.args.get("bid")
-    blind = request.args.get("blind","")
+    blind = request.args.get("blind")
 
     if bid == "":
         bid = 0
@@ -1059,8 +1073,8 @@ def bid_confirm(domain):
         return redirect("/logout")
     
     domain = domain.lower()
-    bid = request.args.get("bid","")
+    bid = request.args.get("bid")
-    blind = request.args.get("blind","")
+    blind = request.args.get("blind")
 
     if bid == "":
         bid = 0
@@ -1079,7 +1093,7 @@ def bid_confirm(domain):
     if 'error' in response:
         return redirect("/auction/" + domain + "?error=" + response['error']['message'])
     
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/auction/<domain>/open')
 def open_auction(domain):
@@ -1098,7 +1112,7 @@ def open_auction(domain):
         if response['error'] != None:
             return redirect("/auction/" + domain + "?error=" + response['error']['message'])
 
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/auction/<domain>/reveal')
 def reveal_auction(domain):
@@ -1113,8 +1127,8 @@ def reveal_auction(domain):
     domain = domain.lower()
     response = account_module.revealAuction(request.cookies.get("account"),domain)
     if 'error' in response:
-        return redirect(f"/auction/{domain}?message={response['error']}")
+        return redirect("/auction/" + domain + "?message=" + response['error']['message'])
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 @app.route('/auction/<domain>/register')
 def registerdomain(domain):
@@ -1129,7 +1143,7 @@ def registerdomain(domain):
     response = account_module.register(request.cookies.get("account"),domain)
     if 'error' in response:
         return redirect("/auction/" + domain + "?message=" + response['error']['message'])
-    return redirect(f"/success?tx={response['hash']}")
+    return redirect("/success?tx=" + response['hash'])
 
 #endregion
 #region Settings
@@ -1156,11 +1170,6 @@ def settings():
                                hsd_version=account_module.hsdVersion(False),
                                error=error,success=success,version="Error")
     info = gitinfo.get_git_info()
-    if not info:
-        return render_template("settings.html", account=account,                               
-                               hsd_version=account_module.hsdVersion(False),
-                               error=error,success=success,version="Error")
-
     branch = info['refs']
     if branch != "main":
         branch = f"({branch})"
@@ -1200,19 +1209,20 @@ def settings_action(action):
 
     elif action == "zap":
         resp = account_module.zapTXs(request.cookies.get("account"))
-        if type(resp) == dict and 'error' in resp:
+        if 'error' in resp:
             return redirect("/settings?error=" + str(resp['error']))
         return redirect("/settings?success=Zapped transactions")
     elif action == "xpub":
         xpub = account_module.getxPub(request.cookies.get("account"))
         content = "<br><br>"
-        content += f"<textarea style='display: none;' id='data' rows='4' cols='50'>{xpub}</textarea>"
+        content += "<textarea style='display: none;' id='data' rows='4' cols='50'>"+xpub+"</textarea>"
         content += "<script>function copyToClipboard() {var copyText = document.getElementById('data');copyText.style.display = 'block';copyText.select();copyText.setSelectionRange(0, 99999);document.execCommand('copy');copyText.style.display = 'none';var copyButton = document.getElementById('copyButton');copyButton.innerHTML='Copied';}</script>"
         content += "<button id='copyButton' onclick='copyToClipboard()' class='btn btn-secondary'>Copy to clipboard</button>"
 
         return render_template("message.html", account=account,
+                               
                                title="xPub Key",
-                               content=f"<code>{xpub}</code>{content}")
+                               content="<code>"+xpub+"</code>" + content)
 
     return redirect("/settings?error=Invalid action")
 
@@ -1222,9 +1232,6 @@ def upload_image():
         return redirect("/login?message=Not logged in")
     
     account = request.cookies.get("account")
-    account = account_module.check_account(account)
-    if not account:
-        return redirect("/logout")
 
     if not os.path.exists('user_data/images'):
         os.mkdir('user_data/images')
@@ -1234,12 +1241,11 @@ def upload_image():
     file = request.files['image']
     if file.filename == '':
         return redirect("/settings?error=No file selected")
-    if file and file.filename:
+    if file:
-        filepath = os.path.join(f'user_data/images/{account}.{file.filename.split(".")[-1]}')
+        filepath = os.path.join(f'user_data/images/{account.split(":")[0]}.{file.filename.split(".")[-1]}')
         file.save(filepath)
         return redirect("/settings?success=File uploaded successfully")
     
-    return redirect("/settings?error=An error occurred")
 
 def latestVersion(branch):
     result = requests.get(f"https://git.woodburn.au/api/v1/repos/nathanwoodburn/firewalletbrowser/branches")
@@ -1276,12 +1282,6 @@ def login_post():
     account = request.form.get("account")
     password = request.form.get("password")
 
-    if account == None or password == None:
-        wallets = account_module.listWallets()
-        wallets = render.wallets(wallets)
-        return render_template("login.html",
-                               error="Invalid account or password",wallets=wallets)
-
     # Check if the account is valid
     if account.count(":") > 0:
         wallets = account_module.listWallets()
@@ -1297,6 +1297,8 @@ def login_post():
         wallets = render.wallets(wallets)
         return render_template("login.html", 
                                error="Invalid account or password",wallets=wallets)
+
+
     # Set the cookie
     response = make_response(redirect("/"))
     response.set_cookie("account", account)
@@ -1315,11 +1317,6 @@ def register():
     password = request.form.get("password")
     repeatPassword = request.form.get("password_repeat")
 
-    if account == None or password == None or repeatPassword == None:
-        return render_template("register.html",
-                               error="Invalid account or password",
-                               name=account,password=password,password_repeat=repeatPassword)
-
     # Check if the passwords match
     if password != repeatPassword:
         return render_template("register.html",
@@ -1349,8 +1346,10 @@ def register():
     
     
     # Set the cookie
-    response = make_response(render_template("message.html",title="Account Created",
+    response = make_response(render_template("message.html", 
-                                              content=f"Your account has been created. Here is your seed phrase. Please write it down and keep it safe as it will not be shown again<br><br>{response['seed']}"))
+                                             
+                                              title="Account Created",
+                                              content="Your account has been created. Here is your seed phrase. Please write it down and keep it safe as it will not be shown again<br><br>" + response['seed']))
     response.set_cookie("account", account+":"+password)
     return response
 
@@ -1362,12 +1361,6 @@ def import_wallet():
     repeatPassword = request.form.get("password_repeat")
     seed = request.form.get("seed")
 
-    if account == None or password == None or repeatPassword == None or seed == None:
-        return render_template("import-wallet.html",
-                               error="Invalid account, password or seed",
-                               name=account,password=password,password_repeat=repeatPassword,
-                               seed=seed)
-    
     # Check if the passwords match
     if password != repeatPassword:
         return render_template("import-wallet.html",
@@ -1569,67 +1562,7 @@ def api_hsd(function):
         return jsonify({"result": account_module.hsdVersion(False)})
     if function == "height":
         return jsonify({"result": account_module.getBlockHeight()})
-    if function == "mempool":
+    
-        return jsonify({"result": account_module.getMempoolTxs()})
-    if function == "mempoolBids":
-        return jsonify({"result": account_module.getMempoolBids()})
-    if function == "nextAuctionState":
-        # Get the domain from the query parameters
-        domain = request.args.get('domain')
-        if not domain:
-            return jsonify({"error": "No domain specified"}), 400
-        domainInfo = account_module.getDomain(domain)
-        if 'error' in domainInfo and domainInfo['error'] != None:
-            return jsonify({"error": domainInfo['error']}), 400
-        stats = domainInfo['info']['stats'] if 'stats' in domainInfo['info'] else {}
-        state = domainInfo['info']['state']
-        next_action = ""
-        next = ""
-        if state == 'CLOSED':
-            if not domainInfo['info']['registered']:
-                if account_module.isOwnDomain(account,domain):
-                    print("Waiting to be registered")
-                    state = 'PENDING REGISTER'
-                    next = "Pending Register"
-                    next_action = f'<a href="/auction/{domain}/register">Register Domain</a>'
-                
-                else:
-                    print("Not registered")
-                    state = 'AVAILABLE'
-                    next = "Available Now"
-                    next_action = f'<a href="/auction/{domain}/open">Open Auction</a>'
-            else:
-                state = 'REGISTERED'
-                expires = domainInfo['info']['stats']['daysUntilExpire']
-                next = f"Expires in ~{expires} days"
-        elif state == "REVOKED":
-            next = "Available Now"
-            next_action = f'<a href="/auction/{domain}/open">Open Auction</a>'
-        elif state == 'OPENING':
-            next = f"Bidding opens in {str(stats['blocksUntilBidding'])} blocks (~{blocks_to_time(stats['blocksUntilBidding'])})"
-        elif state == 'BIDDING':
-            next = f"Reveal in {stats['blocksUntilReveal']} blocks (~{blocks_to_time(stats['blocksUntilReveal'])})"
-            if stats['blocksUntilReveal'] == 1:
-                next += "<br>Bidding no longer possible"
-            elif stats['blocksUntilReveal'] == 2:
-                next += "<br>LAST CHANCE TO BID"
-            elif stats['blocksUntilReveal'] == 3:
-                next += f"<br>Next block is last chance to bid"
-            elif stats['blocksUntilReveal'] < 6:
-                next += f"<br>Last chance to bid in {stats['blocksUntilReveal']-2} blocks"
-
-
-        elif state == 'REVEAL':
-            next = f"Reveal ends in {str(stats['blocksUntilClose'])} blocks (~{blocks_to_time(stats['blocksUntilClose'])})"
-            next_action = f'<a href="/auction/{domain}/reveal">Reveal All</a>'
-
-        return jsonify({
-            "state": state,
-            "next": next,
-            "next_action": next_action
-        })
-
-
     return jsonify({"error": "Invalid function", "result": "Invalid function"}), 400
 
 
@@ -1663,10 +1596,7 @@ def api_wallet(function):
         return jsonify({"error": "Not logged in"})
     
     account = account_module.check_account(request.cookies.get("account"))
-    if not account:
+    password = request.cookies.get("account").split(":")[1]
-        return jsonify({"error": "Invalid account"})
-
-    password = request.cookies.get("account","").split(":")[1]
     if not account:
         return jsonify({"error": "Invalid account"})
     
@@ -1700,7 +1630,7 @@ def api_wallet(function):
 
     if function == "domains":
         domains = account_module.getDomains(account)
-        if type(domains) == dict and 'error' in domains:
+        if 'error' in domains:
             return jsonify({"result": [], "error": domains['error']})
         
         # Add nameRender to each domain
@@ -1711,7 +1641,7 @@ def api_wallet(function):
     
     if function == "transactions":
         # Get the page parameter
-        page = request.args.get('page', 1)
+        page = request.args.get('page')
         try:
             page = int(page)
         except:
@@ -1751,21 +1681,6 @@ def api_wallet(function):
             "page": page
         })
 
-    if function == "domainBids":
-        domain = request.args.get('domain')
-        if not domain:
-            return jsonify({"error": "No domain specified"}), 400
-        bids = account_module.getBids(account,domain)
-        if bids == []:
-            return jsonify({"result": [], "error": "No bids found"}), 404
-        else:
-            reveals = account_module.getReveals(account,domain)
-            for reveal in reveals:
-                # Get TX
-                revealInfo = account_module.getRevealTX(reveal)
-                reveal['bid'] = revealInfo
-            bids = render.bids(bids,reveals)
-        return jsonify({"result": bids})
 
     if function == "icon":
         # Check if there is an icon
@@ -1778,6 +1693,12 @@ def api_wallet(function):
             
         return send_file('templates/assets/img/HNS.png')
 
+
+    if function == "possibleOutbids":
+        return jsonify({"result": account_module.getPossibleOutbids(account)})
+
+
+
     return jsonify({"error": "Invalid function", "result": "Invalid function"}), 400
 
 @app.route('/api/v1/wallet/<function>/mobile', methods=["GET"])
@@ -1787,7 +1708,7 @@ def api_wallet_mobile(function):
         return jsonify({"error": "Not logged in"})
     
     account = account_module.check_account(request.cookies.get("account"))
-    password = request.cookies.get("account","").split(":")[1]
+    password = request.cookies.get("account").split(":")[1]
     if not account:
         return jsonify({"error": "Invalid account"})
     
@@ -1849,11 +1770,7 @@ def renderDomain(name: str) -> str:
 #region Assets and default pages
 @app.route('/qr/<data>')
 def qr(data):
-
+    return send_file(qrcode(data, mode="raw"), mimetype="image/png")
-    output = qrcode(data, mode="raw")
-    if output is None:
-        return jsonify({"error": "Invalid data"}), 400
-    return send_file(output, mimetype="image/png")
 
 # Theme
 @app.route('/assets/css/styles.min.css')

plugin.py

@@ -148,14 +148,11 @@ def getPluginData(pluginStr: str):
 
 
 def getPluginFunctions(plugin: str):
-    imported_plugin = import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
-    return imported_plugin.functions
+    return plugin.functions
 
 
-def runPluginFunction(plugin: str, function: str, params: dict, authentication: (str|None)):
+def runPluginFunction(plugin: str, function: str, params: dict, authentication: str):
-    if not authentication:
-        return {"error": "Authentication required"}
-
     plugin_module = import_module(plugin.replace("/","."))
     if function not in plugin_module.functions:
         return {"error": "Function not found"}
@@ -192,13 +189,13 @@ def runPluginFunction(plugin: str, function: str, params: dict, authentication:
 
 
 def getPluginFunctionInputs(plugin: str, function: str):
-    imported_plugin = import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
-    return imported_plugin.functions[function]["params"]
+    return plugin.functions[function]["params"]
 
 
 def getPluginFunctionReturns(plugin: str, function: str):
-    imported_plugin = import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
-    return imported_plugin.functions[function]["returns"]
+    return plugin.functions[function]["returns"]
 
 
 def getDomainFunctions():

render.py

@@ -7,8 +7,10 @@ import os
 from handywrapper import api
 import threading
 
-HSD_API = os.getenv("HSD_API","")
+HSD_API = os.getenv("HSD_API")
-HSD_IP = os.getenv("HSD_IP","localhost")
+HSD_IP = os.getenv("HSD_IP")
+if HSD_IP is None:
+    HSD_IP = "localhost"
 
 HSD_NETWORK = os.getenv("HSD_NETWORK")
 HSD_WALLET_PORT = 12039
@@ -38,24 +40,6 @@ if TX_EXPLORER_URL is None:
 
 
 NAMEHASH_CACHE = 'user_data/namehash_cache.json'
-# Validate cache version
-if os.path.exists(NAMEHASH_CACHE):
-    with open(NAMEHASH_CACHE, 'r') as f:
-        cache = json.load(f)
-    if not isinstance(cache, dict):
-        print("Invalid namehash cache format. Resetting cache.")
-        with open(NAMEHASH_CACHE, 'w') as f:
-            json.dump({}, f)
-    # Check if cache entries are valid
-    for key in cache:
-        if not cache[key].startswith("<a href='/manage/"):
-            print(f"Invalid cache entry for {key}. Resetting cache.")
-            with open(NAMEHASH_CACHE, 'w') as f:
-                json.dump({}, f)
-            break
-
-
-
 CACHE_LOCK = threading.Lock()
 
 
@@ -94,7 +78,6 @@ actionMap = {
     "UPDATE": "Updated ",
     "REGISTER": "Registered ",
     "RENEW": "Renewed ",
-    "OPEN": "Opened ",
     "BID": "Bid on ",
     "REVEAL": "Revealed bid for ",
     "REDEEM": "Redeemed bid for ",
@@ -106,7 +89,6 @@ actionMapPlural = {
     "UPDATE": "Updated multiple domains' records",
     "REGISTER": "Registered multiple domains",
     "RENEW": "Renewed multiple domains",
-    "OPEN": "Opened multiple domains",
     "BID": "Bid on multiple domains",
     "REVEAL": "Revealed multiple bids",
     "REDEEM": "Redeemed multiple bids",
@@ -320,6 +302,7 @@ def bids(bids,reveals):
             'value': value,
             'sort_value': value if revealed else lockup  # Use value for sorting if revealed, otherwise lockup
         })
+    
     # Sort by the sort_value in descending order (highest first)
     bid_data.sort(key=lambda x: x['sort_value'], reverse=True)
     
@@ -347,15 +330,14 @@ def bids(bids,reveals):
         else:
             html += f"<td>Unknown</td>"
 
-        html += f"<td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' target='_blank' href='{TX_EXPLORER_URL}{bid['prevout']['hash']}'>Bid TX 🔗</a></td>"
+        html += f"<td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' href='{TX_EXPLORER_URL}{bid['prevout']['hash']}'>Bid TX 🔗</a></td>"
         html += "</tr>"
         
     return html
 
 
-def bidDomains(bids,domains, sortbyDomains=False):
+def bidDomains(bids,domains, sortbyDomains=False, outbids=[]):
     html = ''
-
     if not sortbyDomains:
         for bid in bids:
             for domain in domains:
@@ -369,13 +351,15 @@ def bidDomains(bids,domains, sortbyDomains=False):
                         bidDisplay = f'<b>{bidValue:,.2f}</b> (+{blind:,.2f}) HNS'
                     else:
                         bidDisplay = f'<b>{bidValue:,.2f}</b> HNS'
-                    
+                        
-
                     html += "<tr>"
-                    html += f"<td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' href='/auction/{domain['name']}'>{renderDomain(domain['name'])}</a></td>"
+                    if domain['name'] in outbids:
+                        html += f"<td style='background-color: red;'><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' href='/auction/{domain['name']}'>{renderDomain(domain['name'])}</a></td>"
+                    else:
+                        html += f"<td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' href='/auction/{domain['name']}'>{renderDomain(domain['name'])}</a></td>"
                     html += f"<td>{domain['state']}</td>"
                     html += f"<td style='white-space: nowrap;'>{bidDisplay}</td>"
-                    html += f"<td class='hide-mobile'>{domain['height']:,}</td>"
+                    html += f"<td class='hide-mobile'>{bid['height']:,}</td>"
                     html += "</tr>"
     else:
         for domain in domains:
@@ -391,7 +375,7 @@ def bidDomains(bids,domains, sortbyDomains=False):
                     html += f"<td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' href='/auction/{domain['name']}'>{renderDomain(domain['name'])}</a></td>"
                     html += f"<td>{domain['state']}</td>"
                     html += f"<td>{bidDisplay}</td>"
-                    html += f"<td class='hide-mobile'>{domain['height']:,}</td>"
+                    html += f"<td class='hide-mobile'>{bid['height']:,}</td>"
                     html += "</tr>"
     return html
 
@@ -558,13 +542,12 @@ def renderDomainAsync(namehash: str) -> None:
 
             if namehash in cache:
                 return
+
         # Fetch the name outside the lock (network call)
         name = hsd.rpc_getNameByHash(namehash)
         if name["error"] is None:
             name = name["result"]
             rendered = renderDomain(name)
-            rendered = f"<a href='/manage/{name}' target='_blank' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));'>{rendered}</a>"
-
 
             with CACHE_LOCK:
                 with open(NAMEHASH_CACHE, 'r') as f:
@@ -573,7 +556,7 @@ def renderDomainAsync(namehash: str) -> None:
                 with open(NAMEHASH_CACHE, 'w') as f:
                     json.dump(cache, f)
 
-            return
+            return rendered
         else:
             print(f"Error fetching name for hash {namehash}: {name['error']}", flush=True)
 

server.py

@@ -17,8 +17,8 @@ def gunicornServer():
 
         def load_config(self):
             for key, value in self.options.items():
-                if key in self.cfg.settings and value is not None: # type: ignore
+                if key in self.cfg.settings and value is not None:
-                    self.cfg.set(key.lower(), value) # type: ignore
+                    self.cfg.set(key.lower(), value)
 
         def load(self):
             return self.application

templates/assets/js/dashboard.min.js

@@ -1 +1 @@
-function createCard(e,n,t){if(document.getElementById(t)&&document.getElementById(t).remove(),n<=0)return;const a=document.createElement("div");a.classList.add("col-md-6","col-xl-3","mb-4"),a.id=t,html=`\n        <div class="card shadow border-start-warning py-2">\n            <div class="card-body">\n                <div class="row align-items-center no-gutters">\n                    <div class="col me-2">\n                        <div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>${e}</span></div>\n                        <div class="text-dark fw-bold h5 mb-0"><span id="${e}">${n}</span></div>\n                    </div>\n                    <div class="col"><a class="btn btn-primary" role="button" href="/all/${t.toLowerCase()}">${t} All</a></div>\n                    <div class="col-auto"><svg class="fa-2x text-gray-300" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="1em" viewBox="0 0 24 24" width="1em" fill="currentColor">\n                        <g>\n                            <rect fill="none" height="24" width="24"></rect>\n                        </g>\n                        <g>\n                            <path d="M12,2C6.48,2,2,6.48,2,12c0,5.52,4.48,10,10,10s10-4.48,10-10C22,6.48,17.52,2,12,2z M7,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C8.5,12.83,7.83,13.5,7,13.5z M12,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C13.5,12.83,12.83,13.5,12,13.5z M17,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C18.5,12.83,17.83,13.5,17,13.5z"></path>\n                        </g>\n                    </svg></div>\n                </div>\n                </div>`,a.innerHTML=html,document.getElementById("actions-row").appendChild(a)}async function updateActions(){const e={Finalize:"Pending Finalizes",Register:"Pending Register",Redeem:"Pending Redeem",Reveal:"Pending Reveal"};for(const n in e){const t=await request(`wallet/pending${n}`);"Error"!=t&&createCard(e[n],t.length,n)}}window.addEventListener("load",(async()=>{updateActions()})),setInterval((async function(){updateActions()}),2e4);
+function createCard(e,n,t){if(document.getElementById(t)&&document.getElementById(t).remove(),n<=0)return;const s=document.createElement("div");s.classList.add("col-md-6","col-xl-3","mb-4"),s.id=t,html=`\n        <div class="card shadow border-start-warning py-2">\n            <div class="card-body">\n                <div class="row align-items-center no-gutters">\n                    <div class="col me-2">\n                        <div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>${e}</span></div>\n                        <div class="text-dark fw-bold h5 mb-0"><span id="${e}">${n}</span></div>\n                    </div>\n                    <div class="col"><a class="btn btn-primary" role="button" href="/all/${t.toLowerCase()}">${t} All</a></div>\n                    <div class="col-auto"><svg class="fa-2x text-gray-300" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="1em" viewBox="0 0 24 24" width="1em" fill="currentColor">\n                        <g>\n                            <rect fill="none" height="24" width="24"></rect>\n                        </g>\n                        <g>\n                            <path d="M12,2C6.48,2,2,6.48,2,12c0,5.52,4.48,10,10,10s10-4.48,10-10C22,6.48,17.52,2,12,2z M7,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C8.5,12.83,7.83,13.5,7,13.5z M12,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C13.5,12.83,12.83,13.5,12,13.5z M17,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C18.5,12.83,17.83,13.5,17,13.5z"></path>\n                        </g>\n                    </svg></div>\n                </div>\n                </div>`,s.innerHTML=html,document.getElementById("actions-row").appendChild(s)}async function updateActions(){const e={Finalize:"Pending Finalizes",Register:"Pending Register",Redeem:"Pending Redeem",Reveal:"Pending Reveal"},n=Object.keys(e).map((e=>request(`wallet/pending${e}`).then((n=>({id:e,result:n}))))),t=await Promise.all(n);for(const{id:n,result:s}of t)"Error"!==s&&createCard(e[n],s.length,n);const s=await request("wallet/possibleOutbids");if("Error"===s)return;const d=document.getElementById("outbids");if(d&&d.remove(),s.length<=0)return;const i=document.createElement("div");i.classList.add("col-md-6","col-xl-3","mb-4"),i.id="outbids",i.innerHTML=`\n        <div class="card shadow border-start-warning py-2">\n            <div class="card-body">\n                <div class="row align-items-center no-gutters">\n                    <div class="col me-2">\n                        <div class="text-uppercase text-warning fw-bold text-xs mb-1"><span>Names with possible outbids</span></div>\n                        <div class="text-dark fw-bold h5 mb-0"><span id="outbids-count">${s.length}</span></div>\n                    </div>\n                    <div class="col"><a class="btn btn-primary" role="button" href="/auctions?outbids=true">Show All</a></div>\n                    <div class="col-auto">\n                        <svg class="fa-2x text-gray-300" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="1em" viewBox="0 0 24 24" width="1em" fill="currentColor">\n                            <g><rect fill="none" height="24" width="24"></rect></g>\n                            <g>\n                                <path d="M12,2C6.48,2,2,6.48,2,12c0,5.52,4.48,10,10,10s10-4.48,10-10C22,6.48,17.52,2,12,2z M7,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C8.5,12.83,7.83,13.5,7,13.5z M12,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C13.5,12.83,12.83,13.5,12,13.5z M17,13.5c-0.83,0-1.5-0.67-1.5-1.5 c0-0.83,0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5C18.5,12.83,17.83,13.5,17,13.5z"></path>\n                            </g>\n                        </svg>\n                    </div>\n                </div>\n            </div>\n        </div>\n    `,document.getElementById("actions-row").appendChild(i)}window.addEventListener("load",(async()=>{updateActions()})),setInterval((async function(){updateActions()}),2e4);

templates/auction.html

@@ -66,9 +66,9 @@
                 <div class="container-fluid">
                     <div class="card">
                         <div class="card-body">
-                            <div id="next-action" class="stick-right">{{next_action|safe}}</div>
+                            <div class="stick-right">{{next_action|safe}}</div>
                             <h4 class="card-title">{{rendered}}</h4>
-                            <h6 class="text-muted mb-2 card-subtitle" id="next">{{next | safe}}</h6>
+                            <h6 class="text-muted mb-2 card-subtitle">{{next | safe}}</h6>
                         </div>
                     </div>
                 </div>
@@ -96,89 +96,11 @@
                 <th></th>
             </tr>
         </thead>
-        <tbody id="bids-tbody">
+        <tbody>
-            <tr id="loading-row">
+            {{bids | safe}}
-                <td colspan="5" class="text-center">
-                    <div class="spinner-border spinner-border-sm me-2" role="status">
-                        <span class="visually-hidden">Loading...</span>
-                    </div>
-                    Loading bids...
-                </td>
-            </tr>
         </tbody>
     </table>
 </div>
-
-<script>
-    async function loadBids(initial = false) {
-        const tbody = document.getElementById('bids-tbody');
-
-        try {
-            // Fetch all required data
-            const response = await fetch(`/api/v1/wallet/domainBids?domain={{search_term}}`);
-            const data = await response.json();
-            if (initial) {
-                if (response.ok && data.result) {
-                    tbody.innerHTML = data.result;
-                } else {
-                    tbody.innerHTML = '<tr><td colspan="5" class="text-center text-muted">No bids found. <a href="/auction/{{search_term}}/scan">Rescan Auction</a></td></tr>';
-                }
-            }
-            const mempoolResponse = await fetch('/api/v1/hsd/mempoolBids');
-            const nextStateResponse = await fetch(`/api/v1/hsd/nextAuctionState?domain={{search_term}}`);
-
-            if (!initial) {
-                if (response.ok && data.result) {
-                    tbody.innerHTML = data.result;
-                } else {
-                    tbody.innerHTML = '<tr><td colspan="5" class="text-center text-muted">No bids found. <a href="/auction/{{search_term}}/scan">Rescan Auction</a></td></tr>';
-                }
-            }
-
-
-
-            const nextStateData = await nextStateResponse.json();
-
-            if (nextStateResponse.ok && nextStateData.state) {
-                document.getElementById('next').innerHTML = nextStateData.next;
-                document.getElementById('next-action').innerHTML = nextStateData.next_action;
-            } else {
-                document.getElementById('next').innerHTML = 'Unknown';
-                document.getElementById('next-action').innerHTML = '';
-            }
-
-            const mempoolData = await mempoolResponse.json();
-            if (mempoolResponse.ok && mempoolData.result) {
-                const domainBids = mempoolData.result['{{search_term}}'];
-                if (domainBids && domainBids.length > 0) {
-                    let mempoolRows = '';
-                    domainBids.forEach(bid => {
-                        const bidValue = bid.revealed ? `${(bid.value / 1000000).toFixed(2)} HNS` : 'Hidden until reveal';
-                        const lockupValue = (bid.lockup / 1000000).toFixed(2);
-                        const blindValue = bid.revealed ? `${((bid.lockup - bid.value) / 1000000).toFixed(2)} HNS` : 'Hidden until reveal';
-                        const type = bid.revealed ? 'Reveal' : 'Bid';
-                        mempoolRows += `<tr class="table-warning">
-                            <td>${lockupValue} HNS</td>
-                            <td>${bidValue}</td>
-                            <td>${blindValue}</td>
-                            <td>${bid.owner}</td>
-                            <td><a class='text-decoration-none' style='color: var(--bs-table-color-state, var(--bs-table-color-type, var(--bs-table-color)));' target='_blank' href='https://shakeshift.com/transaction/${bid.txid}'>Mempool ${type} 🔗</a></td>
-                        </tr>`;
-                    });
-                    tbody.innerHTML += mempoolRows;
-                }
-            }
-        } catch (error) {
-            console.error('Error loading bids:', error);
-        }
-    }
-
-    // Load bids when page loads
-    document.addEventListener('DOMContentLoaded', () => loadBids(true));
-
-    // Auto-refresh bids every 20 seconds
-    setInterval(() => loadBids(false), 20000);
-</script>
                         </div>
                     </div>
                 </div>