fix: Don't allow alerts without an ID to be dismissed

Reviewed-on: #7

.dockerignore

@@ -0,0 +1,32 @@
+
+.env
+.env*
+__pycache__/
+
+templates/assets/css/styles.min.css
+
+ignore/
+
+plugins/signatures.json
+
+.venv/
+
+user_data/
+customPlugins/
+cache/
+build/
+dist/
+hsd/
+hsd-data/
+hsd.lock
+hsdconfig.json
+
+Dockerfile
+Dockerfile.hsd
+FireWalletBrowser.bsdesign
+LICENSE.md
+README.md
+docker-compose.yml
+example.env
+plugins.md
+

.gitattributes

@@ -0,0 +1 @@
+*.bsdesign filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/build.yml

@@ -4,11 +4,22 @@ on:
   push:
 
 jobs:
-  Build Image:
+  Build Images:
     runs-on: [ubuntu-latest, amd]
+    strategy:
+      matrix:
+        variant:
+          - target: default
+            tag_suffix: ""
+            dockerfile: "Dockerfile"
+          - target: hsd
+            tag_suffix: "-hsd"
+            dockerfile: "Dockerfile.hsd"
+
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Docker
         run : |
           apt-get install ca-certificates curl gnupg
@@ -34,8 +45,8 @@ jobs:
           fi
           
 
-          docker build -t firewallet:$tag_num .
+          docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$GITEA_SHA --build-arg VERSION=$GITEA_TAG --file ${{matrix.variant.dockerfile}} -t firewallet${{matrix.variant.tag_suffix}}:$tag_num .
-          docker tag firewallet:$tag_num git.woodburn.au/nathanwoodburn/firewallet:$tag_num
+          docker tag firewallet${{matrix.variant.tag_suffix}}:$tag_num git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag_num
-          docker push git.woodburn.au/nathanwoodburn/firewallet:$tag_num
+          docker push git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag_num
-          docker tag firewallet:$tag_num git.woodburn.au/nathanwoodburn/firewallet:$tag
+          docker tag firewallet${{matrix.variant.tag_suffix}}:$tag_num git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag
-          docker push git.woodburn.au/nathanwoodburn/firewallet:$tag
+          docker push git.woodburn.au/nathanwoodburn/firewallet${{matrix.variant.tag_suffix}}:$tag

.gitea/workflows/test.yml

@@ -0,0 +1,40 @@
+name: Tests and Linting
+run-name: Python Compatibility and Linting tests
+on:
+  push:
+
+jobs:
+  Tests-Linting:
+    runs-on: [ubuntu-latest, amd]
+    container: catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.11', '3.13']
+      fail-fast: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then
+            pip install -r requirements.txt
+          fi
+          pip install pytest ruff
+          
+      - name: Test with pytest
+        run: |
+          echo "Testing with Python ${{ matrix.python-version }}"
+          python -m pytest main.py
+      
+      - name: Lint with ruff
+        run: |
+          echo "Linting with Python ${{ matrix.python-version }}"
+          ruff check

.gitignore

@@ -17,6 +17,7 @@ cache/
 build/
 dist/
 hsd/
-hsd-data/
+hsd_data/
+logs/
 hsd.lock
 hsdconfig.json

Dockerfile

@@ -1,7 +1,7 @@
-FROM --platform=$BUILDPLATFORM python:3.10-alpine AS builder
+FROM --platform=$BUILDPLATFORM python:3.13-alpine AS builder
 
 WORKDIR /app
-
+RUN apk add git openssl curl
 COPY requirements.txt /app
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip3 install -r requirements.txt
@@ -9,10 +9,21 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 COPY . /app
 
 # Add mount point for data volume
-# VOLUME /data
+VOLUME /app/user_data
-RUN apk add git openssl curl
+
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL org.opencontainers.image.title="FireWallet" \
+      org.opencontainers.image.description="The Handshake Wallet That is Fire" \
+      org.opencontainers.image.url="https://firewallet.au" \
+      org.opencontainers.image.source="https://git.woodburn.au/nathanwoodburn/firewalletbrowser" \
+      org.opencontainers.image.version="2.0.0" \
+      org.opencontainers.image.created=$BUILD_DATE \
+      org.opencontainers.image.licenses="AGPL-3.0-only"
 
 ENTRYPOINT ["python3"]
 CMD ["server.py"]
 
-FROM builder as dev-envs
+FROM builder AS dev-envs

Dockerfile.hsd

@@ -0,0 +1,57 @@
+# ---- HSD build stage ----
+FROM node:22-alpine AS hsd-build
+WORKDIR /opt/hsd
+RUN apk add --no-cache git bash unbound-dev gmp-dev g++ gcc make python3
+RUN git clone --depth=1 --branch v8.0.0 https://github.com/handshake-org/hsd.git .
+RUN npm install --omit=dev
+
+# ---- Final stage ----
+FROM python:3.13-alpine
+WORKDIR /app
+
+# Install runtime deps only
+RUN apk add --no-cache unbound-dev gmp
+
+
+# Copy node and npm from hsd-build stage
+COPY --from=hsd-build /usr/local/bin/node /usr/local/bin/node
+COPY --from=hsd-build /usr/local/lib/node_modules/npm /usr/local/lib/node
+COPY --from=hsd-build /usr/local/bin/npm /usr/local/bin/npm
+
+# Copy FireWallet dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy HSD from build stage
+COPY --from=hsd-build /opt/hsd /app/hsd
+
+# Copy FireWallet source
+COPY . .
+
+# Expose ports
+EXPOSE 5000
+# Optional HSD ports
+# EXPOSE 12037
+# EXPOSE 12039
+
+ENV INTERNAL_HSD=true
+ENV HSD_DOCKER_CONTAINER=true
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL org.opencontainers.image.title="FireWallet (HSD)" \
+      org.opencontainers.image.description="The Handshake Wallet That is Fire" \
+      org.opencontainers.image.url="https://firewallet.au" \
+      org.opencontainers.image.source="https://git.woodburn.au/nathanwoodburn/firewalletbrowser" \
+      org.opencontainers.image.version="2.0.0" \
+      org.opencontainers.image.created=$BUILD_DATE \
+      org.opencontainers.image.licenses="AGPL-3.0-only"
+
+
+
+VOLUME ["/app/hsd_data", "/app/user_data"]
+
+
+ENTRYPOINT ["python3"]
+CMD ["server.py"]

README.md

@@ -13,6 +13,17 @@ cp example.env .env
 Edit .env to have your HSD api key.
 If you have HSD runnning on a separate computer also add the IP here
 
+For a quick and easy installation on ubuntu/debian you can run the install.sh script
+```bash
+curl https://firewallet.au/install.sh | bash
+```
+This will install all dependencies (including Node/NPM for an internal HSD node), create a python virtual environment and install the required python packages.  
+After the script has run you can start the wallet with
+```bash
+./start.sh
+```
+
+
 ## Usage
 
 Make sure HSD is running then run the following commands:

account.py

@@ -13,7 +13,8 @@ import signal
 import sys
 import threading
 import sqlite3
-from functools import wraps
+import logging
+logger = logging.getLogger("firewallet")
 
 
 dotenv.load_dotenv()
@@ -131,7 +132,7 @@ def check_password(cookie: str|None, password: str|None):
         password = ""
     
     account = check_account(cookie)
-    if account == False:
+    if not account:
         return False
 
     # Check if the password is valid
@@ -271,7 +272,7 @@ def getCachedDomains():
             domain_cache[row['name']] = json.loads(row['info'])
             domain_cache[row['name']]['last_updated'] = row['last_updated']
         except json.JSONDecodeError:
-            print(f"Error parsing cached data for domain {row['name']}")
+            logger.error(f"Error parsing cached data for domain {row['name']}")
     
     conn.close()
     return domain_cache
@@ -311,7 +312,7 @@ def update_domain_cache(domain_names: list):
                 domain_info = getDomain(domain_name)
                 
                 if 'error' in domain_info or not domain_info.get('info'):
-                    print(f"Failed to get info for domain {domain_name}: {domain_info.get('error', 'Unknown error')}", flush=True)
+                    logger.error(f"Failed to get info for domain {domain_name}: {domain_info.get('error', 'Unknown error')}")
                     continue
                 
                 # Update or insert into database
@@ -323,9 +324,9 @@ def update_domain_cache(domain_names: list):
                     (domain_name, serialized_info, now)
                 )
                 
-                print(f"Updated cache for domain {domain_name}")
+                logger.info(f"Updated cache for domain {domain_name}")
             except Exception as e:
-                print(f"Error updating cache for domain {domain_name}: {str(e)}")
+                logger.error(f"Error updating cache for domain {domain_name}: {str(e)}", exc_info=True)
             finally:
                 # Always remove from active set, even if there was an error
                 with DOMAIN_UPDATE_LOCK:
@@ -337,20 +338,21 @@ def update_domain_cache(domain_names: list):
         conn.close()
         
     except Exception as e:
