From 6ce7bf162c89d1a67107657163b7e2d3788c9c09 Mon Sep 17 00:00:00 2001 From: vdo Date: Wed, 15 Jan 2020 10:58:21 +0100 Subject: [PATCH 1/3] New versions --- build/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 2a45bab..eeea668 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,13 +1,13 @@ -FROM node:10.16.0-alpine as build +FROM node:10-alpine as build -ENV LND_VERSION "v0.8.1-beta" -ENV RTL_TAG "v0.5.4" +ENV LND_VERSION "v0.8.2-beta" +ENV RTL_TAG "v0.6.1" RUN apk add --no-cache wget ca-certificates \ - && wget https://github.com/lightningnetwork/lnd/releases/download/${LND_VERSION}/lnd-linux-amd64-${LND_VERSION}.tar.gz \ - && tar --strip-components 1 -xzf lnd-linux-amd64-${LND_VERSION}.tar.gz -C /bin/ \ - && rm lnd-linux-amd64-${LND_VERSION}.tar.gz \ - && apk del wget ca-certificates + && wget https://github.com/lightningnetwork/lnd/releases/download/${LND_VERSION}/lnd-linux-amd64-${LND_VERSION}.tar.gz \ + && tar --strip-components 1 -xzf lnd-linux-amd64-${LND_VERSION}.tar.gz -C /bin/ \ + && rm lnd-linux-amd64-${LND_VERSION}.tar.gz \ + && apk del wget ca-certificates # Add build requirements RUN apk add --no-cache \ From b6794e62b64ea3cd81809202d4b5c18639181325 Mon Sep 17 00:00:00 2001 From: vdo Date: Tue, 21 Jan 2020 15:29:09 +0100 Subject: [PATCH 2/3] New config --- build/src/config/source_RTL.conf | 10 +++++----- build/src/scripts/start-rtl.sh | 10 ++++------ dappnode_package.json | 20 ++++++-------------- docker-compose.yml | 2 +- setup-target.json | 16 ++++++++++++---- setup-ui.json | 10 ++++++++-- setup.schema.json | 28 +++++++++++++++++++++------- 7 files changed, 57 insertions(+), 39 deletions(-) diff --git a/build/src/config/source_RTL.conf b/build/src/config/source_RTL.conf index d7922aa..34756e2 100644 --- a/build/src/config/source_RTL.conf +++ b/build/src/config/source_RTL.conf @@ -5,15 +5,15 @@ nodeAuthType=CUSTOM rtlPass=$RTL_PASSWORD [Settings] -flgSidenavOpened=true -flgSidenavPinned=true -menu=Vertical -menuType=Regular -theme=light-teal +userPersona=OPERATOR +themeMode=DAY +themeColor=INDIGO satsToBTC=false lndServerUrl=https://localhost:8080/v1 enableLogging=true port=80 +enableLogging=true +fiatConversion=false [SSO] rtlSSO=0 diff --git a/build/src/scripts/start-rtl.sh b/build/src/scripts/start-rtl.sh index 6976abd..8133ea9 100755 --- a/build/src/scripts/start-rtl.sh +++ b/build/src/scripts/start-rtl.sh @@ -1,12 +1,10 @@ #!/usr/bin/env bash set -e -# Create restore symlink -if [ ! -L /rtl/backup/restore ]; then - ln -s /rtl/backup /rtl/backup/restore -fi +# Create restore dir +[ -d /rtl/backup/restore ] || mkdir -p /rtl/backup/restore # Configure settings from env vars -envsubst < "source_RTL.conf" > "RTL.conf" +envsubst <"source_RTL.conf" >"RTL.conf" -node rtl \ No newline at end of file +node rtl diff --git a/dappnode_package.json b/dappnode_package.json index 46ba497..e193f1b 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,15 +10,15 @@ }, "backup": [ { - "name": "rtl-channel", + "name": "rtl-backup", "path": "/rtl/backup/" }, { - "name": "lnd-channel", + "name": "channel.backup", "path": "/root/.lnd/data/chain/bitcoin/mainnet/channel.backup" }, { - "name": "wallet", + "name": "wallet.db", "path": "/root/.lnd/data/chain/bitcoin/mainnet/wallet.db" } ], @@ -31,16 +31,8 @@ "Abel Boldú (@vdo)", "Eduardo Antuña (https://github.com/eduadiez)" ], - "categories": [ - "Payment channels", - "Economic incentive" - ], - "keywords": [ - "bitcoin", - "btc", - "lightning network", - "lnd" - ], + "categories": ["Payment channels", "Economic incentive"], + "keywords": ["bitcoin", "btc", "lightning network", "lnd"], "links": { "homepage": "https://github.com/dappnode/DAppNodePackage-LightningNetwork#readme", "ui": "http://lightning-network.dappnode", @@ -57,4 +49,4 @@ "message": "This software is experimental, presented 'as is' and inherently carries risks. By installing it, you acknowledge that DAppNode Association has done its best to mitigate these risks and accept to waive any liability or responsibility for DAppNode in case of any shortage, discrepancy, damage, loss or destruction of any digital asset managed within this DAppNode package.\n\nThis package stores private keys, which will be stored in your DAppNode. Neither DAppNode Association nor the developers of this software can have access to your private key, nor help you recover it if you lose it. \n\nYou are solely responsible for keeping your private keys and password safe and to perform secure backups, as well as to restrict access to your computer and other equipment. To the extent permitted by applicable law, you agree to be responsible for all activities that have been conducted from your account. You must take all necessary steps to ensure that your private key, password, and/or recovery phrase remain confidential and secured." }, "license": "GPL-3.0" -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 7bdf24b..9efc558 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: ports: - '9735:9735' environment: - - RTL_PASSWORD=changeme + - RTL_PASSWORD= - RPCUSER=dappnode - RPCPASS=dappnode - BITCOIND_HOST=bitcoin.dappnode diff --git a/setup-target.json b/setup-target.json index 6ee08e4..0dc32f9 100644 --- a/setup-target.json +++ b/setup-target.json @@ -1,10 +1,18 @@ { - "rtl_password": { - "type": "environment", - "name": "RTL_PASSWORD" + "channel-backup": { + "type": "fileUpload", + "path": "/rtl/backup/restore/channel-all.bak" }, "alias": { "type": "environment", "name": "ALIAS" + }, + "rtlPassword": { + "type": "environment", + "name": "RTL_PASSWORD" + }, + "color": { + "type": "environment", + "name": "COLOR" } -} \ No newline at end of file +} diff --git a/setup-ui.json b/setup-ui.json index 7d0dd3b..508ec7f 100644 --- a/setup-ui.json +++ b/setup-ui.json @@ -1,6 +1,12 @@ { - "ui:order": ["rtl_password","alias"], - "rtl_password": { + "required": ["rtlPassword"], + "ui:order": ["rtlPassword", "alias", "color", "channel-backup"], + "rtlPassword": { "ui:widget": "password" + }, + "color": { + "errorMessages": { + "pattern": "Must be a valid hex color (#012CAF)" + } } } diff --git a/setup.schema.json b/setup.schema.json index ecd2aa2..6f90562 100644 --- a/setup.schema.json +++ b/setup.schema.json @@ -1,17 +1,31 @@ { - "description": "# Want to run Lightning Network on DAppNode?\n\nGreat! That's probably why you are here.\n\nThis wizard will help you to configure your node", + "description": "Welcome to DAppNode's Lightning Network configuration wizard!\n", "type": "object", "properties": { - "rtl_password": { + "color": { "type": "string", - "title": "Password", - "description": "Your password for Ride The Lightning Web UI" + "title": "Color", + "description": "The color of the node in hex format, used to customize node appearance in intelligence services.", + "pattern": "^#[a-fA-F0-9]{6}$", + "customErrors": { + "pattern": "Must be a valid Must be a valid hex color (#012CAF)" + } + }, + "rtlPassword": { + "type": "string", + "title": "RTL Password", + "description": "Password to access RTL operator interface." }, "alias": { "type": "string", "title": "Alias", - "description": "Alias name for your node (will be public)" + "description": "Alias of the node." + }, + "channel-backup": { + "type": "string", + "format": "data-url", + "title": "Channels backup (RTL)", + "description": "The Ride The Lightning backup file to restore (OPTIONAL)" } - }, - "required": ["rtl_password"] + } } From 11367c88e7acf4361b3363dfb6f18406b4689fd2 Mon Sep 17 00:00:00 2001 From: vdo Date: Thu, 18 Jun 2020 20:46:25 +0200 Subject: [PATCH 3/3] Bump --- build/Dockerfile | 4 ++-- build/src/scripts/start-rtl.sh | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index eeea668..3831ad7 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ FROM node:10-alpine as build -ENV LND_VERSION "v0.8.2-beta" -ENV RTL_TAG "v0.6.1" +ENV LND_VERSION "v0.10.1-beta" +ENV RTL_TAG "v0.7.1" RUN apk add --no-cache wget ca-certificates \ && wget https://github.com/lightningnetwork/lnd/releases/download/${LND_VERSION}/lnd-linux-amd64-${LND_VERSION}.tar.gz \ diff --git a/build/src/scripts/start-rtl.sh b/build/src/scripts/start-rtl.sh index 8133ea9..fae34a6 100755 --- a/build/src/scripts/start-rtl.sh +++ b/build/src/scripts/start-rtl.sh @@ -2,7 +2,7 @@ set -e # Create restore dir -[ -d /rtl/backup/restore ] || mkdir -p /rtl/backup/restore +[ -d /rtl/backup/restore ] || [ -L /rtl/backup/restore ] || mkdir -p /rtl/backup/restore # Configure settings from env vars envsubst <"source_RTL.conf" >"RTL.conf" diff --git a/dappnode_package.json b/dappnode_package.json index e193f1b..6a64cd9 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "lightning-network.dnp.dappnode.eth", - "version": "0.1.2", - "upstreamVersion": "v0.8.1-beta", + "version": "0.1.3", + "upstreamVersion": "v0.10.1-beta", "shortDescription": "Scalable, instant Bitcoin transactions", "description": "The Lightning Network DAppNodePackage (lnd + RTL). The Lightning Network is a decentralized system for instant, high-volume micropayments that remove the risk of delegating custody of funds to trusted third parties. \n\n\n **Getting started** \n\n Go to the [Lightning Network DAppNode Package readme](https://github.com/dappnode/DAppNodePackage-LightningNetwork#readme) to learn how to get started and safely backup your data.", "type": "service", diff --git a/docker-compose.yml b/docker-compose.yml index 9efc558..6a12113 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: lightning-network.dnp.dappnode.eth: - image: 'lightning-network.dnp.dappnode.eth:0.1.2' + image: 'lightning-network.dnp.dappnode.eth:0.1.3' build: ./build volumes: - 'lndconfig_data:/root/.lnd/'