Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.2.0~2: Bump allowable Bitcoin version, Rename service to "Jam" #20

Merged
merged 7 commits into from
Jun 24, 2024
Merged

v0.2.0~2: Bump allowable Bitcoin version, Rename service to "Jam" #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85b336e
Bump allowable Bitcoin version
gStart9 Jun 20, 2024
0f5be7a
copy change
gStart9 Jun 20, 2024
5addd02
README.md: Have user checkout v0351 for installing the SDK
gStart9 Jun 20, 2024
8c7ee1e
Use upstream's patch for nginx.org repo's new PGP key
gStart9 Jun 24, 2024
a62d44a
Update release notes
gStart9 Jun 24, 2024
b4e2065
typo
gStart9 Jun 24, 2024
ade3ec3
Remove a unneccesary line from a previous test
gStart9 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
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 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/*

Expand Down
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand All @@ -75,7 +75,9 @@ cargo install toml-cli

```
cd ~/ && git clone https://github.com/Start9Labs/start-os.git
cd start-os/backend/
#checkout v0.3.5.1
git checkout 39de098461833e4c56bd3509644ddf7f1a0fc4ca
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
git checkout 39de098461833e4c56bd3509644ddf7f1a0fc4ca
git checkout v0.3.5.1

While checking out the specific commit will produce the same result, checking out the tag makes it a bit more clear.

Copy link
Member Author

@gStart9 gStart9 Jun 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did try that but it seems the v0.3.5.1 branch was never made:

$ git checkout v0.3.5.1
error: pathspec 'v0.3.5.1' did not match any file(s) known to git

cd core/
./install-sdk.sh
start-sdk init
```
Expand Down
11 changes: 6 additions & 5 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
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 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"
Expand Down Expand Up @@ -73,7 +74,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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/services/migrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Loading