Skip to content

Commit da15112

Browse files
ShahanaFarooquiShahanaFarooqui
committed
Connect wallet and protocol updates
1 parent b84cc95 commit da15112

26 files changed

+96
-69
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
- APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE: REST hidden service url (optional; for connect wallet screen)
5555
- LOCAL_HOST: Docker setup variable (optional; for connect wallet screen)
5656
- APP_MODE: Mode for logging and other settings (optional; valid values: production/development/testing)
57+
- APP_PROTOCOL: Protocol on which the application will be served (optional; valid values: http/https)
5758
- CORE_LIGHTNING_PATH: Path for core lightning (optional; required for entrypoint.sh)
5859
```
5960

‎apps/backend/dist/controllers/shared.js

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class SharedController {
3737
}
3838
const CONNECT_WALLET_SETTINGS = {
3939
LOCAL_HOST: process.env.LOCAL_HOST || '',
40+
DEVICE_DOMAIN_NAME: process.env.DEVICE_DOMAIN_NAME || '',
4041
TOR_HOST: process.env.APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE || '',
4142
WS_PORT: process.env.APP_CORE_LIGHTNING_WEBSOCKET_PORT || '',
4243
GRPC_PORT: process.env.APP_CORE_LIGHTNING_DAEMON_GRPC_PORT || '',

‎apps/backend/dist/server.js

+18-14
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ let directoryName = dirname(fileURLToPath(import.meta.url));
1717
let routes = [];
1818
const app = express();
1919
const server = http.createServer(app);
20-
const LIGHTNING_PORT = APP_CONSTANTS.APP_MODE === Environment.PRODUCTION
21-
? normalizePort(process.env.APP_CORE_LIGHTNING_PORT || '2103')
22-
: 4300;
23-
const APP_CORE_LIGHTNING_DAEMON_IP = process.env.APP_CORE_LIGHTNING_IP || 'localhost';
20+
const LIGHTNING_PORT = normalizePort(process.env.APP_CORE_LIGHTNING_PORT || '2103');
21+
const APP_CORE_LIGHTNING_IP = process.env.APP_CORE_LIGHTNING_IP || 'localhost';
22+
const APP_PROTOCOL = process.env.APP_PROTOCOL || 'http';
2423
function normalizePort(val) {
2524
var port = parseInt(val, 10);
2625
if (isNaN(port)) {
@@ -43,7 +42,9 @@ app.use((req, res, next) => {
4342
});
4443
const corsOptions = {
4544
methods: 'GET, POST, PATCH, PUT, DELETE, OPTIONS',
46-
origin: 'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT,
45+
origin: APP_CONSTANTS.APP_MODE === Environment.PRODUCTION
46+
? APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT
47+
: APP_PROTOCOL + '://localhost:4300',
4748
credentials: true,
4849
allowedHeaders: 'Content-Type, X-XSRF-TOKEN, XSRF-TOKEN',
4950
};
@@ -64,21 +65,24 @@ const throwApiError = (err) => {
6465
logger.error('Server error: ' + err);
6566
switch (err.code) {
6667
case 'EACCES':
67-
return new APIError('http://' +
68-
APP_CORE_LIGHTNING_DAEMON_IP +
68+
return new APIError(APP_PROTOCOL +
69+
'://' +
70+
APP_CORE_LIGHTNING_IP +
6971
':' +
7072
LIGHTNING_PORT +
71-
' requires elevated privileges', 'http://' +
72-
APP_CORE_LIGHTNING_DAEMON_IP +
73+
' requires elevated privileges', APP_PROTOCOL +
74+
'://' +
75+
APP_CORE_LIGHTNING_IP +
7376
':' +
7477
LIGHTNING_PORT +
75-
' requires elevated privileges', HttpStatusCode.ACCESS_DENIED, 'http://' +
76-
APP_CORE_LIGHTNING_DAEMON_IP +
78+
' requires elevated privileges', HttpStatusCode.ACCESS_DENIED, APP_PROTOCOL +
79+
'://' +
80+
APP_CORE_LIGHTNING_IP +
7781
':' +
7882
LIGHTNING_PORT +
7983
' requires elevated privileges');
8084
case 'EADDRINUSE':
81-
return new APIError('http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use', 'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use', HttpStatusCode.ADDR_IN_USE, 'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use');
85+
return new APIError(APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use', APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use', HttpStatusCode.ADDR_IN_USE, APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use');
8286
case 'ECONNREFUSED':
8387
return new APIError('Server is down/locked', 'Server is down/locked', HttpStatusCode.UNAUTHORIZED, 'Server is down/locked');
8488
case 'EBADCSRFTOKEN':
@@ -88,5 +92,5 @@ const throwApiError = (err) => {
8892
}
8993
};
9094
server.on('error', throwApiError);
91-
server.on('listening', () => logger.warn('Server running at http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT));
92-
server.listen({ port: LIGHTNING_PORT, host: APP_CORE_LIGHTNING_DAEMON_IP });
95+
server.on('listening', () => logger.warn('Server running at ' + APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT));
96+
server.listen({ port: LIGHTNING_PORT, host: APP_CORE_LIGHTNING_IP });

‎apps/backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cln-application-backend",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"description": "Core lightning application backend",
55
"private": true,
66
"license": "MIT",

‎apps/backend/source/controllers/shared.ts

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class SharedController {
4646
}
4747
const CONNECT_WALLET_SETTINGS = {
4848
LOCAL_HOST: process.env.LOCAL_HOST || '',
49+
DEVICE_DOMAIN_NAME: process.env.DEVICE_DOMAIN_NAME || '',
4950
TOR_HOST: process.env.APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE || '',
5051
WS_PORT: process.env.APP_CORE_LIGHTNING_WEBSOCKET_PORT || '',
5152
GRPC_PORT: process.env.APP_CORE_LIGHTNING_DAEMON_GRPC_PORT || '',

‎apps/backend/source/server.ts

+23-17
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ let routes: Array<CommonRoutesConfig> = [];
2222
const app: express.Application = express();
2323
const server: http.Server = http.createServer(app);
2424

25-
const LIGHTNING_PORT =
26-
APP_CONSTANTS.APP_MODE === Environment.PRODUCTION
27-
? normalizePort(process.env.APP_CORE_LIGHTNING_PORT || '2103')
28-
: 4300;
29-
const APP_CORE_LIGHTNING_DAEMON_IP = process.env.APP_CORE_LIGHTNING_IP || 'localhost';
25+
const LIGHTNING_PORT = normalizePort(process.env.APP_CORE_LIGHTNING_PORT || '2103');
26+
const APP_CORE_LIGHTNING_IP = process.env.APP_CORE_LIGHTNING_IP || 'localhost';
27+
const APP_PROTOCOL = process.env.APP_PROTOCOL || 'http';
3028

3129
function normalizePort(val: string) {
3230
var port = parseInt(val, 10);
@@ -54,7 +52,10 @@ app.use((req, res, next) => {
5452
});
5553
const corsOptions = {
5654
methods: 'GET, POST, PATCH, PUT, DELETE, OPTIONS',
57-
origin: 'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT,
55+
origin:
56+
APP_CONSTANTS.APP_MODE === Environment.PRODUCTION
57+
? APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT
58+
: APP_PROTOCOL + '://localhost:4300',
5859
credentials: true,
5960
allowedHeaders: 'Content-Type, X-XSRF-TOKEN, XSRF-TOKEN',
6061
};
@@ -81,29 +82,32 @@ const throwApiError = (err: any) => {
8182
switch (err.code) {
8283
case 'EACCES':
8384
return new APIError(
84-
'http://' +
85-
APP_CORE_LIGHTNING_DAEMON_IP +
85+
APP_PROTOCOL +
86+
'://' +
87+
APP_CORE_LIGHTNING_IP +
8688
':' +
8789
LIGHTNING_PORT +
8890
' requires elevated privileges',
89-
'http://' +
90-
APP_CORE_LIGHTNING_DAEMON_IP +
91+
APP_PROTOCOL +
92+
'://' +
93+
APP_CORE_LIGHTNING_IP +
9194
':' +
9295
LIGHTNING_PORT +
9396
' requires elevated privileges',
9497
HttpStatusCode.ACCESS_DENIED,
95-
'http://' +
96-
APP_CORE_LIGHTNING_DAEMON_IP +
98+
APP_PROTOCOL +
99+
'://' +
100+
APP_CORE_LIGHTNING_IP +
97101
':' +
98102
LIGHTNING_PORT +
99103
' requires elevated privileges',
100104
);
101105
case 'EADDRINUSE':
102106
return new APIError(
103-
'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use',
104-
'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use',
107+
APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use',
108+
APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use',
105109
HttpStatusCode.ADDR_IN_USE,
106-
'http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT + ' is already in use',
110+
APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT + ' is already in use',
107111
);
108112
case 'ECONNREFUSED':
109113
return new APIError(
@@ -131,6 +135,8 @@ const throwApiError = (err: any) => {
131135

132136
server.on('error', throwApiError);
133137
server.on('listening', () =>
134-
logger.warn('Server running at http://' + APP_CORE_LIGHTNING_DAEMON_IP + ':' + LIGHTNING_PORT),
138+
logger.warn(
139+
'Server running at ' + APP_PROTOCOL + '://' + APP_CORE_LIGHTNING_IP + ':' + LIGHTNING_PORT,
140+
),
135141
);
136-
server.listen({ port: LIGHTNING_PORT, host: APP_CORE_LIGHTNING_DAEMON_IP });
142+
server.listen({ port: LIGHTNING_PORT, host: APP_CORE_LIGHTNING_IP });

‎apps/frontend/build/asset-manifest.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"files": {
3-
"main.css": "/static/css/main.39d05f2d.css",
4-
"main.js": "/static/js/main.212bf1ad.js",
3+
"main.css": "/static/css/main.fa3c1194.css",
4+
"main.js": "/static/js/main.60ee4b12.js",
55
"static/media/Inter-Bold.ttf": "/static/media/Inter-Bold.88fa7ae373b07b41ecce.ttf",
66
"static/media/Inter-SemiBold.ttf": "/static/media/Inter-SemiBold.4d56bb21f2399db8ad48.ttf",
77
"static/media/Inter-Medium.ttf": "/static/media/Inter-Medium.6dcbc9bed1ec438907ee.ttf",
88
"static/media/Inter-Thin.ttf": "/static/media/Inter-Thin.f341ca512063c66296d1.ttf",
99
"index.html": "/index.html",
1010
"static/media/radio-button.svg": "/static/media/radio-button.69aa1495d8439f869898.svg",
11-
"main.39d05f2d.css.map": "/static/css/main.39d05f2d.css.map",
12-
"main.212bf1ad.js.map": "/static/js/main.212bf1ad.js.map"
11+
"main.fa3c1194.css.map": "/static/css/main.fa3c1194.css.map",
12+
"main.60ee4b12.js.map": "/static/js/main.60ee4b12.js.map"
1313
},
1414
"entrypoints": [
15-
"static/css/main.39d05f2d.css",
16-
"static/js/main.212bf1ad.js"
15+
"static/css/main.fa3c1194.css",
16+
"static/js/main.60ee4b12.js"
1717
]
1818
}

‎apps/frontend/build/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.212bf1ad.js"></script><link href="/static/css/main.39d05f2d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.60ee4b12.js"></script><link href="/static/css/main.fa3c1194.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎apps/frontend/build/static/css/main.39d05f2d.css.map

-1
This file was deleted.

‎apps/frontend/build/static/css/main.39d05f2d.css ‎apps/frontend/build/static/css/main.fa3c1194.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/build/static/css/main.fa3c1194.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/build/static/js/main.212bf1ad.js

-3
This file was deleted.

‎apps/frontend/build/static/js/main.212bf1ad.js.map

-1
This file was deleted.

‎apps/frontend/build/static/js/main.60ee4b12.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/build/static/js/main.212bf1ad.js.LICENSE.txt ‎apps/frontend/build/static/js/main.60ee4b12.js.LICENSE.txt

File renamed without changes.

‎apps/frontend/build/static/js/main.60ee4b12.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cln-application-frontend",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"description": "Core lightning application frontend",
55
"private": true,
66
"license": "MIT",

‎apps/frontend/src/components/modals/ConnectWallet/ConnectWallet.scss

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
box-shadow: 0px 1px 2px rgba($dark-blue, 0.05);
1313
background-image: none;
1414
padding: 0.675rem;
15+
border-radius: 0.375rem !important;
1516
}
1617
& .dropdown-menu {
1718
font-size: .875rem;

‎apps/frontend/src/components/modals/ConnectWallet/ConnectWallet.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const ConnectWallet = () => {
2222
const appCtx = useContext(AppContext);
2323
const [selNetwork, setSelNetwork] = useState(0);
2424
const [clnConnectUrl, setClnConnectUrl] = useState('c-lightning-rest://' + appCtx.walletConnect.LOCAL_HOST + ':' + appCtx.walletConnect.REST_PORT + '?macaroon=' + appCtx.walletConnect.REST_MACAROON + '&protocol=http');
25-
const [lnMessageConnectUrl, setLnMessageConnectUrl] = useState('ln-message://' + appCtx.walletConnect.CLN_NODE_IP + ':' + appCtx.walletConnect.WS_PORT + '?pubkey=' + appCtx.walletConnect.NODE_PUBKEY + '&rune=' + appCtx.walletConnect.COMMANDO_RUNE);
25+
const [lnMessageConnectUrl, setLnMessageConnectUrl] = useState('ln-message://' + appCtx.walletConnect.DEVICE_DOMAIN_NAME + ':' + appCtx.walletConnect.WS_PORT + '?pubkey=' + appCtx.walletConnect.NODE_PUBKEY + '&rune=' + appCtx.walletConnect.COMMANDO_RUNE);
2626
const [connectValues, setConnectValues] = useState({ pubkey: { title: 'Node Pubkey', field: 'NODE_PUBKEY' }, port: { title: 'REST Port', field: 'REST_PORT' }, host: { title: 'Host', field: 'LOCAL_HOST' }, macaroon: { title: 'Macaroon', field: 'REST_MACAROON' }, connectUrl: { title: 'REST URL', field: '' } });
2727

2828
const copyHandler = (event) => {
@@ -32,7 +32,7 @@ const ConnectWallet = () => {
3232
textToCopy = appCtx.walletConnect.WS_PORT || '';
3333
break;
3434
case 'CLN Host':
35-
textToCopy = appCtx.walletConnect.CLN_NODE_IP || '';
35+
textToCopy = appCtx.walletConnect.DEVICE_DOMAIN_NAME || '';
3636
break;
3737
case 'Rune':
3838
textToCopy = appCtx.walletConnect.COMMANDO_RUNE || '';
@@ -73,8 +73,8 @@ const ConnectWallet = () => {
7373
break;
7474

7575
case 2:
76-
setConnectValues({ pubkey: { title: 'Node Pubkey', field: 'NODE_PUBKEY' }, port: { title: 'Websocket Port', field: 'WS_PORT' }, host: { title: 'CLN Host', field: 'CLN_NODE_IP' }, macaroon: { title: 'Rune', field: 'COMMANDO_RUNE' }, connectUrl: { title: 'Lnmessage URL', field: '' } });
77-
setLnMessageConnectUrl('ln-message://' + appCtx.walletConnect.CLN_NODE_IP + ':' + appCtx.walletConnect.WS_PORT + '?pubkey=' + appCtx.walletConnect.NODE_PUBKEY + '&rune=' + appCtx.walletConnect.COMMANDO_RUNE);
76+
setConnectValues({ pubkey: { title: 'Node Pubkey', field: 'NODE_PUBKEY' }, port: { title: 'Websocket Port', field: 'WS_PORT' }, host: { title: 'CLN Host', field: 'DEVICE_DOMAIN_NAME' }, macaroon: { title: 'Rune', field: 'COMMANDO_RUNE' }, connectUrl: { title: 'Lnmessage URL', field: '' } });
77+
setLnMessageConnectUrl('ln-message://' + appCtx.walletConnect.DEVICE_DOMAIN_NAME + ':' + appCtx.walletConnect.WS_PORT + '?pubkey=' + appCtx.walletConnect.NODE_PUBKEY + '&rune=' + appCtx.walletConnect.COMMANDO_RUNE);
7878
break;
7979

8080
default:

‎apps/frontend/src/styles/shared.scss

+8
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,10 @@ label.form-label {
454454
border-left: 0;
455455
padding-top: 0;
456456
padding-bottom: 0;
457+
&.input-group-text {
458+
border-top-right-radius: 0.375rem !important;
459+
border-bottom-right-radius: 0.375rem !important;
460+
}
457461
&:hover {
458462
svg path {
459463
stroke: darken($primary, 10%);
@@ -474,6 +478,10 @@ label.form-label {
474478
}
475479
&.form-control-addon-left {
476480
border-right: 0;
481+
&.input-group-text {
482+
border-top-left-radius: 0.375rem !important;
483+
border-bottom-left-radius: 0.375rem !important;
484+
}
477485
}
478486
}
479487
&.invalid {

‎apps/frontend/src/types/app-config.type.ts

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export type ToastPosition = 'top-start' | 'top-center' | 'top-end' | 'middle-sta
55
export type WalletConnect = {
66
isLoading: boolean;
77
GRPC_PORT?: string;
8+
DEVICE_DOMAIN_NAME?: string;
89
LOCAL_HOST?: string;
910
REST_MACAROON?: string;
1011
REST_PORT?: string;

‎apps/frontend/src/utilities/constants.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { faDollarSign, faYenSign, faEuroSign, faSterlingSign, faIndianRupeeSign,
22

33
export const HOST = process.env.NODE_ENV !== 'production' ? 'localhost' : window.location.hostname;
44
export const PORT = process.env.NODE_ENV !== 'production' ? 2103 : window.location.port;
5-
6-
export const LOG_LEVEL = process.env.NODE_ENV !== 'production' ? 'info' : 'warn';
7-
export const API_BASE_URL = 'http://' + HOST + ':' + PORT;
5+
export const PROTOCOL = window.location.protocol || 'http:';
6+
export const API_BASE_URL = PROTOCOL + '//' + HOST + ':' + PORT;
87
export const API_VERSION = '/v1';
8+
export const LOG_LEVEL = process.env.NODE_ENV !== 'production' ? 'info' : 'warn';
99

1010
export const APP_WAIT_TIME = 10 * 1000; // 10 seconds
1111
export const CLEAR_STATUS_ALERT_DELAY = 10000; // 10 seconds

‎docker-compose.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- -${APP_CORE_LIGHTNING_BITCOIN_NETWORK}
88
- -rpcbind=0.0.0.0
99
- -rpcallowip=0.0.0.0/0
10-
- -rpcauth=user:2ba7454abfebe5d5766bda9d93c9e633$df4fc916583a0089daf1c4b33332651df281ba08a4750f8b4c118b13a50aed7c
10+
- -rpcauth=user:d58ddb294b3a3812ff5fee50d6f24b29$19212992730deeaf6e596d471260a966b011a00446d45b193c94e79c4f4a1266
1111
restart: on-failure
1212
volumes:
1313
- ${PWD}/data/bitcoin:/root/.bitcoin
@@ -30,15 +30,17 @@ services:
3030
restart: on-failure
3131
volumes:
3232
- ${PWD}/data/lightningd:/root/.lightning
33+
expose:
34+
- ${APP_CORE_LIGHTNING_WEBSOCKET_PORT}:${APP_CORE_LIGHTNING_WEBSOCKET_PORT}
3335
networks:
3436
networkcln:
3537
ipv4_address: ${APP_CORE_LIGHTNING_DAEMON_IP}
3638

3739
application:
38-
build:
39-
dockerfile: ./Dockerfile
40-
context: ./
41-
# image: ghcr.io/elementsproject/cln-application:0.0.1@sha256:631f765969324aaf3b26958d91f47626570092bd2babfd4189d5d6f46918a5ba
40+
# build:
41+
# dockerfile: ./Dockerfile
42+
# context: ./
43+
image: ghcr.io/elementsproject/cln-application:0.0.1@sha256:c43642d578bb22754e1e6eb054be86d0a6af51f30752cd51e942996870d4c8f5
4244
depends_on:
4345
- bitcoind
4446
- lightningd
@@ -52,7 +54,8 @@ services:
5254
APP_CORE_LIGHTNING_WEBSOCKET_PORT: ${APP_CORE_LIGHTNING_WEBSOCKET_PORT}
5355
APP_CORE_LIGHTNING_REST_CERT_DIR: ${APP_CORE_LIGHTNING_REST_CERT_DIR}
5456
APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE: http://${APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE}
55-
APP_CORE_LIGHTNING_COMMANDO_ENV_DIR: ${APP_CORE_LIGHTNING_COMMANDO_ENV_DIR}
57+
CORE_LIGHTNING_PATH: ${CORE_LIGHTNING_PATH}
58+
COMMANDO_CONFIG: ${COMMANDO_CONFIG}
5659
APP_CONFIG_DIR: ${APP_CONFIG_DIR}
5760
APP_MODE: "production"
5861
LOCAL_HOST: http://${DEVICE_DOMAIN_NAME}

‎env.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@ fi
1010
export APP_CORE_LIGHTNING_PORT=2103
1111
export APP_CORE_LIGHTNING_REST_HIDDEN_SERVICE="notyetset.onion"
1212
export APP_MODE="testing"
13+
export APP_PROTOCOL="http"
1314

1415
if [ "$SETUP" == "docker" ]; then
1516
export DEVICE_DOMAIN_NAME="docker.local"
1617
export LOCAL_HOST="http://""$DEVICE_DOMAIN_NAME"
1718
export APP_BITCOIN_NODE_IP="170.21.22.2"
1819
export APP_CORE_LIGHTNING_DAEMON_IP="170.21.22.3"
19-
export LIGHTNING_REST_IP="170.21.22.4"
20+
export APP_CORE_LIGHTNING_REST_IP="170.21.22.4"
2021
export APP_CORE_LIGHTNING_IP="170.21.22.5"
2122
export APP_CONFIG_DIR="/data/app"
2223
export APP_CORE_LIGHTNING_REST_CERT_DIR="/c-lightning-rest/certs"
2324
export APP_CORE_LIGHTNING_WEBSOCKET_PORT=2106
24-
export APP_BITCOIN_RPC_USER="umbrel"
25-
export APP_BITCOIN_RPC_PASS="moneyprintergobrrr"
25+
export APP_BITCOIN_RPC_USER="user"
26+
export APP_BITCOIN_RPC_PASS="password"
2627
export APP_CORE_LIGHTNING_DAEMON_GRPC_PORT=2105
2728
export APP_CORE_LIGHTNING_REST_PORT=2104
2829
export CORE_LIGHTNING_PATH="/root/.lightning"
@@ -33,8 +34,8 @@ else
3334
export LOCAL_HOST="http://""$DEVICE_DOMAIN_NAME"
3435
export APP_BITCOIN_NODE_IP="localhost"
3536
export APP_CORE_LIGHTNING_DAEMON_IP="localhost"
36-
export LIGHTNING_REST_IP="localhost"
37-
export APP_CORE_LIGHTNING_IP="localhost"
37+
export APP_CORE_LIGHTNING_REST_IP="localhost"
38+
export APP_CORE_LIGHTNING_IP="127.0.0.1"
3839
export APP_CONFIG_DIR="$PWD/data/app"
3940
export APP_CORE_LIGHTNING_REST_CERT_DIR="$PWD/data/c-lightning-rest/certs"
4041
export APP_CORE_LIGHTNING_WEBSOCKET_PORT=5001

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)