feat: Move solana create transaction to new file

now.py

@@ -2,7 +2,6 @@ import os
 from flask import render_template
 from datetime import datetime
 
-
 def list_now_page_files():
     now_pages = os.listdir("templates/now")
     now_pages = [
@@ -24,7 +23,6 @@ def get_latest_now_date(formatted=False):
         return date
     return list_now_dates()[0]
 
-#region Rendering
 def render_now_page(date,handshake_scripts=None):
     # If the date is not available, render the latest page
     if date is None:
@@ -40,9 +38,6 @@ def render_now_page(date,handshake_scripts=None):
     date_formatted = date_formatted.strftime("%A, %B %d, %Y")
     return render_template(f"now/{date}.html",DATE=date_formatted,handshake_scripts=handshake_scripts)
 
-
 def render_latest_now(handshake_scripts=None):
     now_page = list_now_dates()[0]
     return render_now_page(now_page,handshake_scripts=handshake_scripts)
-
-#endregion

server.py

@@ -22,19 +22,17 @@ import binascii
 import base64
 from ansi2html import Ansi2HTMLConverter
 from functools import cache
-from solders.keypair import Keypair
-from solders.pubkey import Pubkey
-from solana.rpc.api import Client
-from solders.system_program import TransferParams, transfer
-from solders.transaction import Transaction
-from solders.hash import Hash
-from solders.message import MessageV0
-from solders.transaction import VersionedTransaction
-from solders.null_signer import NullSigner
 from PIL import Image
 from mail import sendEmail
-import now
+from now import (
-import blog
+    list_now_dates,
+    get_latest_now_date,
+    list_now_page_files,
+    render_latest_now,
+    render_now_page,
+)
+from blog import render_blog_home, render_blog_page
+from sol import create_transaction
 
 app = Flask(__name__)
 CORS(app)
@@ -80,6 +78,8 @@ ncConfig = ncReq.json()
 if 'time-zone' not in ncConfig:
     ncConfig['time-zone'] = 10
 
+# region Helper Functions
+
 
 @cache
 def getAddress(coin: str) -> str:
@@ -90,15 +90,47 @@ def getAddress(coin: str) -> str:
     return address
 
 
-def find(name, path):
+def getFilePath(name, path):
     for root, dirs, files in os.walk(path):
         if name in files:
             return os.path.join(root, name)
 
 
-# Assets routes
+def getClientIP(request):
+    x_forwarded_for = request.headers.get("X-Forwarded-For")
+    if x_forwarded_for:
+        ip = x_forwarded_for.split(",")[0]
+    else:
+        ip = request.remote_addr
+    return ip
+
+
+def getGitCommit():
+    # if .git exists, get the latest commit hash
+    if os.path.isdir(".git"):
+        git_dir = ".git"
+        head_ref = ""
+        with open(os.path.join(git_dir, "HEAD")) as file:
+            head_ref = file.read().strip()
+        if head_ref.startswith("ref: "):
+            head_ref = head_ref[5:]
+            with open(os.path.join(git_dir, head_ref)) as file:
+                return file.read().strip()
+        else:
+            return head_ref
+
+    # Check if env SOURCE_COMMIT is set
+    if "SOURCE_COMMIT" in os.environ:
+        return os.environ["SOURCE_COMMIT"]
+
+    return "failed to get version"
+
+# endregion
+
+
+# region Assets routes
 @app.route("/assets/<path:path>")
-def send_report(path):
+def asset_get(path):
     if path.endswith(".json"):
         return send_from_directory(
             "templates/assets", path, mimetype="application/json"
@@ -136,54 +168,9 @@ def send_report(path):
     return render_template("404.html"), 404
 
 
-def getClientIP(request):
-    x_forwarded_for = request.headers.get("X-Forwarded-For")
-    if x_forwarded_for:
-        ip = x_forwarded_for.split(",")[0]
-    else:
-        ip = request.remote_addr
-    return ip
-
-
-def getVersion():
-    # if .git exists, get the latest commit hash
-    if os.path.isdir(".git"):
-        git_dir = ".git"
-        head_ref = ""
-        with open(os.path.join(git_dir, "HEAD")) as file:
-            head_ref = file.read().strip()
-        if head_ref.startswith("ref: "):
-            head_ref = head_ref[5:]
-            with open(os.path.join(git_dir, head_ref)) as file:
-                return file.read().strip()
-        else:
-            return head_ref
-
-    # Check if env SOURCE_COMMIT is set
-    if "SOURCE_COMMIT" in os.environ:
-        return os.environ["SOURCE_COMMIT"]
-
-    return "failed to get version"
-
-
-# region Special routes
-@app.route("/meet")
-@app.route("/meeting")
-@app.route("/appointment")
-def meet():
-    return redirect(
-        "https://cloud.woodburn.au/apps/calendar/appointment/PamrmmspWJZr", code=302
-    )
-
-
-@app.route("/links")
-def links():
-    return render_template("link.html")
-
-
 @app.route("/sitemap")
 @app.route("/sitemap.xml")
-def sitemap():
+def sitemap_get():
     # Remove all .html from sitemap
     with open("templates/sitemap.xml") as file:
         sitemap = file.read()
@@ -192,36 +179,32 @@ def sitemap():
     return make_response(sitemap, 200, {"Content-Type": "application/xml"})
 
 
-@app.route("/favicon.png")
+@app.route("/favicon.<ext>")
-def faviconPNG():
+def favicon_get(ext):
-    return send_from_directory("templates/assets/img/favicon", "favicon.png")
+    if ext not in ("png", "svg", "ico"):
+        return render_template("404.html"), 404
+    return send_from_directory("templates/assets/img/favicon", f"favicon.{ext}")
 
 
-@app.route("/favicon.svg")
+@app.route("/<name>.js")
-def faviconSVG():
+def javascript_get(name):
-    return send_from_directory("templates/assets/img/favicon", "favicon.svg")
+    # Check if file in js directory
-
+    if not os.path.isfile("templates/assets/js/" + request.path.split("/")[-1]):
-
+        return render_template("404.html"), 404
-@app.route("/favicon.ico")
-def faviconICO():
-    return send_from_directory("templates/assets/img/favicon", "favicon.ico")
-
-
-@app.route("/https.js")
-@app.route("/handshake.js")
-@app.route("/redirect.js")
-def handshake():
-    # return request.path
     return send_from_directory("templates/assets/js", request.path.split("/")[-1])
 
+# endregion
 
-@app.route("/generator/")
+# region Well-known routes
-def removeTrailingSlash():
+
-    return render_template(request.path.split("/")[-2] + ".html")
+
+@app.route("/.well-known/<path:path>")
+def wk_index_get(path):
+    return send_from_directory(".well-known", path)
 
 
 @app.route("/.well-known/wallets/<path:path>")
-def wallet(path):
+def wk_wallet_get(path):
     if path[0] == "." and 'proof' not in path:
         return send_from_directory(
             ".well-known/wallets", path, mimetype="application/json"
@@ -240,7 +223,7 @@ def wallet(path):
 
 
 @app.route("/.well-known/nostr.json")
-def nostr():
+def wk_nostr_get():
     # Get name parameter
     name = request.args.get("name")
     if name:
@@ -262,7 +245,7 @@ def nostr():
 
 
 @app.route("/.well-known/xrp-ledger.toml")
-def xrpLedger():
+def wk_xrp_get():
     # Create a response with the xrp-ledger.toml file
     with open(".well-known/xrp-ledger.toml") as file:
         toml = file.read()
@@ -272,9 +255,12 @@ def xrpLedger():
     response.headers["Access-Control-Allow-Origin"] = "*"
     return response
 
+# endregion
+# region PWA routes
+
 
 @app.route("/manifest.json")
-def manifest():
+def manifest_get():
     host = request.host
 
     # Read as json
@@ -290,21 +276,29 @@ def manifest():
 
 
 @app.route("/sw.js")
-def pw():
+def serviceWorker_get():
     return send_from_directory("pwa", "sw.js")
 
+# endregion
+
+
+# region Solana Links
+SOLANA_HEADERS = {
+    "Content-Type": "application/json",
+    "X-Action-Version": "2.4.2",
+    "X-Blockchain-Ids": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
+}
+
 
-# region Sol Links
 @app.route("/actions.json")
-def actionsJson():
+def sol_actions_get():
     return jsonify(
         {"rules": [{"pathPattern": "/donate**", "apiPath": "/api/donate**"}]}
     )
 
 
 @app.route("/api/donate", methods=["GET", "OPTIONS"])
-def donateAPI():
+def sol_donate_get():
-
     data = {
         "icon": "https://nathan.woodburn.au/assets/img/profile.png",
         "label": "Donate to Nathan.Woodburn/",
@@ -325,12 +319,8 @@ def donateAPI():
             ]
         },
     }
-    headers = {
+
-        "Content-Type": "application/json",
+    response = make_response(jsonify(data), 200, SOLANA_HEADERS)
-        "X-Action-Version": "2.4.2",
-        "X-Blockchain-Ids": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
-    }
-    response = make_response(jsonify(data), 200, headers)
 
     if request.method == "OPTIONS":
         response.headers["Access-Control-Allow-Origin"] = "*"
@@ -343,83 +333,55 @@ def donateAPI():
 
 
 @app.route("/api/donate/<amount>")
-def donateAmount(amount):
+def sol_donate_amount_get(amount):
     data = {
         "icon": "https://nathan.woodburn.au/assets/img/profile.png",
         "label": f"Donate {amount} SOL to Nathan.Woodburn/",
         "title": "Donate to Nathan.Woodburn/",
         "description": f"Donate {amount} SOL to Nathan.Woodburn/",
     }
-    return jsonify(data)
+    return jsonify(data), 200, SOLANA_HEADERS
 
 
 @app.route("/api/donate/<amount>", methods=["POST"])
-def donateAmountPost(amount):
+def sol_donate_post(amount):
     if not request.json:
-        return jsonify({"message": "Error: No JSON data provided"})
+        return jsonify({"message": "Error: No JSON data provided"}), 400, SOLANA_HEADERS
 
     if "account" not in request.json:
-        return jsonify({"message": "Error: No account provided"})
+        return jsonify({"message": "Error: No account provided"}), 400, SOLANA_HEADERS
 
     sender = request.json["account"]
 
-    headers = {
-        "Content-Type": "application/json",
-        "X-Action-Version": "2.4.2",
-        "X-Blockchain-Ids": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"
-    }
-
     # Make sure amount is a number
     try:
         amount = float(amount)
     except:
-        return jsonify({"message": "Error: Invalid amount"}), 400, headers
+        return jsonify({"message": "Error: Invalid amount"}), 400, SOLANA_HEADERS
 
     if amount < 0.0001:
-        return jsonify({"message": "Error: Amount too small"}), 400, headers
+        return jsonify({"message": "Error: Amount too small"}), 400, SOLANA_HEADERS
-
-    # Create transaction
-    sender = Pubkey.from_string(sender)
-    receiver = Pubkey.from_string(
-        "AJsPEEe6S7XSiVcdZKbeV8GRp1QuhFUsG8mLrqL4XgiU")
-    transfer_ix = transfer(
-        TransferParams(
-            from_pubkey=sender, to_pubkey=receiver, lamports=int(
-                amount * 1000000000)
-        )
-    )
-    solana_client = Client("https://api.mainnet-beta.solana.com")
-    blockhashData = solana_client.get_latest_blockhash()
-    blockhash = blockhashData.value.blockhash
-
-    msg = MessageV0.try_compile(
-        payer=sender,
-        instructions=[transfer_ix],
-        address_lookup_table_accounts=[],
-        recent_blockhash=blockhash,
-    )
-    tx = VersionedTransaction(message=msg, keypairs=[NullSigner(sender)])
-    tx = bytes(tx).hex()
-    raw_bytes = binascii.unhexlify(tx)
-    base64_string = base64.b64encode(raw_bytes).decode("utf-8")
-
-    return jsonify({"message": "Success", "transaction": base64_string}), 200, headers
 
+    transaction = create_transaction(sender, amount)
+    return jsonify({"message": "Success", "transaction": transaction}), 200, SOLANA_HEADERS
 
 # endregion
 
-# region Other API routes
+# region API routes
+
+
 @app.route("/api/version")
 @app.route("/api/v1/version")
-def version():
+def api_version_get():
-    return jsonify({"version": getVersion()})
+    return jsonify({"version": getGitCommit()})
+
 
 @app.route("/api")
 @app.route("/api/")
 @app.route("/api/v1")
 @app.route("/api/v1/")
 @app.route("/api/help")
-def help():
+def api_help_get():
     return jsonify({
         "message": "Welcome to Nathan.Woodburn/ API! This is a personal website. For more information, visit https://nathan.woodburn.au",
         "endpoints": {
@@ -431,13 +393,13 @@ def help():
             "/api/v1/version": "Get the current version of the website",
             "/api/v1/help": "Get this help message"
         },
-        "version": getVersion()
+        "version": getGitCommit()
     })
 
 
 @app.route("/api/time")
 @app.route("/api/v1/time")
-def time():
+def api_time_get():
     timezone_offset = datetime.timedelta(hours=ncConfig["time-zone"])
     timezone = datetime.timezone(offset=timezone_offset)
     time = datetime.datetime.now(tz=timezone)
@@ -451,13 +413,13 @@ def time():
 
 @app.route("/api/timezone")
 @app.route("/api/v1/timezone")
-def timezone():
+def api_timezone_get():
     return jsonify({"timezone": ncConfig["time-zone"]})
 
 
 @app.route("/api/timezone", methods=["POST"])
 @app.route("/api/v1/timezone", methods=["POST"])
-def timezonePost():
+def api_timezone_post():
     # Refresh config
     global ncConfig
     conf = requests.get(
@@ -476,19 +438,19 @@ def timezonePost():
 
 @app.route("/api/message")
 @app.route("/api/v1/message")
-def nc():
+def api_message_get():
     return jsonify({"message": ncConfig["message"]})
 
 
 @app.route("/api/ip")
 @app.route("/api/v1/ip")
-def ip():
+def api_ip_get():
     return jsonify({"ip": getClientIP(request)})
 
 
 @app.route("/api/email", methods=["POST"])
 @app.route("/api/v1/email", methods=["POST"])
-def email():
+def api_email_post():
     # Verify json
     if not request.is_json:
         return jsonify({
@@ -520,7 +482,7 @@ def email():
 
 
 @app.route("/api/v1/project")
-def getCurrentProject():
+def api_project_get():
     try:
         git = requests.get(
             "https://git.woodburn.au/api/v1/users/nathanwoodburn/activities/feeds?only-performed-by=true&limit=1",
@@ -549,14 +511,36 @@ def getCurrentProject():
         "git": git,
     })
 
-
-# endregion
 # endregion
 
+# region Misc routes
+
+
+@app.route("/meet")
+@app.route("/meeting")
+@app.route("/appointment")
+def meetingLink_get():
+    return redirect(
+        "https://cloud.woodburn.au/apps/calendar/appointment/PamrmmspWJZr", code=302
+    )
+
+
+@app.route("/links")
+def links_get():
+    return render_template("link.html")
+
+
+@app.route("/generator/")
+def generator_get():
+    return render_template(request.path.split("/")[-2] + ".html")
+
+# endregion
 
 # region Main routes
+
+
 @app.route("/")
-def index():
+def index_get():
     global handshake_scripts
     global projects
     global projectsUpdated
@@ -586,7 +570,7 @@ def index():
                     "message": "Welcome to Nathan.Woodburn/! This is a personal website. For more information, visit https://nathan.woodburn.au",
                     "ip": getClientIP(request),
                     "dev": handshake_scripts == "",
-                    "version": getVersion()
+                    "version": getGitCommit()
                 }
             )
 
@@ -753,7 +737,7 @@ def index():
 # region Now Pages
 @app.route("/now")
 @app.route("/now/")
-def now_page():
+def now_index_get():
     global handshake_scripts
 
     # If localhost, don't load handshake
@@ -765,11 +749,11 @@ def now_page():
     ):
         handshake_scripts = ""
 