-        print(f"Error updating domain cache: {str(e)}", flush=True)
+        logger.error(f"Error updating domain cache: {str(e)}", exc_info=True)
         # Make sure to clean up the active set on any exception
         with DOMAIN_UPDATE_LOCK:
             for domain in domains_to_update:
                 if domain in ACTIVE_DOMAIN_UPDATES:
                     ACTIVE_DOMAIN_UPDATES.remove(domain)
     
-    print("Updated cache for domains")
+    logger.info("Updated cache for domains")
 
 
 def getBalance(account: str):
     # Get the total balance
     info = hsw.getBalance('default', account)
     if 'error' in info:
+        logger.error(f"Error getting balance for account {account}: {info['error']}")
         return {'available': 0, 'total': 0}
 
     total = info['confirmed']
@@ -360,6 +362,7 @@ def getBalance(account: str):
     # Convert to HNS
     total = total / 1000000
     available = available / 1000000
+    logger.debug(f"Initial balance for account {account}: total={total}, available={available}, locked={locked}")
 
     domains = getDomains(account)
     domainValue = 0
@@ -403,6 +406,7 @@ def getBalance(account: str):
                     if domain_info.get('info', {}).get('state', "") == "CLOSED":
                         domainValue += domain_info.get('info', {}).get('value', 0)
             except json.JSONDecodeError:
+                logger.warning(f"Error parsing cached data for domain {domain_name}")
                 # Only add for update if not already being updated
                 with DOMAIN_UPDATE_LOCK:
                     if domain_name not in ACTIVE_DOMAIN_UPDATES:
@@ -425,6 +429,7 @@ def getBalance(account: str):
     
     total = total - (domainValue/1000000)
     locked = locked - (domainValue/1000000)
+    logger.debug(f"Adjusted balance for account {account}: total={total}, available={available}, locked={locked}")
 
     # Only keep 2 decimal places
     total = round(total, 2)
@@ -595,14 +600,14 @@ def getTransactions(account, page=1, limit=100):
         return []
 
     if response.status_code != 200:
-        print(response.text)
+        logger.error(f"Error fetching transactions: {response.status_code} - {response.text}")
         return []
     data = response.json()
 
     # Refresh the cache if the next page is different
     nextPage = getPageTXCache(account, page, limit)
     if nextPage is not None and nextPage != data[-1]['hash']:
-        print(f'Refreshing page {page}')
+        logger.info(f'Refreshing tx page {page}')
         pushPageTXCache(account, page, data[-1]['hash'], limit)
     return data
 
