feat: Add api route for possible outbidded domains

account.py

@@ -10,8 +10,10 @@ import time
 
 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 +47,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 +68,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 +84,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
@@ -110,7 +109,8 @@ def createWallet(account: str, password: str):
         }
     # Create the account
     # Python wrapper doesn't support this yet
-    response = requests.put(get_wallet_api_url(f"wallet/{account}"))
+    response = requests.put(
+        f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}")
     if response.status_code != 200:
         return {
             "error": {
@@ -123,7 +123,7 @@ def createWallet(account: str, password: str):
     seed = seed['mnemonic']['phrase']
 
     # Encrypt the wallet (python wrapper doesn't support this yet)
-    response = requests.post(get_wallet_api_url(f"/wallet/{account}/passphrase"),
+    response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}/passphrase",
                              json={"passphrase": password})
 
     return {
@@ -147,7 +147,8 @@ def importWallet(account: str, password: str, seed: str):
         "mnemonic": seed,
     }
 
-    response = requests.put(get_wallet_api_url(f"/wallet/{account}"), json=data)
+    response = requests.put(
+        f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}", json=data)
     if response.status_code != 200:
         return {
             "error": {
@@ -185,6 +186,7 @@ def selectWallet(account: str):
             }
         }
 
+
 def getBalance(account: str):
     # Get the total balance
     info = hsw.getBalance('default', account)
@@ -249,9 +251,11 @@ def getPendingTX(account: str):
 
 def getDomains(account, own=True):
     if own:
-        response = requests.get(get_wallet_api_url(f"/wallet/{account}/name?own=true"))
+        response = requests.get(
+            f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}/name?own=true")
     else:
-        response = requests.get(get_wallet_api_url(f"/wallet/{account}/name"))
+        response = requests.get(
+            f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}/name")
     info = response.json()
 
     if SHOW_EXPIRED:
@@ -335,9 +339,11 @@ def getTransactions(account, page=1, limit=100):
         lastTX = getTXFromPage(account, page-1, limit)
 
     if lastTX:
-        response = requests.get(get_wallet_api_url(f"/wallet/{account}/tx/history?reverse=true&limit={limit}&after={lastTX}"))
+        response = requests.get(
+            f'http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}/tx/history?reverse=true&limit={limit}&after={lastTX}')
     elif page == 1:
-        response = requests.get(get_wallet_api_url(f"/wallet/{account}/tx/history?reverse=true&limit={limit}"))
+        response = requests.get(
+            f'http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account}/tx/history?reverse=true&limit={limit}')
     else:
         return []
 
@@ -377,7 +383,7 @@ def check_address(address: str, allow_name: bool = True, return_address: bool =
         return check_hip2(address[1:])
 
     # Check if the address is a valid HNS address
-    response = requests.post(get_node_api_url(), json={
+    response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_NODE_PORT}", json={
         "method": "validateaddress",
         "params": [address]
     }).json()
@@ -404,30 +410,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 {
@@ -438,6 +431,8 @@ def send(account, address, amount):
 
     response = hsw.rpc_walletPassphrase(password, 10)
     # Unlock the account
+    # response = requests.post(f"http://x:{APIKEY}@{ip}:{HSD_WALLET_PORT}/wallet/{account_name}/unlock",
+    # json={"passphrase": password,"timeout": 10})
     if response['error'] is not None:
         if response['error']['message'] != "Wallet is not encrypted.":
             return {
@@ -459,38 +454,12 @@ def send(account, address, amount):
 
 
 def isOwnDomain(account, name: str):
-    # Get domain
+    domains = getDomains(account)
-    domain_info = getDomain(name)
+    for domain in domains:
-    owner = getAddressFromCoin(domain_info['info']['owner']['hash'],domain_info['info']['owner']['index'])
+        if domain['name'] == name:
-    # Select the account
+            return True
-    hsw.rpc_selectWallet(account)
-    account = hsw.rpc_getAccount(owner)
-
-    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 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
@@ -505,14 +474,20 @@ def getDomain(domain: str):
 
 def getAddressFromCoin(coinhash: str, coinindex = 0):
     # Get the address from the hash
-    response = requests.get(get_node_api_url(f"coin/{coinhash}/{coinindex}"))
+    response = requests.get(f"http://x:{HSD_API}@{HSD_IP}:{HSD_NODE_PORT}/coin/{coinhash}/{coinindex}")
     if response.status_code != 200:
-        print(f"Error getting address from coin: {response.text}")
+        return {
-        return "No Owner"
+            "error": {
+                "message": "Error getting address from coin"
+            }
+        }
     data = response.json()
     if 'address' not in data:
-        print(json.dumps(data, indent=4))
+        return {
-        return "No Owner"
+            "error": {
+                "message": "Error getting address from coin"
+            }
+        }
     return data['address']
 
 
@@ -659,6 +634,47 @@ def getBids(account, domain="NONE"):
         bids.append(bid)
     return bids
 
+def getPossibleOutbids(account):
+    # Get all bids
+    bids = getBids(account)
+    if 'error' in bids:
+        return []
+    
+    # Get current height
+    current_height = getBlockHeight()
+
+    # Sort out bids older than 720 blocks
+    bids = [bid for bid in bids if (current_height - bid['height']) <= 720]
+    possible_outbids = []
+
+    for bid in bids:
+        domain = bid['name']
+
+        # Check to make sure that bidding is still happening
+        domain_info = getDomain(domain)
+        if 'info' not in domain_info or 'state' not in domain_info['info']:
+            print(f"Domain {domain} not found or no info available",flush=True)
+            continue
+        if domain_info['info']['state'] != "BIDDING":
+            continue
+
+
+        current_highest_bid = bid['value']
+        domain_bids = getBids(account, domain)
+        print(domain)
+        print(json.dumps(domain_bids, indent=4))
+        for domain_bid in domain_bids:
+            if domain_bid["own"]:
+                current_highest_bid = max(current_highest_bid, domain_bid['value'])
+                continue
+            if domain_bid['value'] != -1000000:
+                print("Revealed bid")
+                continue
+            if current_highest_bid < domain_bid["lockup"]:
+                possible_outbids.append(domain)
+                break
+
+    return possible_outbids
 
 def getReveals(account, domain):
     return hsw.getWalletRevealsByName(domain, account)
@@ -732,13 +748,9 @@ def getPendingFinalizes(account, password):
     pending = []
     try:
         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:
-                continue
-            if output['covenant'].get('action') != "FINALIZE":
                 continue
             nameHash = output['covenant']['items'][0]
             # Try to get the name from hash
@@ -812,7 +824,7 @@ def revealAll(account):
                     }
                 }
 
-        return requests.post(get_wallet_api_url(), json={"method": "sendbatch", "params": [[["REVEAL"]]]}).json()
+        return requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}", json={"method": "sendbatch", "params": [[["REVEAL"]]]}).json()
     except Exception as e:
         return {
             "error": {
@@ -846,7 +858,7 @@ def redeemAll(account):
                     }
                 }
 