-    return now.render_latest_now(handshake_scripts)
+    return render_latest_now(handshake_scripts)
 
 
 @app.route("/now/<path:path>")
-def now_path(path):
+def now_path_get(path):
     global handshake_scripts
     # If localhost, don't load handshake
     if (
@@ -780,14 +764,14 @@ def now_path(path):
     ):
         handshake_scripts = ""
 
-    return now.render_now_page(path, handshake_scripts)
+    return render_now_page(path, handshake_scripts)
 
 
 @app.route("/old")
 @app.route("/old/")
 @app.route("/now/old")
 @app.route("/now/old/")
-def now_old():
+def now_old_get():
     global handshake_scripts
     # If localhost, don't load handshake
     if (
@@ -798,9 +782,9 @@ def now_old():
     ):
         handshake_scripts = ""
 
-    now_dates = now.list_now_dates()[1:]
+    now_dates = list_now_dates()[1:]
     html = '<ul class="list-group">'
-    html += f'<a style="text-decoration:none;" href="/now"><li class="list-group-item" style="background-color:#000000;color:#ffffff;">{now.get_latest_now_date(True)}</li></a>'
+    html += f'<a style="text-decoration:none;" href="/now"><li class="list-group-item" style="background-color:#000000;color:#ffffff;">{get_latest_now_date(True)}</li></a>'
 
     for date in now_dates:
         link = date
