Update to Wasabi 2.1.0

Dockerfile

@@ -1,9 +1,10 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-94e8f989-ls61 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-10268292-ls70 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH
 ARG PLATFORM
 ARG WASABI_VERSION
+ARG WASABI_VERSION_TAG
 ARG WASABI_PGP_SIG
 ARG YQ_VERSION
 ARG YQ_SHA
@@ -83,9 +84,9 @@ RUN \
   # Wasabi requires this directory to exist
   mkdir -p /usr/share/desktop-directories/ && \
   # Download and install Wasabi
-  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 \
+  wget --quiet https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION_TAG}/Wasabi-${WASABI_VERSION}.deb \
+               https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION_TAG}/Wasabi-${WASABI_VERSION}.deb.asc \
+               https://github.com/WalletWasabi/WalletWasabi/releases/download/v${WASABI_VERSION_TAG}/SHA256SUMS.asc \
                https://github.com/WalletWasabi/WalletWasabi/master/PGP.txt && \
   # verify pgp and sha signatures
   gpg --import PGP.txt && \

Makefile

@@ -1,4 +1,5 @@
-WASABI_VERSION := 2.0.8.1
+WASABI_VERSION := 2.1.0 # version used to construct download filename
+WASABI_VERSION_TAG := 2.1.0.0 # Github tag
 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
@@ -43,6 +44,7 @@ docker-images/x86_64.tar: manifest.yaml Dockerfile docker_entrypoint.sh $(ROOT_F
 		--build-arg ARCH=x86_64 \
 		--build-arg PLATFORM=amd64 \
 		--build-arg WASABI_VERSION=$(WASABI_VERSION) \
+		--build-arg WASABI_VERSION_TAG=$(WASABI_VERSION_TAG) \
 		--build-arg WASABI_PGP_SIG=$(WASABI_PGP_SIG) \
 		--build-arg YQ_VERSION=$(YQ_VERSION) \
 		--build-arg YQ_SHA=$(YQ_SHA_AMD64) \

docker_entrypoint.sh

@@ -72,16 +72,12 @@ if [ $(yq e '.wasabi.managesettings' /root/data/start9/config.yaml) = "true" ];
   # Use Tor?
   if [ $(yq e '.wasabi.useTor' /root/data/start9/config.yaml) = "true" ]; then
     echo "Configuring Wasabi for Tor"
-    yq e -i '.UseTor = true' -o=json /config/.walletwasabi/client/Config.json
+    yq e -i '.UseTor = "Enabled"' -o=json /config/.walletwasabi/client/Config.json
   else
     echo "Disabling Tor in Wasabi"
-    yq e -i '.UseTor = false' -o=json /config/.walletwasabi/client/Config.json
+    yq e -i '.UseTor = "Disabled"' -o=json /config/.walletwasabi/client/Config.json
   fi
 
-  # Wasabi Backend URI
-  MainNetBackendUri="$(yq e '.wasabi.mainNetBackendUri' /root/data/start9/config.yaml)"
-  yq e -i ".MainNetBackendUri = \"$MainNetBackendUri\"" -o=json /config/.walletwasabi/client/Config.json
-
   # 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,10 +1,9 @@
 id: wasabi-webtop
 title: "Wasabi"
-version: 2.0.8.1
+version: 2.1.0
 release-notes: |
-  * 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
+  * Update to Wasabi 2.1.0 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.1.0.0)
+  * Removed 'Wasabi Backend url' from StartOS config. This can now be set within Wasabi itself.
 license: MIT
 wrapper-repo: "https://github.com/remcoros/wasabi-webtop-startos"
 upstream-repo: "https://github.com/WalletWasabi/WalletWasabi"
@@ -85,7 +84,7 @@ interfaces:
       - json-rpc
 dependencies:
   bitcoind:
-    version: ">=0.21.1.2 <28.0.0"
+    version: ">=0.21.1.2 <29.0.0"
     requirement:
       type: "opt-out"
       how: "Select 'None' as the server"

root/defaults/.walletwasabi/client/Config.json

@@ -1,12 +1,12 @@
 {
     "Network": "Main",
     "MainNetBackendUri": "https://api.wasabiwallet.io/",
-    "TestNetClearnetBackendUri": "https://api.wasabiwallet.co/",
+    "TestNetBackendUri": "https://api.wasabiwallet.co/",
     "RegTestBackendUri": "http://localhost:37127/",
     "MainNetCoordinatorUri": "https://api.wasabiwallet.io/",
     "TestNetCoordinatorUri": "https://api.wasabiwallet.co/",
     "RegTestCoordinatorUri": "http://localhost:37127/",
-    "UseTor": true,
+    "UseTor": "Enabled",
     "TerminateTorOnExit": false,
     "TorBridges": [],
     "DownloadNewVersion": false,
@@ -26,6 +26,8 @@
     "DustThreshold": "0.00005",
     "EnableGpu": true,
     "CoordinatorIdentifier": "CoinJoinCoordinatorIdentifier",
-    "MaxCoordinationFeeRate": 0.0,
-    "MaxCoinJoinMiningFeeRate": 150.0
+    "MaxCoordinationFeeRate": 0,
+    "MaxCoinJoinMiningFeeRate": 150.0,
+    "AbsoluteMinInputCount": 21,
+    "ConfigVersion": 1
 }

scripts/procedures/getConfig.ts

@@ -76,15 +76,6 @@ export const [getConfig, setConfigMatcher] = compat.getConfigAndMatcher({
         description: "Configure Wasabi to use the Tor network.",
         default: true,
       },
-      mainNetBackendUri: {
-        type: "string",
-        name: "Wasabi Backend url",
-        description: "URL of the Wasabi Backend. The default is: https://api.wasabiwallet.io/",
-        nullable: false,
-        pattern: "^https?://.+$",
-        "pattern-description": "A valid URL starting with http(s)://",
-        default: "https://api.wasabiwallet.io/"
-      },      
       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.8" );
+    .fromMapping({}, "2.1.0" );