Browse Source

Add jam app (#1216)

Co-authored-by: Luke Childs <lukechilds123@gmail.com>
rtl-0.12.1
Thebora Kompanioni 3 years ago
committed by GitHub
parent
commit
94aeabd5f2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      apps/jam/data/joinmarket/.gitkeep
  2. 33
      apps/jam/docker-compose.yml
  3. 25
      apps/registry.json
  4. 4
      scripts/configure
  5. 4
      templates/.env-sample
  6. 4
      templates/torrc-server-sample

0
apps/jam/data/joinmarket/.gitkeep

33
apps/jam/docker-compose.yml

@ -0,0 +1,33 @@
version: "3.7"
services:
jam:
image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.3-clientserver-v0.9.5@sha256:d33817e4daec4ddaaf95a1c08e54f50cff4893b7d8c5b3bbe8b179ced74bbaa2
restart: on-failure
stop_grace_period: 1m
init: true
ports:
- "$APP_JAM_PORT:80"
volumes:
- ${APP_DATA_DIR}/data/joinmarket:/root/.joinmarket
environment:
ENSURE_WALLET: 1
APP_USER: umbrel
APP_PASSWORD: "${APP_PASSWORD}"
jm_tor_control_host: $TOR_PROXY_IP
jm_tor_control_port: 29051
jm_onion_socks5_host: $TOR_PROXY_IP
jm_onion_socks5_port: $TOR_PROXY_PORT
jm_socks5_host: $TOR_PROXY_IP
jm_socks5_port: $TOR_PROXY_PORT
jm_rpc_host: $BITCOIN_IP
jm_rpc_port: $BITCOIN_RPC_PORT
jm_rpc_user: $BITCOIN_RPC_USER
jm_rpc_password: "${BITCOIN_RPC_PASS}"
jm_rpc_wallet_file: jam_default
jm_network: $BITCOIN_NETWORK
jm_max_cj_fee_abs: 30000 # in sats
jm_max_cj_fee_rel: 0.0003 # 0.03%
networks:
default:
ipv4_address: $APP_JAM_IP

25
apps/registry.json

@ -475,6 +475,31 @@
"defaultUsername": "",
"deterministicPassword": true
},
{
"id": "jam",
"category": "Wallets",
"name": "Jam",
"version": "v0.0.3",
"tagline": "A user-friendly UI for JoinMarket",
"description": "Jam is a user-interface for JoinMarket with a focus on user-friendliness.\nIt is time for top-notch privacy for your bitcoin. Widespread use of JoinMarket improves bitcoin's fungibility and privacy for all.\n\nThe app provides sensible defaults and is easy to use for beginners while still providing the features advanced users expect.",
"developer": "JoinMarket WebUI Organisation",
"website": "https://github.com/joinmarket-webui",
"dependencies": [
"bitcoind"
],
"repo": "https://github.com/joinmarket-webui/joinmarket-webui",
"support": "https://github.com/joinmarket-webui/joinmarket-webui/issues",
"port": 5002,
"gallery": [
"1.jpg",
"2.jpg",
"3.jpg"
],
"path": "",
"defaultUsername": "umbrel",
"defaultPassword": "",
"deterministicPassword": true
},
{
"id": "lnbits",
"category": "Finance",

4
scripts/configure

@ -250,6 +250,8 @@ APP_URBIT_BITCOIN_CONNECTOR_SERVER_PORT="55555"
APP_SNOWFLAKE_IP="10.21.21.82"
APP_SNOWFLAKE_PORT="3800"
APP_SNOWFLAKE_PROXY_IP="10.21.21.83"
APP_JAM_IP="10.21.21.84"
APP_JAM_PORT="5002"
# Generate RPC credentials
if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then
@ -500,6 +502,8 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
sed -i "s/<app-snowflake-ip>/${APP_SNOWFLAKE_IP}/g" "${template}"
sed -i "s/<app-snowflake-port>/${APP_SNOWFLAKE_PORT}/g" "${template}"
sed -i "s/<app-snowflake-proxy-ip>/${APP_SNOWFLAKE_PROXY_IP}/g" "${template}"
sed -i "s/<app-jam-ip>/${APP_JAM_IP}/g" "${template}"
sed -i "s/<app-jam-port>/${APP_JAM_PORT}/g" "${template}"
done
##########################################################

4
templates/.env-sample

@ -147,4 +147,6 @@ APP_URBIT_BITCOIN_CONNECTOR_PORT=<app-urbit-bitcoin-connector-port>
APP_URBIT_BITCOIN_CONNECTOR_SERVER_PORT=<app-urbit-bitcoin-connector-server-port>
APP_SNOWFLAKE_IP=<app-snowflake-ip>
APP_SNOWFLAKE_PORT=<app-snowflake-port>
APP_SNOWFLAKE_PROXY_IP=<app-snowflake-proxy-ip>
APP_SNOWFLAKE_PROXY_IP=<app-snowflake-proxy-ip>
APP_JAM_IP=<app-jam-ip>
APP_JAM_PORT=<app-jam-port>

4
templates/torrc-server-sample

@ -217,3 +217,7 @@ HiddenServicePort 80 <app-urbit-bitcoin-connector-ip>:<app-urbit-bitcoin-connect
# snowflake Hidden Service
HiddenServiceDir /data/app-snowflake
HiddenServicePort 80 <app-snowflake-ip>:<app-snowflake-port>
# jam Hidden Service
HiddenServiceDir /data/app-jam
HiddenServicePort 80 <app-jam-ip>:80

Loading…
Cancel
Save