Merge pull request #4 from remcoros/wasabi-2.0.8

update to Wasabi 2.0.8 and remove coordinator setting (it is availabl…

.github/workflows/buildService.yml

@@ -27,6 +27,7 @@ jobs:
           make
           PACKAGE_ID=$(yq -oy ".id" manifest.*)
           echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
+          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
         shell: bash
 #
 #      - name: Upload .s9pk

.github/workflows/releaseService.yml

@@ -33,6 +33,7 @@ jobs:
       - name: Generate sha256 checksum
         run: |
           PACKAGE_ID=${{ env.package_id }}
+          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
           sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
         shell: bash
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-36987b11-ls57 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-94e8f989-ls61 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH
@@ -48,7 +48,10 @@ RUN \
     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 \
@@ -87,10 +90,10 @@ RUN \
   # Wasabi requires this directory to exist
   mkdir -p /usr/share/desktop-directories/ && \
   # Download and install Wasabi
-  wget --quiet https://github.com/zkSNACKs/WalletWasabi/releases/download/v${WASABI_VERSION}/Wasabi-${WASABI_VERSION}.deb \
-               https://github.com/zkSNACKs/WalletWasabi/releases/download/v${WASABI_VERSION}/Wasabi-${WASABI_VERSION}.deb.asc \
-               https://github.com/zkSNACKs/WalletWasabi/releases/download/v${WASABI_VERSION}/SHA256SUMS.asc \
-               https://raw.githubusercontent.com/zkSNACKs/WalletWasabi/master/PGP.txt && \
+  wget --quiet https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION}/Wasabi-${WASABI_VERSION}.deb \
+               https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION}/Wasabi-${WASABI_VERSION}.deb.asc \
+               https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION}/SHA256SUMS.asc \
+               https://raw.githubusercontent.com/WalletWasabi/WalletWasabi/master/PGP.txt && \
   # verify pgp and sha signatures
   gpg --import PGP.txt && \
   gpg --status-fd 1 --verify Wasabi-${WASABI_VERSION}.deb.asc | grep -q "GOODSIG ${WASABI_PGP_SIG} zkSNACKs <[email protected]>" || exit 1 && \

Makefile

@@ -1,4 +1,4 @@
-WASABI_VERSION := 2.0.7.2
+WASABI_VERSION := 2.0.8
 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

docker_entrypoint.sh

@@ -79,14 +79,6 @@ if [ $(yq e '.wasabi.managesettings' /root/data/start9/config.yaml) = "true" ];
   MainNetBackendUri="$(yq e '.wasabi.mainNetBackendUri' /root/data/start9/config.yaml)"
   yq e -i ".MainNetBackendUri = \"$MainNetBackendUri\"" -o=json /config/.walletwasabi/client/Config.json
 
-  # Custom Coordinator
-  MainNetCoordinatorUri="$(yq e '.wasabi.mainNetCoordinatorUri' /root/data/start9/config.yaml)"
-  if [ ! -z "$MainNetCoordinatorUri" ] && [ "$MainNetCoordinatorUri" != "null" ]; then
-    yq e -i ".MainNetCoordinatorUri = \"$MainNetCoordinatorUri\"" -o=json /config/.walletwasabi/client/Config.json
-  else
-    yq e -i "del(.MainNetCoordinatorUri)" -o=json /config/.walletwasabi/client/Config.json
-  fi
-
   # Json RPC server
   if [ $(yq e '.wasabi.rpc.enable' /root/data/start9/config.yaml) = "true" ]; then
     echo "Configuring Wasabi Json RPC server"

manifest.yaml

@@ -1,13 +1,13 @@
 id: wasabi-webtop
 title: "Wasabi"
-version: 2.0.7.2
+version: 2.0.8
 release-notes: |
-  * Update to Wasabi 2.0.7.2 - See [full changelog](https://github.com/zkSNACKs/WalletWasabi/releases/tag/v2.0.7.2)
-  * Add options to allow setting a custom backend and coordinator url
+  * Update to Wasabi 2.0.8 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.0.8)
+  * Add options to allow setting a custom backend url
 license: MIT
 wrapper-repo: "https://github.com/remcoros/wasabi-webtop-startos"
-upstream-repo: "https://github.com/zkSNACKs/WalletWasabi"
-support-site: "https://github.com/zkSNACKs/WalletWasabi/issues"
+upstream-repo: "https://github.com/WalletWasabi/WalletWasabi"
+support-site: "https://github.com/WalletWasabi/WalletWasabi/issues"
 marketing-site: "https://wasabiwallet.io/"
 donation-url: "https://wasabiwallet.io/contribution.html"
 build: ["make"]

scripts/procedures/getConfig.ts

@@ -84,15 +84,7 @@ export const [getConfig, setConfigMatcher] = compat.getConfigAndMatcher({
         pattern: "^https?://.+$",
         "pattern-description": "A valid URL starting with http(s)://",
         default: "https://api.wasabiwallet.io/"
-      },
-      mainNetCoordinatorUri: {
-        type: "string",
-        name: "Custom coordinator url",
-        description: "URL of the custom CoinJoin Coordinator to use",
-        nullable: true,
-        pattern: "^https?://.+$",
-        "pattern-description": "A valid URL starting with http(s)://"
-      },
+      },      
       rpc: {
         type: "object",
         name: "RPC Settings",

scripts/procedures/migrations.ts

@@ -1,4 +1,4 @@
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
-    .fromMapping({}, "2.0.7.2" );
+    .fromMapping({}, "2.0.8" );