From 3d24fd0e0e09f02eaf4581804001359d6be5ab44 Mon Sep 17 00:00:00 2001
From: Remco Ros <remcoros@live.nl>
Date: Sat, 8 Jun 2024 11:45:46 +0000
Subject: [PATCH] update to Wasabi 2.0.8.1 and force enable GPU rendering to
 workaround crashes

---
 Dockerfile                                     | 17 +++++------------
 Makefile                                       |  2 +-
 docker_entrypoint.sh                           |  3 +++
 manifest.yaml                                  |  7 ++++---
 root/defaults/.walletwasabi/client/Config.json | 10 ++++++++--
 root/defaults/autostart                        |  2 +-
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index df14d23..eef70ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,12 +25,16 @@ RUN \
     # dark theme
     hsetroot \
     gnome-themes-extra \
-    compton \
+    xcompmgr \
     # desktop notifications
     xfce4-notifyd \
     libnotify-bin \
     notification-daemon \
     xclip \
+    # GPU support
+    xserver-xorg-video-all \
+    xserver-xorg-video-radeon \
+    va-driver-all \
     # other
     policykit-1 \
     wget \
@@ -47,17 +51,6 @@ RUN \
     docker-compose-plugin \
     fonts-noto-color-emoji \
     fonts-noto-core \
-    intel-media-va-driver \
-    libvulkan1 \
-    mesa-va-drivers \
-    mesa-vulkan-drivers \
-    vulkan-tools \
-    xserver-xorg-video-amdgpu \
-    xserver-xorg-video-ati \
-    xserver-xorg-video-intel \
-    xserver-xorg-video-nouveau \
-    xserver-xorg-video-qxl \
-    xserver-xorg-video-radeon \
     perl \
     locales-all && \
   # remove left-over locales and generate default
diff --git a/Makefile b/Makefile
index cb62750..28122e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-WASABI_VERSION := 2.0.8
+WASABI_VERSION := 2.0.8.1
 WASABI_PGP_SIG := 856348328949861E
 # sha256 hashes can be found in https://github.com/mikefarah/yq/releases/download/v4.40.7/checksums-bsd
 YQ_VERSION := 4.40.7
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
index 624422c..0f30b00 100755
--- a/docker_entrypoint.sh
+++ b/docker_entrypoint.sh
@@ -50,6 +50,9 @@ if [ $(yq e '.wasabi.managesettings' /root/data/start9/config.yaml) = "true" ];
   # remove UTF8 BOM character, because yq does not like this
   sed -i '1s/^\xEF\xBB\xBF//' /config/.walletwasabi/client/Config.json
 
+  # Force enable GPU rendering
+  yq e -i '.EnableGpu = true' -o=json /config/.walletwasabi/client/Config.json    
+
   # private bitcoin server
   case "$(yq e '.wasabi.server.type' /root/data/start9/config.yaml)" in
   "bitcoind")
diff --git a/manifest.yaml b/manifest.yaml
index 12163e1..ee39829 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,9 +1,10 @@
 id: wasabi-webtop
 title: "Wasabi"
-version: 2.0.8
+version: 2.0.8.1
 release-notes: |
-  * Update to Wasabi 2.0.8 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.0.8)
+  * Update to Wasabi 2.0.8.1 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.0.8.1)
   * Add options to allow setting a custom backend url
+  * Enabled GPU rendering support
 license: MIT
 wrapper-repo: "https://github.com/remcoros/wasabi-webtop-startos"
 upstream-repo: "https://github.com/WalletWasabi/WalletWasabi"
@@ -28,7 +29,7 @@ main:
   mounts:
     main: /root/data
     userdir: /config
-  gpu-acceleration: false
+  gpu-acceleration: true
   shm-size-mb: 1024
 hardware-requirements:
   arch:
diff --git a/root/defaults/.walletwasabi/client/Config.json b/root/defaults/.walletwasabi/client/Config.json
index b9c5831..aa18c6b 100644
--- a/root/defaults/.walletwasabi/client/Config.json
+++ b/root/defaults/.walletwasabi/client/Config.json
@@ -3,8 +3,12 @@
     "MainNetBackendUri": "https://api.wasabiwallet.io/",
     "TestNetClearnetBackendUri": "https://api.wasabiwallet.co/",
     "RegTestBackendUri": "http://localhost:37127/",
+    "MainNetCoordinatorUri": "https://api.wasabiwallet.io/",
+    "TestNetCoordinatorUri": "https://api.wasabiwallet.co/",
+    "RegTestCoordinatorUri": "http://localhost:37127/",
     "UseTor": true,
     "TerminateTorOnExit": false,
+    "TorBridges": [],
     "DownloadNewVersion": false,
     "StartLocalBitcoinCoreOnStartup": false,
     "StopLocalBitcoinCoreOnShutdown": true,
@@ -20,6 +24,8 @@
         "http://localhost:37128/"
     ],
     "DustThreshold": "0.00005",
-    "EnableGpu": false,
-    "CoordinatorIdentifier": "CoinJoinCoordinatorIdentifier"
+    "EnableGpu": true,
+    "CoordinatorIdentifier": "CoinJoinCoordinatorIdentifier",
+    "MaxCoordinationFeeRate": 0.0,
+    "MaxCoinJoinMiningFeeRate": 150.0
 }
\ No newline at end of file
diff --git a/root/defaults/autostart b/root/defaults/autostart
index a27ea90..e8a4d94 100755
--- a/root/defaults/autostart
+++ b/root/defaults/autostart
@@ -1,4 +1,4 @@
 # run a compositor to get transparency effects
-compton -cb
+xcompmgr -c &
 
 wassabee