diff --git a/Dockerfile b/Dockerfile index c0b09aa..7d43c87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN \ cp index.html vnc.html && \ mkdir Downloads -FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-f7a8978f-ls89 AS buildstage +FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-8e2585df-ls92 AS buildstage # these are specified in Makefile ARG ARCH diff --git a/Makefile b/Makefile index c5d130a..78233d4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -WASABI_VERSION := 2.2.1.0 # version used to construct download filename -WASABI_VERSION_TAG := 2.2.1.0 # Github tag +WASABI_VERSION := 2.3.0.0 # version used to construct download filename +WASABI_VERSION_TAG := 2.3.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 @@ -36,7 +36,7 @@ clean: rm -f scripts/*.js scripts/embassy.js: $(TS_FILES) - deno bundle scripts/embassy.ts scripts/embassy.js + deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts docker-images/x86_64.tar: manifest.yaml Dockerfile docker_entrypoint.sh $(ROOT_FILES) $(PATCH_FILES) mkdir -p docker-images diff --git a/manifest.yaml b/manifest.yaml index 2277fee..1e730e4 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,9 +1,8 @@ id: wasabi-webtop title: "Wasabi" -version: 2.2.1.1 +version: 2.3.0.0 release-notes: | - * Add 'Automatically reconnect' option. Enable this to reconnect to the desktop when the connection is lost or the browser tab has been idle for too long. - * fix a minor issue when browser tab becomes idle (Cannot read properties of undefined (reading 'lastActiveAt')) + * Update to Wasabi 2.3.0.0 - See [full changelog](https://github.com/WalletWasabi/WalletWasabi/releases/tag/v2.3.0.0) license: MIT wrapper-repo: "https://github.com/remcoros/wasabi-webtop-startos" upstream-repo: "https://github.com/WalletWasabi/WalletWasabi" diff --git a/root/defaults/.walletwasabi/client/Config.json b/root/defaults/.walletwasabi/client/Config.json index 3efde61..e76d605 100644 --- a/root/defaults/.walletwasabi/client/Config.json +++ b/root/defaults/.walletwasabi/client/Config.json @@ -3,8 +3,8 @@ "MainNetBackendUri": "https://api.wasabiwallet.io/", "TestNetBackendUri": "https://api.wasabiwallet.co/", "RegTestBackendUri": "http://localhost:37127/", - "MainNetCoordinatorUri": "https://api.wasabiwallet.io/", - "TestNetCoordinatorUri": "https://api.wasabiwallet.co/", + "MainNetCoordinatorUri": "", + "TestNetCoordinatorUri": "", "RegTestCoordinatorUri": "http://localhost:37127/", "UseTor": "Enabled", "TerminateTorOnExit": false, diff --git a/scripts/bundle.ts b/scripts/bundle.ts new file mode 100644 index 0000000..3c042d2 --- /dev/null +++ b/scripts/bundle.ts @@ -0,0 +1,3 @@ +import { bundle } from "https://deno.land/x/emit@0.40.0/mod.ts"; +const result = await bundle("scripts/embassy.ts"); +await Deno.writeTextFile("scripts/embassy.js", result.code); \ No newline at end of file diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts index e266695..67e0eb9 100644 --- a/scripts/procedures/migrations.ts +++ b/scripts/procedures/migrations.ts @@ -20,4 +20,4 @@ export const migration: T.ExpectedExports.migration = compat.migrations { version: "2.2.1.1", type: "down" }, ), }, - }, "2.2.1.1"); + }, "2.3.0.0");