From 85b336ebdbe73f218aee0c18f0f552f489c32c3b Mon Sep 17 00:00:00 2001 From: gStart9 Date: Thu, 20 Jun 2024 13:11:48 -0600 Subject: [PATCH 1/7] Bump allowable Bitcoin version --- README.md | 6 +++--- manifest.yaml | 10 +++++----- scripts/services/migrations.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 423f474..d16e4d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wrapper for Jam -Jam is a web UI for JoinMarket with focus on user-friendliness. It aims to provide sensible defaults and be easy to use for beginners while still providing the features advanced users expect. +[Jam](https://github.com/joinmarket-webui/jam/) is a web UI for JoinMarket with focus on user-friendliness. It aims to provide sensible defaults and be easy to use for beginners while still providing the features advanced users expect. ## Dependencies @@ -51,7 +51,7 @@ PLATFORM=$(dpkg --print-architecture) wget -q https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${PLATFORM} && sudo mv yq_linux_${PLATFORM} /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq ``` -5. Install essentials build packages +5. Install essential build packages ``` sudo apt-get install -y build-essential openssl libssl-dev libc6-dev clang libclang-dev ca-certificates @@ -75,7 +75,7 @@ cargo install toml-cli ``` cd ~/ && git clone https://github.com/Start9Labs/start-os.git -cd start-os/backend/ +cd core/ ./install-sdk.sh start-sdk init ``` diff --git a/manifest.yaml b/manifest.yaml index 556d34c..1f44f9f 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,10 +1,10 @@ id: jam title: Jam -version: 0.2.0.1 +version: 0.2.0.2 release-notes: | - * Update to latest jam-docker image upstream - [Jam v0.2.0 Release Notes](https://github.com/joinmarket-webui/jam/releases/tag/v0.2.0) - * Jam v0.2.0 updates to latest JoinMarket ([v0.9.11](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/release-notes/release-notes-0.9.11.md)) - * Fix default wallet name regression in jam-startos v0.2.0 + * Rename app title from JAM to Jam + * Bump allowed Bitcoin version + * Copy touchups license: MIT wrapper-repo: "https://github.com/Start9Labs/jam-startos" upstream-repo: "https://github.com/joinmarket-webui/jam-docker" @@ -73,7 +73,7 @@ interfaces: - http dependencies: bitcoind: - version: ">=0.23.0.1 <=27.0.0" + version: ">=0.23.0.1 <29.0.0" requirement: type: required description: Used to subscribe to new block events from a full archival node. diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index f9d05d2..bc63eb7 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -1,4 +1,4 @@ import { compat, types as T } from "../deps.ts"; export const migration: T.ExpectedExports.migration = - compat.migrations.fromMapping({}, "0.2.0.1"); + compat.migrations.fromMapping({}, "0.2.0.2"); From 0f5be7adc33538a05cede081ffaa6c02a372ac44 Mon Sep 17 00:00:00 2001 From: gStart9 Date: Thu, 20 Jun 2024 13:17:36 -0600 Subject: [PATCH 2/7] copy change --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index 1f44f9f..3203100 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,7 +2,7 @@ id: jam title: Jam version: 0.2.0.2 release-notes: | - * Rename app title from JAM to Jam + * Rename service's title from JAM to Jam * Bump allowed Bitcoin version * Copy touchups license: MIT From 5addd021793dbabc4ce7d5a5cdd5e9053a6c5246 Mon Sep 17 00:00:00 2001 From: gStart9 Date: Thu, 20 Jun 2024 13:36:22 -0600 Subject: [PATCH 3/7] README.md: Have user checkout v0351 for installing the SDK --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d16e4d6..edd18bb 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,8 @@ cargo install toml-cli ``` cd ~/ && git clone https://github.com/Start9Labs/start-os.git +#checkout v0.3.5.1 +git checkout 39de098461833e4c56bd3509644ddf7f1a0fc4ca cd core/ ./install-sdk.sh start-sdk init From 8c7ee1e3429c98f1311795361464a6ed893e6154 Mon Sep 17 00:00:00 2001 From: gStart9 Date: Mon, 24 Jun 2024 09:10:42 -0600 Subject: [PATCH 4/7] Use upstream's patch for nginx.org repo's new PGP key --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ffdd03..5d3b4a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,13 @@ -FROM ghcr.io/joinmarket-webui/jam-standalone:v0.2.0-clientserver-v0.9.11 +#FROM ghcr.io/joinmarket-webui/jam-standalone:v0.2.0-clientserver-v0.9.11 +FROM ghcr.io/joinmarket-webui/jam-dev-standalone:v0.2.0-clientserver-v0.9.11-patch-20240622 # arm64 or amd64 ARG PLATFORM # aarch64 or x86_64 ARG ARCH -RUN sed -i "s|http://|https://|g" /etc/apt/sources.list /etc/apt/sources.list.d/* +RUN sed -i "s|http://|https://|g" /etc/apt/sources.list /etc/apt/sources.list.d/* +RUN cat /usr/share/keyrings/nginx-archive-keyring.gpg RUN apt-get update && apt-get -qqy upgrade && apt-get install -qqy --no-install-recommends wget bash tini && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* From a62d44a9330d74a97c5904e9b9686e19789694ea Mon Sep 17 00:00:00 2001 From: gStart9 Date: Mon, 24 Jun 2024 09:38:59 -0600 Subject: [PATCH 5/7] Update release notes --- manifest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.yaml b/manifest.yaml index 3203100..28a08a5 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -5,6 +5,7 @@ release-notes: | * Rename service's title from JAM to Jam * Bump allowed Bitcoin version * Copy touchups + * Update nginx repo's PGP key in upstream jam container license: MIT wrapper-repo: "https://github.com/Start9Labs/jam-startos" upstream-repo: "https://github.com/joinmarket-webui/jam-docker" From b4e206595875375253f0964e2732257ebd60e115 Mon Sep 17 00:00:00 2001 From: gStart9 Date: Mon, 24 Jun 2024 09:39:58 -0600 Subject: [PATCH 6/7] typo --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index 28a08a5..71cb9c5 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -5,7 +5,7 @@ release-notes: | * Rename service's title from JAM to Jam * Bump allowed Bitcoin version * Copy touchups - * Update nginx repo's PGP key in upstream jam container + * Update nginx repo's PGP key in upstream Jam container license: MIT wrapper-repo: "https://github.com/Start9Labs/jam-startos" upstream-repo: "https://github.com/joinmarket-webui/jam-docker" From ade3ec323d518089e27a2f5dce3e945f25198a50 Mon Sep 17 00:00:00 2001 From: gStart9 Date: Mon, 24 Jun 2024 09:41:38 -0600 Subject: [PATCH 7/7] Remove a unneccesary line from a previous test --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d3b4a4..149d03d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ ARG PLATFORM ARG ARCH RUN sed -i "s|http://|https://|g" /etc/apt/sources.list /etc/apt/sources.list.d/* -RUN cat /usr/share/keyrings/nginx-archive-keyring.gpg RUN apt-get update && apt-get -qqy upgrade && apt-get install -qqy --no-install-recommends wget bash tini && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/*