From bf9d8c436dc5bd9f38d80c170e654b829dcf3c02 Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Mon, 24 Feb 2025 01:25:46 -0800
Subject: [PATCH 1/2] Update requirements, specifically the btchip-python req

---
 .github/workflows/main.yaml | 16 +---------------
 requirements.txt            | 12 +++++++++---
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 379ff85..50d48a9 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -21,14 +21,8 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          pip install pip==24.0
-          pip install wheel==0.35.0
-          pip install setuptools==53.0.0
           pip install -r requirements.txt
-          pip install importlib-metadata==4.13.0
-          pip install flake8==3.8.4
           pip install mypy==0.781
-          pip install vulture==2.3
 
       - name: Lint
         run: |
@@ -53,7 +47,7 @@ jobs:
             packages: libusb-1.0-0-dev libudev-dev
 
           - name: macOS
-            os: macos-12
+            os: macos-13
             cachepath: ~/Library/Caches/pip
 
           - name: Windows
@@ -80,15 +74,7 @@ jobs:
             sudo apt-get update
             sudo apt-get install --no-install-recommends --no-upgrade -qq ${{ matrix.config.packages }}
           fi
-          if [[ ${{ matrix.config.os }} = windows* ]]; then
-            python.exe -m pip install pip==24.0
-          else
-            pip install pip==24.0
-          fi
-          pip install wheel==0.35.0
-          pip install setuptools==53.0.0
           pip install -r requirements.txt
-          pip install pyinstaller
       - name: Build
         run: |
           pyinstaller SecurePivxMasternodeTool.spec
diff --git a/requirements.txt b/requirements.txt
index 27654b1..471b0ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,16 @@
-wheel==0.35.0
-setuptools==53.0.0
+wheel==0.45.1
+setuptools==75.8.0
 python-bitcoinrpc==1.0
 bitcoin==1.1.42
-btchip-python==0.1.27
 trezor==0.11.5
 PyQt5>=5.15.10
 requests==2.32.2
 simplejson==3.19.2
 ecdsa==0.19.0
+importlib-metadata==4.13.0
+flake8==3.8.4
+vulture==2.3
+pyinstaller==6.12.0
+# btchip-python 0.1.32 with a patch to fix a malformed dependency
+# See https://github.com/LedgerHQ/btchip-python/pull/54
+https://github.com/PIVX-Project/btchip-python/archive/e13eab8b0e665bdc23ac4b3890d2a5742303c421.tar.gz

From 4c810a6046dba766835af9846411a3ddeaf768ef Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Mon, 24 Feb 2025 01:55:38 -0800
Subject: [PATCH 2/2] Use Ubuntu 22.04

---
 .github/workflows/main.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 50d48a9..99dc7a3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash
@@ -42,7 +42,7 @@ jobs:
       matrix:
         config:
           - name: Linux
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             cachepath: ~/.cache/pip
             packages: libusb-1.0-0-dev libudev-dev