-        return requests.post(get_wallet_api_url(), json={"method": "sendbatch", "params": [[["REDEEM"]]]}).json()
+        return requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}", json={"method": "sendbatch", "params": [[["REDEEM"]]]}).json()
     except Exception as e:
         return {
             "error": {
@@ -902,12 +914,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
@@ -1120,7 +1130,7 @@ def sendBatch(account, batch):
                         "message": response['error']['message']
                     }
                 }
-        response = requests.post(get_wallet_api_url(), json={
+        response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}", json={
             "method": "sendbatch",
             "params": [batch]
         }).json()
@@ -1169,7 +1179,7 @@ def createBatch(account, batch):
                         "message": response['error']['message']
                     }
                 }
-        response = requests.post(get_wallet_api_url(), json={
+        response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}", json={
             "method": "createbatch",
             "params": [batch]
         }).json()
@@ -1190,80 +1200,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():
@@ -1303,7 +1239,7 @@ def zapTXs(account):
         }
 
     try:
-        response = requests.post(get_wallet_api_url(f"/wallet/{account_name}/zap"),
+        response = requests.post(f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}/wallet/{account_name}/zap",
                                  json={"age": age,
                                        "account": "default"
                                        })
@@ -1432,25 +1368,3 @@ def generateReport(account, format="{name},{expiry},{value},{maxBid}"):
 
 def convertHNS(value: int):
     return value/1000000
-    return value/1000000
-
-
-def get_node_api_url(path=''):
-    """Construct a URL for the HSD node API."""
-    base_url = f"http://x:{HSD_API}@{HSD_IP}:{HSD_NODE_PORT}"
-    if path:
-        # Ensure path starts with a slash if it's not empty
-        if not path.startswith('/'):
-            path = f'/{path}'
-        return f"{base_url}{path}"
-    return base_url
-
-def get_wallet_api_url(path=''):
-    """Construct a URL for the HSD wallet API."""
-    base_url = f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}"
-    if path:
-        # Ensure path starts with a slash if it's not empty
-        if not path.startswith('/'):
-            path = f'/{path}'
-        return f"{base_url}{path}"
-    return base_url

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