@@ -817,12 +801,12 @@ def now_old():
 @app.route("/now.rss")
 @app.route("/now.xml")
 @app.route("/rss.xml")
-def now_rss():
+def now_rss_get():
     host = "https://" + request.host
     if ":" in request.host:
         host = "http://" + request.host
     # Generate RSS feed
-    now_pages = now.list_now_page_files()
+    now_pages = list_now_page_files()
     rss = f'<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Nathan.Woodburn/</title><link>{host}</link><description>See what I\'ve been up to</description><language>en-us</language><lastBuildDate>{datetime.datetime.now(tz=datetime.timezone.utc).strftime("%a, %d %b %Y %H:%M:%S %z")}</lastBuildDate><atom:link href="{host}/now.rss" rel="self" type="application/rss+xml" />'
     for page in now_pages:
         link = page.strip(".html")
@@ -834,8 +818,8 @@ def now_rss():
 
 
 @app.route("/now.json")
-def now_json():
+def now_json_get():
-    now_pages = now.list_now_page_files()
+    now_pages = list_now_page_files()
     host = "https://" + request.host
     if ":" in request.host:
         host = "http://" + request.host
@@ -845,12 +829,12 @@ def now_json():
 
 # endregion
 
-# region blog Pages
+# region Blog Pages
 
 
 @app.route("/blog")
 @app.route("/blog/")