@@ -639,7 +644,7 @@ def check_address(address: str, allow_name: bool = True, return_address: bool =
             return False
         return 'Invalid address'
 
-    if response['result']['isvalid'] == True:
+    if response['result']['isvalid']:
         if return_address:
             return address
         return 'Valid address'
@@ -789,11 +794,12 @@ def getAddressFromCoin(coinhash: str, coinindex = 0):
     # Get the address from the hash
     response = requests.get(get_node_api_url(f"coin/{coinhash}/{coinindex}"))
     if response.status_code != 200:
-        print(f"Error getting address from coin")
+        logger.error("Error getting address from coin")
         return "No Owner"
     data = response.json()
     if 'address' not in data:
-        print(json.dumps(data, indent=4))
+        logger.error("Error getting address from coin")
+        logger.error(json.dumps(data, indent=4))
         return "No Owner"
     return data['address']
 
@@ -802,7 +808,7 @@ def renewDomain(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -835,7 +841,7 @@ def getDNS(domain: str):
         return {
             "error": "No DNS records"
         }
-    if response['result'] == None:
+    if response['result'] is None:
         return []
 
     if 'records' not in response['result']:
@@ -847,7 +853,7 @@ def setDNS(account, domain, records):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -919,7 +925,7 @@ def getNodeSync():
 
 def getWalletStatus():
     response = hsw.rpc_getWalletInfo()
-    if 'error' in response and response['error'] != None:
+    if 'error' in response and response['error'] is not None:
         return "Error"
 
     # return response
@@ -968,7 +974,7 @@ def getPendingReveals(account):
                 if bid['name'] == domain['name']:
                     state_found = False
                     for reveal in reveals:
-                        if reveal['own'] == True:
+                        if reveal['own']:
                             if bid['value'] == reveal['value']:
                                 state_found = True
 
@@ -998,8 +1004,8 @@ def getPendingRedeems(account, password):
                 pending.append(nameHash)
             else:
                 pending.append(name['result'])
-    except:
+    except Exception as e:
-        print("Failed to parse redeems")
+        logger.error(f"Failed to parse redeems: {str(e)}", exc_info=True)
 
     return pending
 
@@ -1009,7 +1015,7 @@ def getPendingRegisters(account):
     domains = getDomains(account, False)
     pending = []
     for domain in domains:
-        if domain['state'] == "CLOSED" and domain['registered'] == False:
+        if domain['state'] == "CLOSED" and not domain['registered']:
             for bid in bids:
                 if bid['name'] == domain['name']:
                     if bid['value'] == domain['highest']:
@@ -1027,9 +1033,9 @@ def getPendingFinalizes(account, password):
     pending = []
     try:
         for output in tx['outputs']:
-            if type(output) != dict:
+            if type(output) is not dict:
                 continue
-            if not 'covenant' in output:
+            if 'covenant' not in output:
                 continue
             if output['covenant'].get("type") != 10:
                 continue
@@ -1042,8 +1048,8 @@ def getPendingFinalizes(account, password):
                 pending.append(nameHash)
             else:
                 pending.append(name['result'])
-    except:
+    except Exception as e:
-        print("Failed to parse finalizes")
+        logger.error(f"Failed to parse finalizes: {str(e)}", exc_info=True)
     return pending
 
 
@@ -1053,9 +1059,8 @@ def getRevealTX(reveal):
     index = prevout['index']
     tx = hsd.getTxByHash(hash)
     if 'inputs' not in tx:
-        print(f'Something is up with this tx: {hash}')
+        logger.error(f'Something is up with this tx: {hash}')
-        print(tx)
+        logger.error(tx)
-        print('---')
         # No idea what happened here
         # Check if registered?
         return None
@@ -1066,7 +1071,7 @@ def revealAuction(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1086,7 +1091,7 @@ def revealAll(account):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1120,7 +1125,7 @@ def redeemAll(account):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1152,9 +1157,8 @@ def redeemAll(account):
 
 def registerAll(account):
     account_name = check_account(account)
-    password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1177,9 +1181,8 @@ def registerAll(account):
 
 def finalizeAll(account):
     account_name = check_account(account)
-    password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1212,7 +1215,7 @@ def bid(account, domain, bid, blind):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1237,7 +1240,7 @@ def openAuction(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1259,7 +1262,7 @@ def transfer(account, domain, address):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1281,7 +1284,7 @@ def finalize(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1318,7 +1321,7 @@ def cancelTransfer(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1355,7 +1358,7 @@ def revoke(account, domain):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1392,7 +1395,7 @@ def sendBatch(account, batch):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1441,7 +1444,7 @@ def createBatch(account, batch):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1501,10 +1504,10 @@ def getMempoolBids():
     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']}")
+            logger.error(f"Error getting tx {txid}: {tx['error']}")
             continue
         if 'outputs' not in tx:
-            print(f"Error getting outputs for tx {txid}")
+            logger.error(f"Error getting outputs for tx {txid}")
             continue
         for output in tx['outputs']:
             if output['covenant']['action'] not in ["BID", "REVEAL"]:
@@ -1585,12 +1588,10 @@ def resendTXs():
         }
 
 
-def zapTXs(account):
+def zapTXs(account, age=1200):
-    age = 60 * 20  # 20 minutes
-
     account_name = check_account(account)
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1616,7 +1617,7 @@ def getxPub(account):
     if account.count(":") > 0:
         account_name = check_account(account)
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1644,7 +1645,7 @@ def signMessage(account, domain, message):
     account_name = check_account(account)
     password = ":".join(account.split(":")[1:])
 
-    if account_name == False:
+    if not account_name:
         return {
             "error": {
                 "message": "Invalid account"
@@ -1684,6 +1685,7 @@ def verifyMessageWithName(domain, signature, message):
             return response['result']
         return False
     except Exception as e:
+        logger.error(f"Error verifying message with name: {str(e)}", exc_info=True)
         return False
 
 
@@ -1694,6 +1696,7 @@ def verifyMessage(address, signature, message):
             return response['result']
         return False
     except Exception as e:
+        logger.error(f"Error verifying message: {str(e)}", exc_info=True)
         return False
 
 # endregion
@@ -1740,7 +1743,7 @@ def get_node_api_url(path=''):
     base_url = f"http://x:{HSD_API}@{HSD_IP}:{HSD_NODE_PORT}"
     if isSPV() and any(path.startswith(route) for route in SPV_EXTERNAL_ROUTES):
         # If in SPV mode and the path is one of the external routes, use the external API
-        base_url = f"https://hsd.hns.au/api/v1"
+        base_url = "https://hsd.hns.au/api/v1"
         
     if path:
         # Ensure path starts with a slash if it's not empty
@@ -1785,32 +1788,39 @@ def checkPreRequisites() -> dict[str, bool]:
         "hsd": False
     }
     
-    # Check if node is installed and get version
+    try:
-    nodeSubprocess = subprocess.run(["node", "-v"], capture_output=True, text=True)
+        # Check if node is installed and get version
-    if nodeSubprocess.returncode == 0:
+        nodeSubprocess = subprocess.run(["node", "-v"], capture_output=True, text=True,timeout=2)
-        major_version = int(nodeSubprocess.stdout.strip().lstrip('v').split('.')[0])
+        if nodeSubprocess.returncode == 0:
-        if major_version >= HSD_CONFIG.get("minNodeVersion", 20):
+            major_version = int(nodeSubprocess.stdout.strip().lstrip('v').split('.')[0])
-            prerequisites["node"] = True
+            if major_version >= HSD_CONFIG.get("minNodeVersion", 20):
+                prerequisites["node"] = True
+    except Exception:
+        pass
     
-    # Check if npm is installed
+    try:
-    npmSubprocess = subprocess.run(["npm", "-v"], capture_output=True, text=True)
+        # Check if npm is installed
-    if npmSubprocess.returncode == 0:
+        npmSubprocess = subprocess.run(["npm", "-v"], capture_output=True, text=True,timeout=2)
-        major_version = int(npmSubprocess.stdout.strip().split('.')[0])
+        if npmSubprocess.returncode == 0:
-        if major_version >= HSD_CONFIG.get("minNPMVersion", 8):
+            major_version = int(npmSubprocess.stdout.strip().split('.')[0])
-            prerequisites["npm"] = True
+            if major_version >= HSD_CONFIG.get("minNPMVersion", 8):
+                prerequisites["npm"] = True
+    except Exception:
+        pass
+
+    try:
+        # Check if git is installed
+        gitSubprocess = subprocess.run(["git", "--version"], capture_output=True, text=True,timeout=2)
+        if gitSubprocess.returncode == 0:
+            prerequisites["git"] = True
+    except Exception:
+        pass
 
-    # Check if git is installed
-    gitSubprocess = subprocess.run(["git", "-v"], capture_output=True, text=True)
-    if gitSubprocess.returncode == 0:
-        prerequisites["git"] = True
     
     # Check if hsd is installed
     if os.path.exists("./hsd/bin/hsd"):
         prerequisites["hsd"] = True
 
-    
-
-
     return prerequisites
 
 
@@ -1818,26 +1828,43 @@ def checkPreRequisites() -> dict[str, bool]:
 def hsdInit():
     if not HSD_INTERNAL_NODE:
         return
-    prerequisites = checkPreRequisites()
     
+    # Don't check prerequisites if HSD is included in a docker container
+    if os.getenv("HSD_DOCKER_CONTAINER", "false").lower() == "true":
+        prerequisites = {
+            "node": True,
+            "npm": True,
+            "git": True,
+            "hsd": True
+        }
+    else:
+        prerequisites = checkPreRequisites()
+    
+    minNodeVersion = HSD_CONFIG.get("minNodeVersion", 20)
+    minNPMVersion = HSD_CONFIG.get("minNpmVersion", 8)
     PREREQ_MESSAGES = {
-        "node": "Install Node.js from https://nodejs.org/en/download (Version >= {minNodeVersion})",
+        "node": f"Install Node.js from https://nodejs.org/en/download (Version >= {minNodeVersion})",
-        "npm": "Install npm (version >= {minNPMVersion}) - usually comes with Node.js",
+        "npm": f"Install npm (version >= {minNPMVersion}) - usually comes with Node.js",
         "git": "Install Git from https://git-scm.com/downloads"}
 
 
     # Check if all prerequisites are met (except hsd)
     if not all(prerequisites[key] for key in prerequisites if key != "hsd"):
-        print("HSD Internal Node prerequisites not met:")
+        print("HSD Internal Node prerequisites not met:",flush=True)
+        logger.error("HSD Internal Node prerequisites not met:")
         for key, value in prerequisites.items():
             if not value:
-                print(f" - {key} is missing or does not meet the version requirement.")
+                print(f" - {key} is missing or does not meet the version requirement.",flush=True)
-                exit(1)
+                logger.error(f" - {key} is missing or does not meet the version requirement.")
+                if key in PREREQ_MESSAGES:
+                    print(PREREQ_MESSAGES[key],flush=True)
+                    logger.error(PREREQ_MESSAGES[key])
+        exit(1)
         return
     
     # Check if hsd is installed
     if not prerequisites["hsd"]:
-        print("HSD not found, installing...")
+        logger.info("HSD not found, installing...")
         # If hsd folder exists, remove it
         if os.path.exists("hsd"):
             os.rmdir("hsd")
@@ -1845,19 +1872,22 @@ def hsdInit():
         # Clone hsd repo
         gitClone = subprocess.run(["git", "clone", "--depth", "1", "--branch", HSD_CONFIG.get("version", "latest"), "https://github.com/handshake-org/hsd.git", "hsd"], capture_output=True, text=True)
         if gitClone.returncode != 0:
-            print("Failed to clone hsd repository:")
+            print("Failed to clone hsd repository:",flush=True)
-            print(gitClone.stderr)
+            logger.error("Failed to clone hsd repository:")
+            print(gitClone.stderr,flush=True)
+            logger.error(gitClone.stderr)
             exit(1)
-        print("Cloned hsd repository.")
+        logger.info("Cloned hsd repository.")
+        logger.info("Installing hsd dependencies...")
         # Install hsd dependencies
-        print("Installing hsd dependencies...")
         npmInstall = subprocess.run(["npm", "install"], cwd="hsd", capture_output=True, text=True)
         if npmInstall.returncode != 0:
-            print("Failed to install hsd dependencies:")
+            print("Failed to install hsd dependencies:",flush=True)
-            print(npmInstall.stderr)
+            logger.error("Failed to install hsd dependencies:")
+            print(npmInstall.stderr,flush=True)
+            logger.error(npmInstall.stderr)
             exit(1) 
-        print("Installed hsd dependencies.")       
+        logger.info("Installed hsd dependencies.")
-
 def hsdStart():
     global HSD_PROCESS
     global SPV_MODE
@@ -1868,12 +1898,12 @@ def hsdStart():
     if os.path.exists("hsd.lock"):
         lock_time = os.path.getmtime("hsd.lock")
         if time.time() - lock_time < 30:
-            print("HSD was started recently, skipping start.")
+            logger.info("HSD was started recently, skipping start.")
             return
         else:
             os.remove("hsd.lock")
     
-    print("Starting HSD...")
+    logger.info("Starting HSD...")
     # Create a lock file
     with open("hsd.lock", "w") as f:
         f.write(str(time.time()))
@@ -1882,7 +1912,7 @@ def hsdStart():
     chain_migrate = HSD_CONFIG.get("chainMigrate", False)
     wallet_migrate = HSD_CONFIG.get("walletMigrate", False)
     spv = HSD_CONFIG.get("spv", False)
-    prefix = HSD_CONFIG.get("prefix", os.path.join(os.getcwd(), "hsd-data"))
+    prefix = HSD_CONFIG.get("prefix", os.path.join(os.getcwd(), "hsd_data"))
 
 
     # Base command
@@ -1917,7 +1947,7 @@ def hsdStart():
         text=True
     )
     
-    print(f"HSD started with PID {HSD_PROCESS.pid}")
+    logger.info(f"HSD started with PID {HSD_PROCESS.pid}")
 
     atexit.register(hsdStop)
 
@@ -1925,7 +1955,8 @@ def hsdStart():
     try:
         signal.signal(signal.SIGINT, lambda s, f: (hsdStop(), sys.exit(0)))
         signal.signal(signal.SIGTERM, lambda s, f: (hsdStop(), sys.exit(0)))
-    except:
+    except Exception as e:
+        logger.error(f"Failed to set signal handlers: {str(e)}", exc_info=True)
         pass
 
 
@@ -1935,16 +1966,16 @@ def hsdStop():
     if HSD_PROCESS is None:
         return
     
-    print("Stopping HSD...")
+    logger.info("Stopping HSD...")
 
     # Send SIGINT (like Ctrl+C)
     HSD_PROCESS.send_signal(signal.SIGINT)
 
     try:
         HSD_PROCESS.wait(timeout=10)  # wait for graceful exit
-        print("HSD shut down cleanly.")
+        logger.info("HSD shut down cleanly.")
     except subprocess.TimeoutExpired:
-        print("HSD did not exit yet, is it alright???")
+        logger.warning("HSD did not exit yet, is it alright???")
     
     # Clean up lock file
     if os.path.exists("hsd.lock"):
@@ -1957,8 +1988,6 @@ def hsdRestart():
     time.sleep(2)
     hsdStart()
 
-
-checkPreRequisites()
 hsdInit()
 hsdStart()
 # endregion

docker-compose-internal.yml

@@ -0,0 +1,12 @@
+services:
+  firewallet:
+    image: git.woodburn.au/nathanwoodburn/firewallet-hsd:latest
+    ports:
+      - "5000:5000"
+    volumes:
+      - hsd_data:/app/hsd_data
+      - user_data:/app/user_data
+
+volumes:
+  hsd_data:
+  user_data:

docker-compose.yml

@@ -0,0 +1,26 @@
+services:
+  hsd:
+    image: ghcr.io/handshake-org/hsd:8
+    volumes:
+      - hsd_data:/root/.hsd
+    environment:
+      - HSD_HTTP_HOST=0.0.0.0
+      - HSD_WALLET_HTTP_HOST=0.0.0.0
+      - HSD_LOG_LEVEL=error
+      - HSD_API_KEY=changeme
+    
+
+  firewallet:
+    image: git.woodburn.au/nathanwoodburn/firewallet:latest
+    ports:
+      - "5000:5000"
+    environment:
+      - HSD_IP=hsd
+      - HSD_API=changeme
+    volumes:
+      - user_data:/app/user_data
+
+
+volumes:
+  hsd_data:
+  user_data:

domainLookup.py

@@ -11,7 +11,6 @@ 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
 
@@ -172,11 +171,11 @@ def resolve_TLSA_with_doh(query_name, doh_url="https://hnsdoh.com/dns-query"):
 def emoji_to_punycode(emoji):
     try:
         return emoji.encode("idna").decode("ascii")
-    except Exception as e:
+    except Exception:
         return emoji
     
 def punycode_to_emoji(punycode):
     try:
         return punycode.encode("ascii").decode("idna")
-    except Exception as e:
+    except Exception:
         return punycode

install.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+install_command=""
+
+# Check if currently in the FireWalletBrowser directory
+if [ -f "server.py" ]; then
+    echo "Please run this script from outside the FireWalletBrowser directory."
+    exit 1
+fi
+
+echo "Starting installation of FireWalletBrowser..."
+
+# Check if OS is using apt package manager (Debian/Ubuntu)
+if command -v apt-get &> /dev/null; then
+    install_command="sudo apt-get install -y"
+    dependencies=(git curl wget python3 python3-pip python3-venv)
+    echo "Detected apt package manager."
+# Check if OS is using pacman package manager (Arch Linux)
+elif command -v pacman &> /dev/null; then
+    install_command="sudo pacman -S"
+    dependencies=(git curl wget python3 python-pip)
+    echo "Detected pacman package manager."
+else
+    echo "Unsupported package manager. Please install dependencies manually."
+    exit 1
+fi
+
+# List of dependencies to install
+# Install dependencies
+for package in "${dependencies[@]}"; do
+    # Check if the package is already installed
+    if command -v $package &> /dev/null || dpkg -s $package &> /dev/null || pacman -Qi $package &> /dev/null; then
+        echo "$package is already installed."
+        continue
+    fi
+
+
+    echo "Installing $package..."
+    $install_command $package
+    # Check if the installation was successful
+    if [ $? -ne 0 ]; then
+        echo "Failed to install $package. Please check your package manager settings."
+        exit 1
+    fi
+done
+
+if ! command -v node &> /dev/null || ! command -v npm &> /dev/null; then
+    echo "Installing Node.js and npm..."
+    # Download and install nvm:
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+    # in lieu of restarting the shell
+    \. "$HOME/.nvm/nvm.sh"
+    nvm install 20
+
+    if [ $? -ne 0 ]; then
+        echo "Failed to install Node.js and npm. Please install them manually."
+        exit 1
+    fi
+else
+    echo "Node.js and npm are already installed."
+fi
+
+# Clone repo
+git clone https://git.woodburn.au/nathanwoodburn/firewalletbrowser.git
+
+# Setup venv
+cd firewalletbrowser || exit 1
+python3 -m venv .venv
+source .venv/bin/activate
+
+# Install python dependencies
+python3 -m pip install -r requirements.txt
+
+# Write .env file
+if [ ! -f ".env" ]; then
+    echo "Creating .env file..."
+    echo "INTERNAL_HSD=true" > .env
+    echo "Created .env file with INTERNAL Node enabled."
+fi
+
+echo "Installation complete. You can start the application by running ./start.sh"

main.py

@@ -1,6 +1,7 @@
 import io
 import json
 import random
+import sqlite3
 import sys
 from flask import Flask, make_response, redirect, request, jsonify, render_template, send_from_directory,send_file
 import os
@@ -12,12 +13,12 @@ import re
 from flask_qrcode import QRcode
 import domainLookup
 import urllib.parse
-import importlib
 import plugin as plugins_module
 import gitinfo
 import datetime
-import functools
 import time
+import logging
+from logging.handlers import RotatingFileHandler
 
 dotenv.load_dotenv()
 
@@ -30,32 +31,25 @@ fees = 0.02
 revokeCheck = random.randint(100000,999999)
 
 
-THEME = os.getenv("THEME")
+THEME = os.getenv("THEME", "black")
 
 
-def blocks_to_time(blocks: int) -> str:
+# Setup logging
-    """
+if not os.path.exists('logs'):
-    Convert blocks to time in a human-readable format.
+    os.makedirs('logs')
-    Blocks are mined approximately every 10 minutes.
+log_file = 'logs/firewallet.log'
-    """
+handler = RotatingFileHandler(log_file, maxBytes=1024*1024, backupCount=3)
-    if blocks < 0:
+formatter = logging.Formatter('[%(asctime)s] %(levelname)s in %(module)s: %(message)s')
-        return "Invalid time"
+handler.setFormatter(formatter)
+logger = logging.getLogger()
+logger.setLevel(logging.WARNING)
 
-    if blocks < 6:
+# Disable werkzeug logging
-        return f"{blocks * 10} mins"
+logging.getLogger('werkzeug').setLevel(logging.INFO)
-    elif blocks < 144:
+logging.getLogger("urllib3").setLevel(logging.ERROR)
-        hours = blocks // 6
+logging.getLogger("requests").setLevel(logging.ERROR)
-        minutes = (blocks % 6) * 10
-        if minutes == 0:
-            return f"{hours} hrs"
 
-        return f"{hours} hrs {minutes} mins"
+logger.addHandler(handler)
-    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():
@@ -77,14 +71,13 @@ def index():
     if not os.path.exists(".git"):
         return render_template("index.html", account=account, plugins=plugins)
     
-    info = gitinfo.get_git_info()
+    alerts = get_alerts(account)
-    if info is None:
+    for alert in alerts:
-        return render_template("index.html", account=account, plugins=plugins)
+        output_html = alert['output']
-    branch = info['refs']
+        if 'id' in alert:
-    commit = info['commit']
+            # Add a dismiss button
-    if commit != latestVersion(branch):
+            output_html += f"&nbsp<a href='/dismiss/{alert['id']}' class='btn btn-secondary btn-sm' style='margin:none;'>Dismiss</a>"
-        print("New version available",flush=True)
+        plugins += render_template('components/dashboard-alert.html', name=alert['name'], output=output_html)
-        plugins += render_template('components/dashboard-alert.html', name='Update', output='A new version of FireWallet is available') 
 
     return render_template("index.html", account=account, plugins=plugins)
 
@@ -114,7 +107,7 @@ def transactions():
     page = request.args.get('page', 1)
     try:
         page = int(page)
-    except:
+    except ValueError:
         page = 1
 
     if page < 1:
@@ -196,7 +189,7 @@ def send():
     content = f"Are you sure you want to send {amount} HNS to {toAddress}<br><br>"
     content += f"This will cost {amount} HNS + mining fees and is not able to be undone."
 
-    cancel = f"/send"
+    cancel = "/send"
     confirm = f"/send/confirm?address={address}&amount={amount}"
 
 
@@ -211,7 +204,7 @@ def sendConfirmed():
     address = request.args.get("address")
     amount = float(request.args.get("amount","0"))
     response = account_module.send(request.cookies.get("account"),address,amount)
-    if 'error' in response and response['error'] != None:
+    if 'error' in response and response['error'] is not None:
         # If error is a dict get the message
         if isinstance(response['error'], dict):
             if 'message' in response['error']:
@@ -282,7 +275,7 @@ def auctions():
     
     # Sort
     sort = request.args.get("sort")
-    if sort == None:
+    if sort is None:
         sort = "time"
     sort = sort.lower()
     sort_price = ""
@@ -296,7 +289,7 @@ def auctions():
     reverse = False
 
     direction = request.args.get("direction")
-    if direction == None:
+    if direction is None:
         if sort == "time":
             direction = "⬆"
         else:
@@ -365,7 +358,7 @@ def revealAllBids():
         return redirect("/auctions?message=Failed to reveal bids")
 
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
             if response['error']['message'] == "Nothing to do.":
                 return redirect("/auctions?message=No reveals pending")
             return redirect("/auctions?message=" + response['error']['message'])
@@ -388,7 +381,7 @@ def redeemAllBids():
         return redirect("/auctions?message=Failed to redeem bids")
 
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
             if response['error']['message'] == "Nothing to do.":
                 return redirect("/auctions?message=No redeems pending")
             return redirect("/auctions?message=" + response['error']['message'])
@@ -410,7 +403,7 @@ def registerAllDomains():
         return redirect("/auctions?message=Failed to register domains")
 
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
             if response['error']['message'] == "Nothing to do.":
                 return redirect("/auctions?message=No domains to register")
             return redirect("/auctions?message=" + response['error']['message'])
@@ -429,7 +422,7 @@ def finalizeAllBids():
 
     response = account_module.finalizeAll(request.cookies.get("account"))
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
             if response['error']['message'] == "Nothing to do.":
                 return redirect("/dashboard?message=No domains to finalize")
             return redirect("/dashboard?message=" + response['error']['message'])
@@ -507,7 +500,6 @@ def search():
     domain_info = account_module.getDomain(search_term)
     owner = 'Unknown'
     dns = []
-    txs = []
 
     if domain_info:
         # Check if info and info.owner
@@ -560,10 +552,10 @@ def manage(domain: str):
     dns = render.dns(dns)
 
     errorMessage = request.args.get("error")
-    if errorMessage == None:
+    if errorMessage is None:
         errorMessage = ""
     address = request.args.get("address")
-    if address == None:
+    if address is None:
         address = ""
     
     finalize_time = ""
@@ -607,8 +599,8 @@ def finalize(domain: str):
     
     domain = domain.lower()
     response = account_module.finalize(request.cookies.get("account"),domain)
-    if response['error'] != None:
+    if response['error'] is not None:
-        print(response)
+        logger.error(f"Error finalizing transfer for {domain}: {response['error']}")
         return redirect("/manage/" + domain + "?error=" + response['error']['message'])
 
     return redirect("/success?tx=" + response['result']['hash'])
@@ -626,8 +618,8 @@ def cancelTransfer(domain: str):
     domain = domain.lower()
     response = account_module.cancelTransfer(request.cookies.get("account"),domain)
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
-            print(response)
+            logger.error(f"Error canceling transfer for {domain}: {response['error']}")
             return redirect("/manage/" + domain + "?error=" + response['error']['message'])
 
     return redirect("/success?tx=" + response['result']['hash'])
@@ -645,9 +637,9 @@ def revokeInit(domain: str):
     domain = domain.lower()
 
     content = f"Are you sure you want to revoke {domain}/?<br>"
-    content += f"This will return the domain to the auction pool and you will lose any funds spent on the domain.<br>"
+    content += "This will return the domain to the auction pool and you will lose any funds spent on the domain.<br>"
-    content += f"This cannot be undone after the transaction is sent.<br><br>"
+    content += "This cannot be undone after the transaction is sent.<br><br>"
-    content += f"Please enter your password to confirm."
+    content += "Please enter your password to confirm."
 
     cancel = f"/manage/{domain}"
     confirm = f"/manage/{domain}/revoke/confirm"
@@ -676,14 +668,14 @@ def revokeConfirm(domain: str):
         return redirect("/manage/" + domain + "?error=An error occurred. Please try again.")
 
     response = account_module.check_password(request.cookies.get("account"),password)
-    if response == False:
+    if not response:
         return redirect("/manage/" + domain + "?error=Invalid password")
 
 
     response = account_module.revoke(request.cookies.get("account"),domain)
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
-            print(response)
+            logger.error(f"Error revoking {domain}: {response['error']}")
             return redirect("/manage/" + domain + "?error=" + response['error']['message'])
 
     return redirect(f"/success?tx={response['hash']}")
@@ -722,7 +714,7 @@ def editPage(domain: str):
        
 
     user_edits = request.args.get("dns")
-    if user_edits != None:
+    if user_edits is not None:
         dns = urllib.parse.unquote(user_edits)
     else:
         dns = account_module.getDNS(domain)
@@ -735,7 +727,7 @@ def editPage(domain: str):
     # Check if new records have been added
     dnsType = request.args.get("type")
     dnsValue = request.args.get("value")
-    if dnsType != None and dnsValue != None:
+    if dnsType is not None and dnsValue is not None:
         if dnsType != "DS":
             dns.append({"type": dnsType, "value": dnsValue})
         else:
@@ -749,7 +741,7 @@ def editPage(domain: str):
                 key_tag = int(ds[0])
                 algorithm = int(ds[1])
                 digest_type = int(ds[2])
-            except:
+            except ValueError:
                 raw_dns = str(dns).replace("'",'"')
                 return redirect("/manage/" + domain + "/edit?dns=" + urllib.parse.quote(str(raw_dns)) + "&error=Invalid DS record")
             
@@ -761,7 +753,7 @@ def editPage(domain: str):
     raw_dns = str(dns).replace("'",'"')
     dns = render.dns(dns,True)
     errorMessage = request.args.get("error")
-    if errorMessage == None:
+    if errorMessage is None:
         errorMessage = ""
 
     
@@ -789,7 +781,7 @@ def editSave(domain: str):
     dns = urllib.parse.unquote(dns)
     response = account_module.setDNS(request.cookies.get("account"),domain,dns)
     if 'error' in response:
-        print(response)
+        logger.error(f"Error setting DNS for {domain}: {response['error']}")
         return redirect(f"/manage/{domain}/edit?dns={raw_dns}&error={response['error']}")
     return redirect(f"/success?tx={response['hash']}")
 
@@ -820,7 +812,7 @@ def transfer(domain):
 
     action = f"Send {domain}/ to {request.form.get('address')}"
     content = f"Are you sure you want to send {domain}/ to {toAddress}<br><br>"
-    content += f"This requires sending a finalize transaction 2 days after the transfer is initiated."
+    content += "This requires sending a finalize transaction 2 days after the transfer is initiated."
 
     cancel = f"/manage/{domain}?address={address}"
     confirm = f"/manage/{domain}/transfer/confirm?address={address}"
@@ -847,9 +839,9 @@ def signMessage(domain):
 
     content = "Message to sign:<br><code>" + message + "</code><br><br>"
     signedMessage = account_module.signMessage(request.cookies.get("account"),domain,message)
-    if signedMessage["error"] != None:
+    if signedMessage["error"] is not None:
         return redirect("/manage/" + domain + "?error=" + signedMessage["error"])
-    content += f"Signature:<br><code>{signedMessage["result"]}</code><br><br>"
+    content += f"Signature:<br><code>{signedMessage['result']}</code><br><br>"
 
     data = {
         "domain": domain,
@@ -887,7 +879,6 @@ def transferConfirm(domain):
     
     return redirect(f"/success?tx={response['hash']}")
 
-
 @app.route('/auction/<domain>')
 def auction(domain):
     # Check if the user is logged in
@@ -906,7 +897,7 @@ def auction(domain):
 
     domainInfo = account_module.getDomain(search_term)
     error = request.args.get("error")
-    if error == None:
+    if error is None:
         error = ""
     
     if 'error' in domainInfo:
@@ -916,9 +907,9 @@ def auction(domain):
                                error=error)
     
     if domainInfo['info'] is None:
-        if 'registered' in domainInfo and domainInfo['registered'] == False and 'expired' in domainInfo and domainInfo['expired'] == False:
+        if 'registered' in domainInfo and not domainInfo['registered'] and 'expired' in domainInfo and not domainInfo['expired']:
             # Needs to be registered
-                next_action = f'ERROR GETTING NEXT STATE'
+                next_action = 'ERROR GETTING NEXT STATE'
         else:
             next_action = f'<a href="/auction/{domain}/open">Open Auction</a>'
         return render_template("auction.html", account=account, 
@@ -936,13 +927,11 @@ def auction(domain):
     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>'
@@ -965,7 +954,7 @@ def auction(domain):
         elif stats['blocksUntilReveal'] == 2:
             next += "<br>LAST CHANCE TO BID"
         elif stats['blocksUntilReveal'] == 3:
-            next += f"<br>Next block is last chance to bid"
+            next += "<br>Next block is last chance to bid"
         elif stats['blocksUntilReveal'] < 6:
             next += f"<br>Last chance to bid in {stats['blocksUntilReveal']-2} blocks"
 
@@ -997,7 +986,7 @@ def rescan_auction(domain):
     
     domain = domain.lower()
     
-    response = account_module.rescan_auction(account,domain)
+    account_module.rescan_auction(account,domain)
     return redirect("/auction/" + domain)
 
 @app.route('/auction/<domain>/bid')
@@ -1093,7 +1082,7 @@ def open_auction(domain):
     response = account_module.openAuction(request.cookies.get("account"),domain)
 
     if 'error' in response:
-        if response['error'] != None:
+        if response['error'] is not None:
             return redirect("/auction/" + domain + "?error=" + response['error']['message'])
 
     return redirect(f"/success?tx={response['hash']}")
@@ -1142,10 +1131,10 @@ def settings():
         return redirect("/logout")
     
     error = request.args.get("error")
-    if error == None:
+    if error is None:
         error = ""
     success = request.args.get("success")
-    if success == None:
+    if success is None:
         success = ""
 
 
@@ -1203,8 +1192,16 @@ def settings_action(action):
 
 
     if action == "zap":
-        resp = account_module.zapTXs(request.cookies.get("account"))
+        age = request.args.get("age", 1200)
-        if type(resp) == dict and 'error' in resp:
+        try:
+            age = int(age)
+        except ValueError:
+            age = 1200
+        if age < 0:
+            age = 1200
+        
+        resp = account_module.zapTXs(request.cookies.get("account"),age)
+        if type(resp) is dict and 'error' in resp:
             return redirect("/settings?error=" + str(resp['error']))
         return redirect("/settings?success=Zapped transactions")
     
@@ -1225,11 +1222,43 @@ def settings_action(action):
                                title="Restarting",
                                content="The node is restarting. This may take a minute or two. You can close this window.")
     
+    if action == "api-info":
+        content = f"API URL: <code>http://{account_module.HSD_IP}:{account_module.HSD_NODE_PORT}</code><br>"
+        content += f"Wallet URL: <code>http://{account_module.HSD_IP}:{account_module.HSD_WALLET_PORT}</code><br>"
+        content += f"API Key: <code>{account_module.HSD_API}</code><br><br>"
+
+        
+
+        return render_template("message.html", account=account,
+                               title="API Information",
+                               content=content)
+
+    if action == "logs":
+        if not os.path.exists(log_file):
+            return jsonify({"error": "Log file not found"}), 404
+        try:
+            with open(log_file, 'rb') as f:
+                response = requests.put(f"https://upload.woodburn.au/{os.path.basename(log_file)}", data=f)
+            if response.status_code == 200 or response.status_code == 201:
+                url = response.text.strip().split('\n')[-1]
+                logger.info(f"Log upload successful: {url}")
+                return redirect(url)
+            else:
+                logger.error(f"Failed to upload log: {response.status_code} {response.text}")
+                return redirect(f"/settings?error=Failed to upload log: {response.status_code}")
+                
+        except Exception as e:
+            logger.error(f"Exception during log upload: {e}", exc_info=True)
+            return redirect("/settings?error=An error occurred during log upload")
+            
+
+
+    logger.warning(f"Unknown settings action: {action}")
     return redirect("/settings?error=Invalid action")
 
 @app.route('/settings/upload', methods=['POST'])
 def upload_image():
-    if not 'account' in request.cookies:
+    if 'account' not in request.cookies:
         return redirect("/login?message=Not logged in")
     
     account = request.cookies.get("account")
@@ -1253,7 +1282,7 @@ def upload_image():
     return redirect("/settings?error=An error occurred")
 
 def latestVersion(branch):
-    result = requests.get(f"https://git.woodburn.au/api/v1/repos/nathanwoodburn/firewalletbrowser/branches")
+    result = requests.get("https://git.woodburn.au/api/v1/repos/nathanwoodburn/firewalletbrowser/branches")
     if result.status_code != 200:
         return "Error"
     
@@ -1290,7 +1319,7 @@ def login_post():
     account = request.form.get("account")
     password = request.form.get("password")
 
-    if account == None or password == None:
+    if account is None or password is None:
         wallets = account_module.listWallets()
         wallets = render.wallets(wallets)
         return render_template("login.html",
@@ -1329,7 +1358,7 @@ def register():
     password = request.form.get("password")
     repeatPassword = request.form.get("password_repeat")
 
-    if account == None or password == None or repeatPassword == None:
+    if account is None or password is None or repeatPassword is None:
         return render_template("register.html",
                                error="Invalid account or password",
                                name=account,password=password,password_repeat=repeatPassword)
@@ -1376,7 +1405,7 @@ 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:
+    if account is None or password is None or repeatPassword is None or seed is None:
         return render_template("import-wallet.html",
                                error="Invalid account, password or seed",
                                name=account,password=password,password_repeat=repeatPassword,
@@ -1413,7 +1442,7 @@ def import_wallet():
                                name=account,password=password,password_repeat=repeatPassword,
                                seed=seed)
     
-    
+    add_alert("Rescan needed", "Please rescan the wallet after importing to see all transactions", account)
     # Set the cookie
     response = make_response(redirect("/"))
     response.set_cookie("account", account+":"+password)
@@ -1467,7 +1496,7 @@ def plugin(ptype,plugin):
     plugin = f"{ptype}/{plugin}"
 
     if not plugins_module.pluginExists(plugin):
-        print(f"Plugin {plugin} not found")
+        logger.warning(f"Plugin not found: {plugin}")
         return redirect("/plugins")
 
     data = plugins_module.getPluginData(plugin)
@@ -1475,12 +1504,12 @@ def plugin(ptype,plugin):
     functions = plugins_module.getPluginFunctions(plugin)
     functions = render.plugin_functions(functions,plugin)
 
-    if data['verified'] == False:
+    if not data['verified']:
         functions = "<div class='container-fluid'><div class='alert alert-warning' role='alert'>This plugin is not verified and is disabled for your protection. Please check the code before marking the plugin as verified <a href='/plugin/" + plugin + "/verify' class='btn btn-danger'>Verify</a></div></div>" + functions
 
     
     error = request.args.get("error")
-    if error == None:
+    if error is None:
         error = ""
 
     return render_template("plugin.html", account=account, 
@@ -1506,7 +1535,7 @@ def plugin_verify(ptype,plugin):
 
     data = plugins_module.getPluginData(plugin)
 
-    if data['verified'] == False:
+    if not data['verified']:
         plugins_module.verifyPlugin(plugin)
 
     return redirect("/plugin/" + plugin)
@@ -1593,7 +1622,7 @@ def api_hsd(function):
         if not domain:
             return jsonify({"error": "No domain specified"}), 400
         domainInfo = account_module.getDomain(domain)
-        if 'error' in domainInfo and domainInfo['error'] != None:
+        if 'error' in domainInfo and domainInfo['error'] is not None:
             return jsonify({"error": domainInfo['error']}), 400
         stats = domainInfo['info']['stats'] if 'stats' in domainInfo['info'] else {}
         state = domainInfo['info']['state']
@@ -1602,13 +1631,11 @@ def api_hsd(function):
         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>'
@@ -1628,7 +1655,7 @@ def api_hsd(function):
             elif stats['blocksUntilReveal'] == 2:
                 next += "<br>LAST CHANCE TO BID"
             elif stats['blocksUntilReveal'] == 3:
-                next += f"<br>Next block is last chance to bid"
+                next += "<br>Next block is last chance to bid"
             elif stats['blocksUntilReveal'] < 6:
                 next += f"<br>Last chance to bid in {stats['blocksUntilReveal']-2} blocks"
 
@@ -1714,7 +1741,7 @@ def api_wallet(function):
 
     if function == "domains":
         domains = account_module.getDomains(account)
-        if type(domains) == dict and 'error' in domains:
+        if type(domains) is dict and 'error' in domains:
             return jsonify({"result": [], "error": domains['error']})
         
         # Add nameRender to each domain
@@ -1728,7 +1755,7 @@ def api_wallet(function):
         page = request.args.get('page', 1)
         try:
             page = int(page)
-        except:
+        except ValueError:
             page = 1
 
         if page < 1:
@@ -1783,9 +1810,9 @@ def api_wallet(function):
 
     if function == "icon":
         # Check if there is an icon
-        if not os.path.exists(f'user_data/images'):
+        if not os.path.exists('user_data/images'):
             return send_file('templates/assets/img/HNS.png')
-        files = os.listdir(f'user_data/images')
+        files = os.listdir('user_data/images')
         for file in files:
             if file.startswith(account):
                 return send_file(f'user_data/images/{file}')
@@ -1801,7 +1828,6 @@ 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]
     if not account:
         return jsonify({"error": "Invalid account"})
     
@@ -1820,9 +1846,9 @@ def api_wallet_mobile(function):
     
 @app.route('/api/v1/icon/<account>')
 def api_icon(account):
-    if not os.path.exists(f'user_data/images'):
+    if not os.path.exists('user_data/images'):
         return send_file('templates/assets/img/HNS.png')
-    files = os.listdir(f'user_data/images')
+    files = os.listdir('user_data/images')
     for file in files:
         if file.startswith(account):
             return send_file(f'user_data/images/{file}')
@@ -1841,6 +1867,29 @@ def api_status():
 #endregion
 
 #region Helper functions
+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"
 
 def renderDomain(name: str) -> str:
     """
@@ -1854,9 +1903,124 @@ def renderDomain(name: str) -> str:
         return f"{rendered}/ ({name})"
 
 
-    except Exception as e:
+    except Exception:
         return f"{name}/"
 
+def get_alerts(account:str) -> list:
+    """
+    Get alerts to show on the dashboard.
+    """
+    
+    alerts = []
+
+    info = gitinfo.get_git_info()
+    if info is not None:    
+        branch = info['refs']
+        commit = info['commit']
+        if commit != latestVersion(branch):
+            logger.info("New version available")
+            alerts.append({
+                "name": "Update Available",
+                "output": f"A new version of FireWallet is available. <a href='https://git.woodburn.au/nathanwoodburn/firewalletbrowser/compare/{commit}...{branch}' target='_blank'>Changelog</a>"
+            })
+
+    
+
+
+    # Check if the node is connected
+    if not account_module.hsdConnected():
+        alerts.append({
+            "name": "Node",
+            "output": "HSD node is not connected. Please check your settings."
+        })
+        return alerts
+
+    # Check if the wallet is synced
+    wallet_status = account_module.getWalletStatus()
+    if wallet_status != "Ready":
+        alerts.append({
+            "name": "Wallet",
+            "output": f"The wallet is not synced ({wallet_status}). Please wait for it to sync."
+        })
+    # Try to read from notifications sqlite database
+    if os.path.exists("user_data/notifications.db"):
+        try:
+            conn = sqlite3.connect("user_data/notifications.db")
+            c = conn.cursor()
+            c.execute("SELECT id, name, message FROM notifications WHERE read=0 AND (account=? OR account='all')", (account,))
+            rows = c.fetchall()
+            for row in rows:
+                alerts.append({
+                    "id": row[0],
+                    "name": row[1],
+                    "output": row[2]
+                })
+            conn.close()
+        except Exception as e:
+            logger.error(f"Error reading notifications: {e}")
+            pass
+        
+    return alerts
+
+def add_alert(name:str,output:str,account:str="all"):
+    """
+    Add an alert to the notifications database.
+    
+    name: Name of the alert
+    output: Message of the alert
+    account: Account to add the alert for (default: all)
+    """
+    if not os.path.exists("user_data/notifications.db"):
+        conn = sqlite3.connect("user_data/notifications.db")
+        c = conn.cursor()
+        c.execute("CREATE TABLE notifications (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, message TEXT, account TEXT, read INTEGER DEFAULT 0)")
+        conn.commit()
+        conn.close()
+    
+    try:
+        conn = sqlite3.connect("user_data/notifications.db")
+        c = conn.cursor()
+        c.execute("INSERT INTO notifications (name, message, account) VALUES (?, ?, ?)", (name, output, account))
+        conn.commit()
+        conn.close()
+    except Exception as e:
+        logger.error(f"Error adding notification: {e}")
+        pass
+
+def dismiss_alert(alert_id:int,account:str="all"):
+    """
+    Mark an alert as read.
+
+    alert_id: ID of the alert to dismiss
+    account: Account to dismiss the alert for (default: all)
+    """
+    if not os.path.exists("user_data/notifications.db"):
+        return
+    
+    try:
+        conn = sqlite3.connect("user_data/notifications.db")
+        c = conn.cursor()
+        c.execute("UPDATE notifications SET read=1 WHERE id=?", (alert_id,))
+        conn.commit()
+        conn.close()
+    except Exception as e:
+        logger.error(f"Error dismissing notification: {e}")
+        pass
+
+@app.route('/dismiss/<int:alert_id>')
+@app.route('/api/v1/dismiss/<int:alert_id>')
+def dismiss_alert_route(alert_id):
+    # 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")
+
+    dismiss_alert(alert_id,account)
+    return redirect(request.referrer or "/")
+
 #endregion
 
 
@@ -1894,15 +2058,44 @@ def try_path(path):
 
 @app.errorhandler(404)
 def page_not_found(e):
+    logger.warning(f"404 Not Found: {request.path}")
     account = account_module.check_account(request.cookies.get("account"))
-
     return render_template('404.html',account=account), 404
 #endregion
 
 if __name__ == '__main__':
-    #TODO add parsing to allow for custom port and host
+    host = '127.0.0.1'
-    # Check to see if --debug is in the command line arguments
+    port = 5000
+    # Check if --host is in the command line arguments
+    if "--host" in sys.argv:
+        host_index = sys.argv.index("--host") + 1
+        if host_index < len(sys.argv):
+            host = sys.argv[host_index]
+    # Check if --port is in the command line arguments
+    if "--port" in sys.argv:
+        port_index = sys.argv.index("--port") + 1
+        if port_index < len(sys.argv):
+            try:
+                port = int(sys.argv[port_index])
+            except ValueError:
+                pass
+    print(f"Starting FireWallet on http://{host}:{port}",flush=True)
+    
     if "--debug" in sys.argv:
-        app.run(debug=True)
+        console_handler = logging.StreamHandler(sys.stdout)
+        # Use a simple format for console
+        console_formatter = logging.Formatter('%(message)s')
+        console_handler.setFormatter(console_formatter)
+        console_handler.setLevel(logging.WARNING)
+        logger.addHandler(console_handler)
+        logger.setLevel(logging.DEBUG)
+        app.run(debug=True, host=host, port=port)
     else:
-        app.run()
+        
+        app.run(host=host, port=port)
+
+def tests():
+    assert blocks_to_time(6) == "1 hrs"
+    assert blocks_to_time(3) == "30 mins"
+    assert blocks_to_time(1) == "10 mins"
+    assert blocks_to_time(10) == "1 hrs 40 mins"

plugin.py

@@ -62,7 +62,8 @@ def listPlugins(update=False):
     try:
         with open("user_data/plugin_signatures.json", "r") as f:
             signatures = json.load(f)
-    except:
+    except Exception as e:
+        print(f"Error loading plugin signatures: {e}")
         # Write a new signatures file
         with open("user_data/plugin_signatures.json", "w") as f:
             json.dump(signatures, f)
@@ -87,7 +88,8 @@ def verifyPlugin(plugin: str):
     try:
         with open("user_data/plugin_signatures.json", "r") as f:
             signatures = json.load(f)
-    except:
+    except Exception as e:
+        print(f"Error loading plugin signatures: {e}")
         # Write a new signatures file
         with open("user_data/plugin_signatures.json", "w") as f:
             json.dump(signatures, f)
@@ -120,7 +122,8 @@ def getPluginData(pluginStr: str):
     try:
         with open("user_data/plugin_signatures.json", "r") as f:
             signatures = json.load(f)
-    except:
+    except Exception as e:
+        print(f"Error loading plugin signatures: {e}")
         # Write a new signatures file
         with open("user_data/plugin_signatures.json", "w") as f:
             json.dump(signatures, f)
@@ -171,7 +174,8 @@ def runPluginFunction(plugin: str, function: str, params: dict, authentication:
     try:
         with open("user_data/plugin_signatures.json", "r") as f:
             signatures = json.load(f)
-    except:
+    except Exception as e:
+        print(f"Error loading plugin signatures: {e}")
         # Write a new signatures file
         with open("user_data/plugin_signatures.json", "w") as f:
             json.dump(signatures, f)

plugins/automations.py

@@ -1,4 +1,3 @@
-import json
 import account
 import requests
 import threading
@@ -127,7 +126,7 @@ def automations_background(authentication):
         account_name = account.check_account(authentication)
         password = ":".join(authentication.split(":")[1:])
 
-        if account_name == False:
+        if not account_name:
             return {
                 "error": {
                     "message": "Invalid account"

plugins/batching.py

@@ -1,7 +1,5 @@
-import json
 import account
 import requests
-import os
 
 
 
@@ -384,7 +382,7 @@ def bid(params, authentication):
         bid = float(params["bid"])
         blind = float(params["blind"])
         blind+=bid
-    except:
+    except ValueError:
         return {
             "status":"Invalid bid amount",
             "transaction":None

plugins/customPlugins.py

@@ -1,6 +1,4 @@
 import json
-import account
-import requests
 import os
 
 # Plugin Data

plugins/renewal.py

@@ -1,7 +1,5 @@
-import json
 import account
 import requests
-import os
 
 # Plugin Data
 info = {
@@ -90,7 +88,7 @@ def main(params, authentication):
                 return {"status": f"Failed: {batch['error']['message']}", "transaction": "None"}
         
         if 'result' in batch:
-            if batch['result'] != None:
+            if batch['result'] is not None:
                 tx = batch['result']['hash']
         return {"status": "Success", "transaction": tx}
         # Note only one batch can be sent at a time

plugins/varo.py

@@ -93,7 +93,7 @@ def status(params, authentication):
     response = requests.post(f"https://{instance}/api", json=data, headers=headers)
     if response.status_code != 200:
         return {"status": "Error connecting to Varo"}
-    if response.json()["success"] != True:
+    if not response.json()["success"]:
         return {"status": "Error connecting to Varo"}
     return {"status": f"Connected to {instance}"}
 
@@ -110,7 +110,7 @@ def login(params, authentication):
     if response.status_code != 200:
         return {"status": "Error connecting to Varo"}
     
-    if response.json()["success"] != True:
+    if not response.json()["success"]:
         return {"status": "Error connecting to Varo"}
     
     auth = {
@@ -146,7 +146,7 @@ def addDomain(params, authentication):
     zones = requests.post(f"https://{instance}/api", json=data, headers=headers)
     if zones.status_code != 200:
         return {"status": "Error connecting to Varo"}
-    if zones.json()["success"] != True:
+    if not zones.json()["success"]:
         return {"status": "Error connecting to Varo"}
     
     zones = zones.json()["data"]
@@ -169,7 +169,7 @@ def addDomain(params, authentication):
     response = requests.post(f"https://{instance}/api", json=data, headers=headers)
     if response.status_code != 200:
         return {"status": "Error connecting to Varo"}
-    if response.json()["success"] != True:
+    if not response.json()["success"]:
         return {"status": "Error connecting to Varo"}
     zoneID = response.json()["data"]["zone"]
     data = {
@@ -179,7 +179,7 @@ def addDomain(params, authentication):
     response = requests.post(f"https://{instance}/api", json=data, headers=headers)
     if response.status_code != 200:
         return {"status": "Error connecting to Varo"}
-    if response.json()["success"] != True:
+    if not response.json()["success"]:
         return {"status": "Error connecting to Varo"}
     zone = response.json()["data"]
     

render.py

@@ -2,9 +2,7 @@ import datetime
 import json
 import urllib.parse
 from flask import render_template
-from domainLookup import punycode_to_emoji
 import os
-from handywrapper import api
 import threading
 import requests
 
@@ -55,7 +53,7 @@ def domains(domains, mobile=False):
 
         link = f'/manage/{domain["name"]}'
         link_action = "Manage"
-        if domain['registered'] == False:
+        if not domain['registered']:
             link_action = "Register"
             link = f'/auction/{domain["name"]}/register'
 
@@ -182,7 +180,7 @@ def transactions(txs):
         elif amount > 0:
             amount = f"<span style='color: green;'>+{amount:,.2f}</span>"
         else:
-            amount = f"<span style='color: gray;'>0.00</span>"
+            amount = "<span style='color: gray;'>0.00</span>"
 
 
         # hash = f"<a target='_blank' href='{TX_EXPLORER_URL}{hash}'>{hash[:8]}...</a>"
@@ -253,7 +251,7 @@ def txs(data):
         amount = entry['amount']
         amount = amount / 1000000
 
-        if entry['blind'] == None:
+        if entry['blind'] is None:
             html_output += f"<td>{amount:,.2f} HNS</td>\n"
         else:
             blind = entry['blind']
@@ -261,7 +259,7 @@ def txs(data):
             html_output += f"<td>{amount:,.2f} + {blind:,.2f} HNS</td>\n"
 
         html_output += f"<td>{timestamp_to_readable_time(entry['time'])}</td>\n"
-        html_output += f"</tr>\n"
+        html_output += "</tr>\n"
 
     return html_output
 
@@ -316,13 +314,13 @@ def bids(bids,reveals):
             html += f"<td>{value:,.2f} HNS</td>"
             html += f"<td>{bidValue:,.2f} HNS</td>"
         else:
-            html += f"<td>Hidden until reveal</td>"
+            html += "<td>Hidden until reveal</td>"
-            html += f"<td>Hidden until reveal</td>"
+            html += "<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>"
@@ -410,22 +408,22 @@ def plugin_functions(functions, pluginName):
             functionType = functions[function]["type"]
 
 
-        html += f'<div class="card" style="margin-top: 50px;">'
+        html += '<div class="card" style="margin-top: 50px;">'
-        html += f'<div class="card-body">'
+        html += '<div class="card-body">'
         html += f'<h4 class="card-title">{name}</h4>'
         html += f'<h6 class="text-muted card-subtitle mb-2">{description}</h6>'
         html += f'<h6 class="text-muted card-subtitle mb-2">Function type: {functionType.capitalize()}</h6>'
 
         if functionType != "default":
             html += f'<p class="card-text">Returns: {returns}</p>'
-            html += f'</div>'
+            html += '</div>'
-            html += f'</div>'
+            html += '</div>'
             continue
 
         # Form
         html += f'<form method="post" style="padding: 20px;" action="/plugin/{pluginName}/{function}">'
         for param in params:
-            html += f'<div style="margin-bottom: 20px;">'
+            html += '<div style="margin-bottom: 20px;">'
             paramName = params[param]["name"]
             paramType = params[param]["type"]
             if paramType == "text":
@@ -449,14 +447,14 @@ def plugin_functions(functions, pluginName):
 
                 
             
-            html += f'</div>'
+            html += '</div>'
         
-        html += f'<button type="submit" class="btn btn-primary">Submit</button>'        
+        html += '<button type="submit" class="btn btn-primary">Submit</button>'        
-        html += f'</form>'
+        html += '</form>'
         # For debugging
         html += f'<p class="card-text">Returns: {returns}</p>'
-        html += f'</div>'
+        html += '</div>'
-        html += f'</div>'
+        html += '</div>'
         
         
     return html
@@ -468,16 +466,16 @@ def plugin_output(outputs, returns):
     for returnOutput in returns:
         if returnOutput not in outputs:
             continue
-        html += f'<div class="card" style="margin-top: 50px; margin-bottom: 50px;">'
+        html += '<div class="card" style="margin-top: 50px; margin-bottom: 50px;">'
-        html += f'<div class="card-body">'
+        html += '<div class="card-body">'
         html += f'<h4 class="card-title">{returns[returnOutput]["name"]}</h4>'
         
         output = outputs[returnOutput]
         if returns[returnOutput]["type"] == "list":
-            html += f'<ul>'
+            html += '<ul>'
             for item in output:
                 html += f'<li>{item}</li>'
-            html += f'</ul>'
+            html += '</ul>'
         elif returns[returnOutput]["type"] == "text":
             html += f'<p>{output}</p>'
         elif returns[returnOutput]["type"] == "tx":
@@ -487,8 +485,8 @@ def plugin_output(outputs, returns):
             html += render_template('components/dns-output.html', dns=dns(output))
 
 
-        html += f'</div>'
+        html += '</div>'
-        html += f'</div>'        
+        html += '</div>'        
     return html
 
 def plugin_output_dash(outputs, returns):
@@ -498,7 +496,7 @@ def plugin_output_dash(outputs, returns):
     for returnOutput in returns:
         if returnOutput not in outputs:
             continue
-        if outputs[returnOutput] == None:
+        if outputs[returnOutput] is None:
             continue
         html += render_template('components/dashboard-plugin.html', name=returns[returnOutput]["name"], output=outputs[returnOutput])         
     return html
@@ -517,7 +515,7 @@ def renderDomain(name: str) -> str:
         return f"{rendered}/ ({name})"
 
 
-    except Exception as e:
+    except Exception:
         return f"{name}/"
 
 def renderDomainAsync(namehash: str) -> None:

server.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import platform
 from main import app
@@ -39,6 +38,6 @@ if __name__ == '__main__':
         sys.exit()
 
     print(f'Starting server with Waitress on {platform.system()} with {threads} threads...', flush=True)
-    print(f'Press Ctrl+C to stop the server', flush=True)
+    print('Press Ctrl+C to stop the server', flush=True)
-    print(f'Serving on http://0.0.0.0:5000/', flush=True)
+    print('Serving on http://0.0.0.0:5000/', flush=True)
     serve(app, host="0.0.0.0", port=5000, threads=threads)

start.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Find if .venv exists
+if [ -d ".venv" ]; then
+    echo "Virtual environment found. Activating..."
+    source .venv/bin/activate
+fi
+
+python3 server.py

templates/settings.html

@@ -85,6 +85,12 @@
             <h3>Delete unconfirmed transactions</h3><span>This will only remove pending tx from the wallet older than 20 minutes (~ 2 blocks)</span>
         </div>
     </li>
+    <li class="list-group-item">
+        <div><a class="btn btn-primary stick-right" role="button" href="/settings/api-info">API Info</a>
+            <h3>View API Information</h3><span>View information about the connected HSD node&#39;s API</span>
+        </div>
+    </li>
+
     {% if internal %}
     <li class="list-group-item">
         <div><a class="btn btn-primary stick-right" role="button" href="/settings/restart">Restart Node</a>
@@ -104,7 +110,7 @@
                             <ul class="list-group">
                                 <li class="list-group-item">
                                     <div><a class="btn btn-primary stick-right" role="button" href="/settings/xpub">xPub</a>
-                                        <h3>xPub Key</h3><span>Get your xPub key</span>
+                                        <h3>xPub Key</h3><span>View your Extended Public (xPub) key</span>
                                     </div>
                                 </li>
                                 <li class="list-group-item">
@@ -127,7 +133,7 @@
                         <div class="card-body">
                             <h4 class="card-title">About</h4>
                             <h6 class="text-muted mb-2 card-subtitle">FireWallet is a UI to allow easy connection with HSD created by <a href="https://nathan.woodburn.au" target="_blank">Nathan.Woodburn/</a> and freely available. Please contact him <a href="https://l.woodburn.au/contact" target="_blank">here</a> if you would like to request any features or report any bugs.<br>FireWallet version: <code>{{version}}</code></h6>
-                            <div class="text-center"><a href="https://github.com/nathanwoodburn/firewalletbrowser" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-github" style="color: var(--bs-emphasis-color);"></i>&nbsp;Github</a><a href="https://firewallet.au" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-ios-information" style="color: var(--bs-emphasis-color);"></i>&nbsp;Website</a><a href="https://l.woodburn.au/donate" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-usd" style="color: var(--bs-emphasis-color);"></i>&nbsp;Donate to support development</a></div>
+                            <div class="text-center"><a href="https://github.com/nathanwoodburn/firewalletbrowser" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-github" style="color: var(--bs-emphasis-color);"></i>&nbsp;Github</a><a href="https://firewallet.au" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-ios-information" style="color: var(--bs-emphasis-color);"></i>&nbsp;Website</a><a href="https://l.woodburn.au/donate" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-usd" style="color: var(--bs-emphasis-color);"></i>&nbsp;Donate to support development</a><a href="/settings/logs" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-help" style="color: var(--bs-emphasis-color);"></i>&nbsp;Upload logs for debugging</a></div>
                         </div>
                     </div>
                 </div>