@@ -32,40 +32,12 @@ revokeCheck = random.randint(100000,999999)
 
 THEME = os.getenv("THEME")
 
-
-def blocks_to_time(blocks: int) -> str:
-    """
-    Convert blocks to time in a human-readable format.
-    Blocks are mined approximately every 10 minutes.
-    """
-    if blocks < 0:
-        return "Invalid time"
-    
-    if blocks < 6:
-        return f"{blocks * 10} mins"
-    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"
-        
-    
-    
-
-
 @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")
@@ -113,7 +85,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 +106,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 +141,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 +173,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 +182,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'])
     
 
 
@@ -363,9 +334,6 @@ def revealAllBids():
         return redirect("/logout")
 
     response = account_module.revealAll(request.cookies.get("account"))
-    if not response:
-        return redirect("/auctions?message=Failed to reveal bids")
-
     if 'error' in response:
         if response['error'] != None:
             if response['error']['message'] == "Nothing to do.":
@@ -386,9 +354,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 +373,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 +398,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 +412,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 +428,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>"
@@ -485,12 +445,10 @@ def search():
                                state="AVAILABLE", next="Available Now",plugins=plugins)
 
     state = domain['info']['state']
-    stats = domain['info']['stats']
-    next = ""
     if state == 'CLOSED':
         if domain['info']['registered']:
             state = 'REGISTERED'
-            expires = stats['daysUntilExpire']
+            expires = domain['info']['stats']['daysUntilExpire']
             next = f"Expires in ~{expires} days"
         else:
             state = 'AVAILABLE'
@@ -498,11 +456,11 @@ def search():
     elif state == "REVOKED":
             next = "Available Now"
     elif state == 'OPENING':
-        next = f"Bidding opens in {str(stats['blocksUntilBidding'])} blocks (~{blocks_to_time(stats['blocksUntilBidding'])})"
+        next = "Bidding opens in ~" + str(domain['info']['stats']['blocksUntilBidding']) + " blocks"
     elif state == 'BIDDING':
-        next = f"Reveal in {str(stats['blocksUntilReveal'])} blocks (~{blocks_to_time(stats['blocksUntilReveal'])})"
+        next = "Reveal in ~" + str(domain['info']['stats']['blocksUntilReveal']) + " blocks"
     elif state == 'REVEAL':
-        next = f"Reveal ends in {str(stats['blocksUntilClose'])} blocks (~{blocks_to_time(stats['blocksUntilClose'])})"
+        next = "Reveal ends in ~" + str(domain['info']['stats']['blocksUntilClose']) + " blocks"
 
 
 
@@ -543,8 +501,11 @@ def manage(domain: str):
         return redirect("/logout")
     
     domain = domain.lower()
-
+    
-    if not account_module.isOwnDomain(account, domain):
+    own_domains = account_module.getDomains(account)
+    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)
     
     domain_info = account_module.getDomain(domain)
@@ -553,10 +514,7 @@ def manage(domain: str):
                                rendered=renderDomain(domain),
                                domain=domain, error=domain_info['error'])
     
-    if domain_info['info'] is not None and 'stats' in domain_info['info'] and 'daysUntilExpire' in domain_info['info']['stats']:
+    expiry = domain_info['info']['stats']['daysUntilExpire']
-        expiry = domain_info['info']['stats']['daysUntilExpire']
-    else:
-        expiry = "Unknown"
     dns = account_module.getDNS(domain)
     raw_dns = str(dns).replace("'",'"')
     dns = render.dns(dns)
@@ -583,7 +541,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 +646,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 +660,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):
@@ -728,11 +686,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 +703,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 +740,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 +771,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 +781,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 +806,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 +823,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 +843,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,10 +887,20 @@ def auction(domain):
 
     state = domainInfo['info']['state']
     next_action = ''
-    next = ""
 
-    bids = []
+    bids = account_module.getBids(account,search_term)
-    stats = domainInfo['info']['stats'] if 'stats' in domainInfo['info'] else {}
+    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)
+
+
     if state == 'CLOSED':
         if not domainInfo['info']['registered']:
             if account_module.isOwnDomain(account,domain):
