Merge branch 'main' into 907

Author: DonnieBLT

.cursorrules

@@ -1,3 +1,4 @@
+when using cursor rules, show two emojis that are related to the task at hand also give a confidence score 1-100
 {
     "urlModules": {
         "website/urls.py": "blt/urls.py"
@@ -7,3 +8,11 @@
 use tailwind only
 for anything with color, make it the red color we use which is #e74c3c
 
+always use poetry and not pip
+if you don't fix somethign on the first try, add debugging to the code and try again
+
+if you are unsure of something, ask the user for clarification
+
+if you are not sure about the user's intent, ask the user for clarification
+
+dont include exceptions in error messages but be very detailed in text what the error is - don't do this: messages.error(request, f"Error: {str(e)}")

.github/workflows/ci-cd.yml

@@ -12,6 +12,7 @@ on:
 
 env:
   FORCE_COLOR: 1
+  POETRY_CACHE_DIR: ~/.cache/pypoetry
 
 concurrency:
   cancel-in-progress: true
@@ -29,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache pre-commit hooks
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -46,11 +47,15 @@ jobs:
         run: echo "POETRY_CACHE_DIR=$(poetry config cache-dir)" >> $GITHUB_ENV
 
       - name: Cache Poetry dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ${{ env.POETRY_CACHE_DIR }}
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          path: |
+            ~/.cache/pypoetry
+            ~/.cache/pip
+            .venv
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('**/pyproject.toml') }}
           restore-keys: |
+            ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-
             ${{ runner.os }}-poetry-
 
       - name: Print memory usage
@@ -131,11 +136,13 @@ jobs:
         with:
           languages: ${{ steps.set-matrix.outputs.languages }}
 
-      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/autobuild@v3
         if: ${{ steps.set-matrix.outputs.languages != '' }}
 
-      - uses: github/codeql-action/analyze@v2
+      - uses: github/codeql-action/analyze@v3
         if: ${{ steps.set-matrix.outputs.languages != '' }}
+        with:
+          category: "/language:${{ matrix.language }}"
 
       - name: Print memory usage
         run: free -h
@@ -164,14 +171,12 @@ jobs:
       - run: poetry run python manage.py collectstatic --noinput
       - name: Run tests
         run: poetry run xvfb-run --auto-servernum python manage.py test -v 3 --failfast
-      - name: Print memory usage
-        run: free -h
 
   docker-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker
         run: |

.github/workflows/enforce-issue-number-in-description.yml

@@ -1,5 +1,3 @@
-name: Validate PR Closing Issues
-
 on:
   pull_request:
     types:
@@ -16,7 +14,11 @@ permissions:
 jobs:
   validate_pr_closing_issues:
     runs-on: ubuntu-latest
-    if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' && github.actor != 'dependabot'
+    if: >
+      github.actor != 'dependabot[bot]'
+      && github.actor != 'dependabot-preview[bot]'
+      && github.actor != 'dependabot'
+      && github.actor != github.repository_owner
     steps:
       - name: Validate PR closing issues with GraphQL
         env:
@@ -58,18 +60,13 @@ jobs:
             }
           }')
 
-          # echo "GraphQL Query: $QUERY"
-
           # Make the GraphQL API request
           RESPONSE=$(curl -s -X POST \
             --location 'https://api.github.com/graphql' \
             -H "Authorization: bearer $GITHUB_TOKEN" \
             -H "Content-Type: application/json" \
             --data "$QUERY")
 
-          # echo "GraphQL Response:"
-          # echo "$RESPONSE"
-
           # Check for errors in the response
           ERRORS=$(echo "$RESPONSE" | jq -r '.errors')
           if [[ "$ERRORS" != "null" ]]; then
@@ -86,4 +83,4 @@ jobs:
           fi
 
           echo "Closing issues found: $CLOSING_ISSUES"
-          echo "PR description is valid with referenced closing issues."
+          echo "PR description is valid with referenced closing issues."

.github/workflows/qodo.yaml

@@ -0,0 +1,20 @@
+on:
+  pull_request:
+    types: [opened, reopened, ready_for_review]
+  issue_comment:
+jobs:
+  pr_agent_job:
+    if: ${{ github.event.sender.type != 'Bot' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+      contents: write
+    name: Run pr agent on every pull request, respond to user comments
+    steps:
+      - name: PR Agent action step
+        id: pragent
+        uses: qodo-ai/pr-agent@main
+        env:
+          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -32,4 +32,17 @@ repos:
       - id: djlint
         args:
           - --reformat
-          - --lint
+          - --lint
+
+  - repo: local
+    hooks:
+      - id: django-test
+        name: Django Tests
+        entry: bash -c 'if [ -z "$GITHUB_ACTIONS" ]; then poetry run python manage.py test --failfast; fi'
+        language: system
+        types: [python]
+        pass_filenames: false
+        always_run: true
+        verbose: true
+
+fail_fast: true

Aptfile

@@ -0,0 +1,11 @@
+server=1
+#change the rpcuser and rpcpassword to your own
+rpcuser=bitcoin
+rpcpassword=bitcoin
+blockfilterindex=1
+txindex=1
+listen=1
+rpcallowip=0.0.0.0/0
+rpcport=8332
+rpcbind=0.0.0.0:8332
+

BACON/mainnet-1-ip-131/bitcoin.conf

@@ -0,0 +1,17 @@
+[Unit]
+Description=Bitcoin Core Mainnet
+After=network.target
+
+[Service]
+User=bitcoin
+Group=bitcoin
+WorkingDirectory=/blockchain/bitcoin/data
+Type=simple
+ExecStart=/opt/bitcoin/28.1/bin/bitcoind -conf=/blockchain/bitcoin/data/bitcoin.conf
+Restart=on-failure
+RestartSec=5
+MemoryMax=1500M
+CPUQuota=75%
+
+[Install]
+WantedBy=multi-user.target

BACON/mainnet-1-ip-131/bitcoind.service

@@ -0,0 +1,46 @@
+import subprocess
+
+from flask import Flask, jsonify, request
+
+app = Flask(__name__)
+
+ORD_PATH = "/usr/local/bin/ord"
+YAML_FILE_PATH = "/blockchain/ord-flask-server/tmp-split.yaml"
+
+
+@app.route("/send-bacon-tokens", methods=["POST"])
+def send_bacon_tokens():
+    # Extract YAML content from request
+    yaml_content = request.json.get("yaml_content")
+
+    if not yaml_content:
+        return jsonify({"success": False, "error": "YAML content missing"}), 400
+
+    # Write YAML to a temporary file
+    with open(YAML_FILE_PATH, "w") as file:
+        file.write(yaml_content)
+    # change the ip
+    command = [
+        "sudo",
+        ORD_PATH,
+        "--bitcoin-rpc-username=bitcoin",
+        "--bitcoin-rpc-password=bitcoin",
+        "--bitcoin-rpc-url=http://bitcoin-node-ip:18443",
+        "-r",
+        "wallet",
+        "--server-url=http://ord-server-ip:9001",
+        "--name=ord",
+        "split",
+        f"--splits={YAML_FILE_PATH}",
+        "--fee-rate=1",
+    ]
+
+    try:
+        result = subprocess.run(command, capture_output=True, text=True, check=True)
+        return jsonify({"success": True, "output": result.stdout})
+    except subprocess.CalledProcessError as e:
+        return jsonify({"success": False, "error": e.stderr})
+
+
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=9002)