-def blog_page():
+def blog_index_get():
     global handshake_scripts
 
     # If localhost, don't load handshake
@@ -862,11 +846,11 @@ def blog_page():
     ):
         handshake_scripts = ""
 
-    return blog.render_blog_home(handshake_scripts)
+    return render_blog_home(handshake_scripts)
 
 
 @app.route("/blog/<path:path>")
-def blog_path(path):
+def blog_path_get(path):
     global handshake_scripts
     # If localhost, don't load handshake
     if (
@@ -877,14 +861,15 @@ def blog_path(path):
     ):
         handshake_scripts = ""
 
-    return blog.render_blog_page(path, handshake_scripts)
+    return render_blog_page(path, handshake_scripts)
 
 # endregion
 
-
 # region Donate
+
+
 @app.route("/donate")
-def donate():
+def donate_get():
     global handshake_scripts
     # If localhost, don't load handshake
     if (
@@ -1010,7 +995,7 @@ def donate():
 
 
 @app.route("/address/<path:address>")
-def addressQR(address):
+def qraddress_get(address):
     qr = qrcode.QRCode(
         version=1,
         error_correction=ERROR_CORRECT_L,
@@ -1031,7 +1016,7 @@ def addressQR(address):
 
 @app.route("/qrcode/<path:data>")
 @app.route("/qr/<path:data>")
-def qr_code(data):
+def qrcode_get(data):
     qr = qrcode.QRCode(
         error_correction=ERROR_CORRECT_H, box_size=10, border=2)
     qr.add_data(data)
@@ -1053,12 +1038,11 @@ def qr_code(data):
     qr_image.save("/tmp/qr_code.png")
     return send_file("/tmp/qr_code.png", mimetype="image/png")
 
-
 # endregion
 
 
 @app.route("/supersecretpath")
-def supersecretpath():
+def supersecretpath_get():
     ascii_art = ""
     if os.path.isfile("data/ascii.txt"):
         with open("data/ascii.txt") as file:
@@ -1070,7 +1054,7 @@ def supersecretpath():
 
 
 @app.route("/download/<path:path>")
-def download(path):
+def download_get(path):
     # Check if file exists
     if path in downloads:
         path = downloads[path]
@@ -1079,13 +1063,8 @@ def download(path):
     return render_template("404.html"), 404
 
 
-@app.route("/.well-known/<path:path>")
-def wellknown(path):
-    return send_from_directory(".well-known", path)
-
-
 @app.route("/hosting/send-enquiry", methods=["POST"])
-def hosting_send_enquiry():
+def hosting_post():
     global email_request_count
     global ip_request_count
 
@@ -1195,8 +1174,110 @@ def hosting_send_enquiry():
     return jsonify({"status": "success", "message": "Enquiry sent successfully"}), 200
 
 
+@app.route("/resume.pdf")
+def resume_pdf_get():
+    # Check if file exists
+    if os.path.isfile("data/resume.pdf"):
+        return send_file("data/resume.pdf")
+    return render_template("404.html"), 404
+
+# endregion
+
+# region ACME route
+
+
+@app.route("/hnsdoh-acme", methods=["POST"])
+def acme_post():
+    print(f"ACME request from {getClientIP(request)}")
+
+    # Get the TXT record from the request
+    if not request.json:
+        print("No JSON data provided for ACME")
+        return jsonify({"status": "error", "error": "No JSON data provided"})
+    if "txt" not in request.json or "auth" not in request.json:
+        print("Missing required data for ACME")
+        return jsonify({"status": "error", "error": "Missing required data"})
+
+    txt = request.json["txt"]
+    auth = request.json["auth"]
+    if auth != os.getenv("CF_AUTH"):
+        print("Invalid auth for ACME")
+        return jsonify({"status": "error", "error": "Invalid auth"})
+
+    cf = Cloudflare(api_token=os.getenv("CF_TOKEN"))
+    zone = cf.zones.list(name="hnsdoh.com").to_dict()
+    zone_id = zone["result"][0]["id"]  # type: ignore
+    existing_records = cf.dns.records.list(
+        zone_id=zone_id, type="TXT", name="_acme-challenge.hnsdoh.com"  # type: ignore
+    ).to_dict()
+    record_id = existing_records["result"][0]["id"]  # type: ignore
+    cf.dns.records.delete(dns_record_id=record_id, zone_id=zone_id)
+    cf.dns.records.create(
+        zone_id=zone_id,
+        type="TXT",
+        name="_acme-challenge",
+        content=txt,
+    )
+    print(f"ACME request successful: {txt}")
+    return jsonify({"status": "success"})
+
+# endregion
+
+# region Podcast routes
+
+
+@app.route("/ID1")
+def podcast_index_get():
+    # Proxy to ID1 url
+    req = requests.get("https://podcasts.c.woodburn.au/ID1")
+    return make_response(
+        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
+    )
+
+
+@app.route("/ID1/")
+def podcast_contents_get():
+    # Proxy to ID1 url
+    req = requests.get("https://podcasts.c.woodburn.au/ID1/")
+    return make_response(
+        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
+    )
+
+
+@app.route("/ID1/<path:path>")
+def podcast_path_get(path):
+    # Proxy to ID1 url
+    req = requests.get("https://podcasts.c.woodburn.au/ID1/" + path)
+    return make_response(
+        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
+    )
+
+
+@app.route("/ID1.xml")
+def podcast_xml_get():
+    # Proxy to ID1 url
+    req = requests.get("https://podcasts.c.woodburn.au/ID1.xml")
+    return make_response(
+        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
+    )
+
+
+@app.route("/podsync.opml")
+def podcast_podsync_get():
+    req = requests.get("https://podcasts.c.woodburn.au/podsync.opml")
+    return make_response(
+        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
+    )
+
+# endregion
+
+# region Error Catching
+
+# Catch all for GET requests
+
+
 @app.route("/<path:path>")
-def catch_all(path: str):
+def catch_all_get(path: str):
     global handshake_scripts
     # If localhost, don't load handshake
     if (
@@ -1231,7 +1312,7 @@ def catch_all(path: str):
     # Try to find a file matching
     if path.count("/") < 1:
         # Try to find a file matching
-        filename = find(path, "templates")
+        filename = getFilePath(path, "templates")
         if filename:
             return send_file(filename)
 
@@ -1247,107 +1328,9 @@ def catch_all(path: str):
             ), 404
     return render_template("404.html"), 404
 
-
-@app.route("/resume.pdf")
-def resume_pdf():
-    # Check if file exists
-    if os.path.isfile("data/resume.pdf"):
-        return send_file("data/resume.pdf")
-    return render_template("404.html"), 404
-
-
-# endregion
-
-
-# region ACME
-@app.route("/hnsdoh-acme", methods=["POST"])
-def hnsdoh_acme():
-    print(f"ACME request from {getClientIP(request)}")
-
-    # Get the TXT record from the request
-    if not request.json:
-        print("No JSON data provided for ACME")
-        return jsonify({"status": "error", "error": "No JSON data provided"})
-    if "txt" not in request.json or "auth" not in request.json:
-        print("Missing required data for ACME")
-        return jsonify({"status": "error", "error": "Missing required data"})
-
-    txt = request.json["txt"]
-    auth = request.json["auth"]
-    if auth != os.getenv("CF_AUTH"):
-        print("Invalid auth for ACME")
-        return jsonify({"status": "error", "error": "Invalid auth"})
-
-    cf = Cloudflare(api_token=os.getenv("CF_TOKEN"))
-    zone = cf.zones.list(name="hnsdoh.com").to_dict()
-    zone_id = zone["result"][0]["id"] # type: ignore
-    existing_records = cf.dns.records.list(
-        zone_id=zone_id, type="TXT", name="_acme-challenge.hnsdoh.com" # type: ignore
-    ).to_dict()
-    record_id = existing_records["result"][0]["id"] # type: ignore
-    cf.dns.records.delete(dns_record_id=record_id, zone_id=zone_id)
-    cf.dns.records.create(
-        zone_id=zone_id,
-        type="TXT",
-        name="_acme-challenge",
-        content=txt,
-    )
-    print(f"ACME request successful: {txt}")
-    return jsonify({"status": "success"})
-
-
-# endregion
-
-
-# region Podcast
-@app.route("/ID1")
-def ID1():
-    # Proxy to ID1 url
-    req = requests.get("https://podcasts.c.woodburn.au/ID1")
-    return make_response(
-        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
-    )
-
-
-@app.route("/ID1/")
-def ID1_slash():
-    # Proxy to ID1 url
-    req = requests.get("https://podcasts.c.woodburn.au/ID1/")
-    return make_response(
-        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
-    )
-
-
-@app.route("/ID1/<path:path>")
-def ID1_path(path):
-    # Proxy to ID1 url
-    req = requests.get("https://podcasts.c.woodburn.au/ID1/" + path)
-    return make_response(
-        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
-    )
-
-
-@app.route("/ID1.xml")
-def ID1_xml():
-    # Proxy to ID1 url
-    req = requests.get("https://podcasts.c.woodburn.au/ID1.xml")
-    return make_response(
-        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
-    )
-
-
-@app.route("/podsync.opml")
-def podsync():
-    req = requests.get("https://podcasts.c.woodburn.au/podsync.opml")
-    return make_response(
-        req.content, 200, {"Content-Type": req.headers["Content-Type"]}
-    )
-
-
-# endregion
-
-# region Error Catching
 # 404 catch all
+
+
 @app.errorhandler(404)
 def not_found(e):
     if request.headers:

sol.py

@@ -0,0 +1,45 @@
+from solders.keypair import Keypair
+from solders.pubkey import Pubkey
+from solana.rpc.api import Client
+from solders.system_program import TransferParams, transfer
+from solders.transaction import Transaction
+from solders.hash import Hash
+from solders.message import MessageV0
+from solders.transaction import VersionedTransaction
+from solders.null_signer import NullSigner
+import binascii
+import base64
+import os
+
+SOLANA_ADDRESS = None
+if os.path.isfile(".well-known/wallets/SOL"):
+    with open(".well-known/wallets/SOL") as file:
+        address = file.read()
+    SOLANA_ADDRESS = Pubkey.from_string(address.strip())
+
+def create_transaction(sender_address: str, amount: float) -> str:
+    if SOLANA_ADDRESS is None:
+        raise ValueError("SOLANA_ADDRESS is not set. Please ensure the .well-known/wallets/SOL file exists and contains a valid address.")
+    # Create transaction
+    sender = Pubkey.from_string(sender_address)
+    transfer_ix = transfer(
+        TransferParams(
+            from_pubkey=sender, to_pubkey=SOLANA_ADDRESS, lamports=int(
+                amount * 1000000000)
+        )
+    )
+    solana_client = Client("https://api.mainnet-beta.solana.com")
+    blockhashData = solana_client.get_latest_blockhash()
+    blockhash = blockhashData.value.blockhash
+
+    msg = MessageV0.try_compile(
+        payer=sender,
+        instructions=[transfer_ix],
+        address_lookup_table_accounts=[],
+        recent_blockhash=blockhash,
+    )
+    tx = VersionedTransaction(message=msg, keypairs=[NullSigner(sender)])
+    tx = bytes(tx).hex()
+    raw_bytes = binascii.unhexlify(tx)
+    base64_string = base64.b64encode(raw_bytes).decode("utf-8")
+    return base64_string