@@ -953,27 +919,20 @@ def auction(domain):
             expires = domainInfo['info']['stats']['daysUntilExpire']
             next = f"Expires in ~{expires} days"
 
-            if account_module.isOwnDomain(account,domain):
+            own_domains = account_module.getDomains(account)
+            own_domains = [x['name'] for x in own_domains]
+            own_domains = [x.lower() for x in own_domains]
+            if search_term in own_domains:
                 next_action = f'<a href="/manage/{domain}">Manage</a>'
     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'])})"
+        next = "Bidding opens in ~" + str(domainInfo['info']['stats']['blocksUntilBidding']) + " blocks"
     elif state == 'BIDDING':
-        next = f"Reveal in {stats['blocksUntilReveal']} blocks (~{blocks_to_time(stats['blocksUntilReveal'])})"
+        next = "Reveal in ~" + str(domainInfo['info']['stats']['blocksUntilReveal']) + " blocks"
-        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 = "Reveal ends in ~" + str(domainInfo['info']['stats']['blocksUntilClose']) + " blocks"
         next_action = f'<a href="/auction/{domain}/reveal">Reveal All</a>'
 
     message = ''
@@ -1013,8 +972,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 +1018,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 +1038,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 +1057,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):
@@ -1111,10 +1070,10 @@ def reveal_auction(domain):
         return redirect("/logout")
     
     domain = domain.lower()
-    response = account_module.revealAuction(request.cookies.get("account"),domain)
+    response = account_module(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 +1088,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 +1115,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 +1154,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 +1177,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 +1186,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 +1227,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 +1242,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 +1262,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 +1291,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 +1306,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 +1507,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 +1541,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 +1575,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 +1586,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 +1626,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 +1638,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 +1653,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 +1715,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",
@@ -228,6 +210,7 @@ def dns(data, edit=False):
     html_output = ""
     index = 0
     for entry in data:
+        print(entry, flush=True)
         html_output += f"<tr><td>{entry['type']}</td>\n"
         
         if entry['type'] != 'DS' and not entry['type'].startswith("GLUE") and not entry['type'].startswith("SYNTH"):
@@ -296,60 +279,30 @@ def timestamp_to_readable_time(timestamp):
     return readable_time
 
 def bids(bids,reveals):
-    # Create a list to hold bid data for sorting
+    html = ''
-    bid_data = []
-    
-    # Prepare data for sorting
     for bid in bids:
-        lockup = bid['lockup'] / 1000000
+        lockup = bid['lockup']
+        lockup = lockup / 1000000
+        html += "<tr>"
+        html += f"<td>{lockup:,.2f} HNS</td>"
         revealed = False
-        value = 0
-        
-        # Check if this bid has been revealed
         for reveal in reveals:
             if reveal['bid'] == bid['prevout']['hash']:
                 revealed = True
-                value = reveal['value'] / 1000000
+                value = reveal['value']
+                value = value / 1000000
+                html += f"<td>{value:,.2f} HNS</td>"
+                bidValue = lockup - value
+                html += f"<td>{bidValue:,.2f} HNS</td>"                               
                 break
-        
+        if not revealed:
-        # Store all relevant information for sorting and display
-        bid_data.append({
-            'bid': bid,
-            'lockup': lockup,
-            'revealed': revealed,
-            '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)
-    
-    # Generate HTML from sorted data
-    html = ''
-    for data in bid_data:
-        bid = data['bid']
-        lockup = data['lockup']
-        revealed = data['revealed']
-        value = data['value']
-        
-        html += "<tr>"
-        html += f"<td>{lockup:,.2f} HNS</td>"
-        
-        if revealed:
-            bidValue = lockup - value
-            html += f"<td>{value:,.2f} HNS</td>"
-            html += f"<td>{bidValue:,.2f} HNS</td>"
-        else:
             html += f"<td>Hidden until reveal</td>"
             html += f"<td>Hidden until reveal</td>"
-            
         if bid['own']:
             html += "<td>You</td>"
         else:
-            html += f"<td>Unknown</td>"
+            html += "<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 += "</tr>"
-        
     return html
 
 
@@ -375,7 +328,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 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 +344,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 +511,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 +525,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/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}}</h6>
                         </div>
                     </div>
                 </div>
@@ -93,92 +93,13 @@
                 <th>Bid</th>
                 <th>Blind</th>
                 <th>Owner</th>
-                <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>