From 14407555ce0f6101cda8436892029b8f18d42bd9 Mon Sep 17 00:00:00 2001 From: Satstralia Date: Wed, 17 Jan 2024 20:37:00 +0000 Subject: [PATCH 01/56] Satstralia Onion urls --- compose/nginx/mn.conf.d/local.conf | 2 +- compose/nginx/tn.conf.d/local.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/nginx/mn.conf.d/local.conf b/compose/nginx/mn.conf.d/local.conf index 0c14f91..7b376b4 100644 --- a/compose/nginx/mn.conf.d/local.conf +++ b/compose/nginx/mn.conf.d/local.conf @@ -37,7 +37,7 @@ server { proxy_set_header Host $host; proxy_redirect off; # Replace with the onion hidden service of your coordinator - add_header Onion-Location http://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion$request_uri; + add_header Onion-Location http://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion$request_uri; limit_req zone=tenpersec burst=10; } diff --git a/compose/nginx/tn.conf.d/local.conf b/compose/nginx/tn.conf.d/local.conf index aed3905..67e2a64 100644 --- a/compose/nginx/tn.conf.d/local.conf +++ b/compose/nginx/tn.conf.d/local.conf @@ -36,7 +36,7 @@ server { proxy_set_header Host $host; proxy_redirect off; # Replace with the onion hidden service of your coordinator - add_header Onion-Location http://robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion$request_uri; + add_header Onion-Location https://qu6xztmzhlve6nxbb77jldek53pvhkaltz6seni7wq6g6yyj233qp4yd.onion$request_uri; limit_req zone=fivepersec burst=10; } From 000374c5bd0311d73cb5c8339f76395d5e9130af Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Tue, 30 Jan 2024 17:31:55 +0000 Subject: [PATCH 02/56] Update robosats.env --- compose/env-sample/lndtn/robosats.env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose/env-sample/lndtn/robosats.env b/compose/env-sample/lndtn/robosats.env index da9517a..fe7074b 100644 --- a/compose/env-sample/lndtn/robosats.env +++ b/compose/env-sample/lndtn/robosats.env @@ -19,6 +19,7 @@ CLN_GRPC_HOST='localhost:9999' CLN_GRPC_HOLD_HOST='localhost:9998' # Bitcoin Core Daemon RPC, used to validate addresses +# For mainnet the URL port is 8332 BITCOIND_RPCURL = 'http://127.0.0.1:18332' BITCOIND_RPCUSER = 'robosats_testnet_bitcoind' BITCOIND_RPCPASSWORD = 'robosats_testnet_bitcoind' @@ -167,4 +168,4 @@ MINIMUM_TARGET_CONF = 24 SLASHED_BOND_REWARD_SPLIT = 0.5 # Username for HTLCs escrows -ESCROW_USERNAME = 'admin' \ No newline at end of file +ESCROW_USERNAME = 'admin' From cfd5ea4c5a0499a50d03e015a97d0e3aa4f2059d Mon Sep 17 00:00:00 2001 From: Satstralia Date: Fri, 15 Mar 2024 22:38:02 +0000 Subject: [PATCH 03/56] Disable ln2 backups --- compose/backup/backup.sh | 24 +++++++++++------------ compose/docker-compose.override-lnd.yml | 10 +++++----- compose/docker-compose.yml | 26 ++++++++++++------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/compose/backup/backup.sh b/compose/backup/backup.sh index a9400e1..ef9f187 100644 --- a/compose/backup/backup.sh +++ b/compose/backup/backup.sh @@ -11,13 +11,13 @@ mkdir -p /backup1/lnd/data/chain/bitcoin/${NETWORK:?} mkdir -p /backup2/lnd/data/chain/bitcoin/${NETWORK:?} mkdir -p /backup3/lnd/data/chain/bitcoin/${NETWORK:?} -mkdir -p /backup1/lnd2 -mkdir -p /backup2/lnd2 -mkdir -p /backup3/lnd2 +# mkdir -p /backup1/lnd2 +# mkdir -p /backup2/lnd2 +# mkdir -p /backup3/lnd2 -mkdir -p /backup1/lnd2/data/chain/bitcoin/${NETWORK:?} -mkdir -p /backup2/lnd2/data/chain/bitcoin/${NETWORK:?} -mkdir -p /backup3/lnd2/data/chain/bitcoin/${NETWORK:?} +# mkdir -p /backup1/lnd2/data/chain/bitcoin/${NETWORK:?} +# mkdir -p /backup2/lnd2/data/chain/bitcoin/${NETWORK:?} +# mkdir -p /backup3/lnd2/data/chain/bitcoin/${NETWORK:?} mkdir -p /backup1/bitcoin mkdir -p /backup2/bitcoin @@ -45,9 +45,9 @@ do rsync -auzhPq /running/lnd/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup3/lnd/data/chain/bitcoin/${NETWORK:?}/channel.backup - rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup1/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup - rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup2/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup - rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup3/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup + # rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup1/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup + # rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup2/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup + # rsync -auzhPq /running/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup /backup3/lnd2/data/chain/bitcoin/${NETWORK:?}/channel.backup sleep 5 done @@ -57,9 +57,9 @@ rsync -auzhPq /running/lnd/lnd.conf /backup1/lnd/lnd.conf rsync -auzhPq /running/lnd/lnd.conf /backup2/lnd/lnd.conf rsync -auzhPq /running/lnd/lnd.conf /backup3/lnd/lnd.conf -rsync -auzhPq /running/lnd2/lnd.conf /backup1/lnd2/lnd.conf -rsync -auzhPq /running/lnd2/lnd.conf /backup2/lnd2/lnd.conf -rsync -auzhPq /running/lnd2/lnd.conf /backup3/lnd2/lnd.conf +# rsync -auzhPq /running/lnd2/lnd.conf /backup1/lnd2/lnd.conf +# rsync -auzhPq /running/lnd2/lnd.conf /backup2/lnd2/lnd.conf +# rsync -auzhPq /running/lnd2/lnd.conf /backup3/lnd2/lnd.conf rsync -auzhPq /running/bitcoin/bitcoin.conf /backup1/bitcoin/bitcoin.conf rsync -auzhPq /running/bitcoin/bitcoin.conf /backup2/bitcoin/bitcoin.conf diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index db9a8c3..2f4af13 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -63,10 +63,10 @@ services: celery: volumes: - ${LND_DATA}:/lnd - # backup: - # volumes: - # - ${LND_DATA}:/running/lnd:ro - # - ${LIT_DATA}:/running/lit:ro + backup: + volumes: + - ${LND_DATA}:/running/lnd:ro + - ${LIT_DATA}:/running/lit:ro # Other LND services you might want to enable @@ -101,4 +101,4 @@ services: # container_name: deunhealth${SUFFIX} # restart: always # volumes: -# - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file +# - /var/run/docker.sock:/var/run/docker.sock diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d5449d2..753dcf7 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -144,19 +144,19 @@ services: network_mode: service:tor # Example simple backup service (copy/paste to attached storage locations) - # backup: - # build: ./backup - # container_name: bu${SUFFIX} - # restart: always - # environment: - # NETWORK: ${NETWORK} - # volumes: - # - ${PG_BACKUP}:/running/database:ro - # - ${BITCOIN_DATA}:/running/bitcoin:ro - # - ${STATIC}:/running/static:ro - # - ${BU_DIR1}:/backup1 - # - ${BU_DIR2}:/backup2 - # - ${BU_DIR3}:/backup3 + backup: + build: ./backup + container_name: bu${SUFFIX} + restart: always + environment: + NETWORK: ${NETWORK} + volumes: + - ${PG_BACKUP}:/running/database:ro + - ${BITCOIN_DATA}:/running/bitcoin:ro + - ${STATIC}:/running/static:ro + - ${BU_DIR1}:/backup1 + - ${BU_DIR2}:/backup2 + - ${BU_DIR3}:/backup3 volumes: redisdata: From 72e950ae06fb7027fefcaeba7104c445f5fb0efe Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 7 Jul 2024 10:55:16 +0000 Subject: [PATCH 04/56] Use different onions for other services (#14) * Use different onions for other services * Update torrc * Update torrc * Update torrc * Update torrc --- compose/env-sample/lndtn/torrc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index 63e6a29..a0539c7 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -14,4 +14,13 @@ CookieAuthFile /var/lib/tor/control_auth_cookie # Robosats LND Testnet Onion Service HiddenServiceDir /var/lib/tor/robotest/ HiddenServiceVersion 3 -HiddenServicePort 80 127.0.0.1:80 \ No newline at end of file +HiddenServicePort 80 127.0.0.1:80 + +# Robosats Admin Testnet Onion Service +HiddenServiceDir /var/lib/tor/robotest-thunderhub/ +HiddenServiceVersion 3 +HiddenServicePort 80 127.0.0.1:3000 + +HiddenServiceDir /var/lib/tor/robotest-lit/ +HiddenServiceVersion 3 +HiddenServicePort 8443 127.0.0.1:8443 From 041644da83f6686f366552d9040b84ff6f3092d8 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 7 Jul 2024 10:55:43 +0000 Subject: [PATCH 05/56] Fix database backup (#12) * Fix database backup * Update docker-compose.yml --- compose/backup/backup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose/backup/backup.sh b/compose/backup/backup.sh index e1f7148..6288658 100644 --- a/compose/backup/backup.sh +++ b/compose/backup/backup.sh @@ -48,12 +48,12 @@ rsync -auzhPq /running/bitcoin/bitcoin.conf /backup1/bitcoin/bitcoin.conf rsync -auzhPq /running/bitcoin/bitcoin.conf /backup2/bitcoin/bitcoin.conf rsync -auzhPq /running/bitcoin/bitcoin.conf /backup3/bitcoin/bitcoin.conf -rsync -auzhPq /running/lit/* /backup1/lit/ -rsync -auzhPq /running/lit/* /backup2/lit/ -rsync -auzhPq /running/lit/* /backup3/lit/ +rsync -auzhPq /running/lit/ /backup1/lit/ +rsync -auzhPq /running/lit/ /backup2/lit/ +rsync -auzhPq /running/lit/ /backup3/lit/ echo "## backing up database ##" -rsync -auzhP /running/database/* /backup1/database/ -rsync -auzhP /running/database/* /backup2/database/ -rsync -auzhP /running/database/* /backup3/database/ +rsync -auzhP /running/database/ /backup1/database/ +rsync -auzhP /running/database/ /backup2/database/ +rsync -auzhP /running/database/ /backup3/database/ From 4285a176faeb71a12dab57f97c8ef16823931665 Mon Sep 17 00:00:00 2001 From: Satstralia Date: Sun, 7 Jul 2024 13:31:33 +0000 Subject: [PATCH 06/56] Block admin in public onion --- compose/nginx/mn.conf.d/local.conf | 17 ++++++++++++++++- compose/nginx/tn.conf.d/local.conf | 19 +++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/compose/nginx/mn.conf.d/local.conf b/compose/nginx/mn.conf.d/local.conf index 7b376b4..740b64b 100644 --- a/compose/nginx/mn.conf.d/local.conf +++ b/compose/nginx/mn.conf.d/local.conf @@ -41,7 +41,22 @@ server { limit_req zone=tenpersec burst=10; } - + location /coordinator { + # Blocks admin access from the public onion address + if ($host ~* "satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion") { + return 403; # Forbidden + } + + proxy_pass http://robosats_gunicorn_rest; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + # Replace with the onion hidden service of your coordinator + add_header Onion-Location https://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion$request_uri; + + } + + location /ws/ { # websockets are passed to Daphne proxy_pass http://robosats_daphne_websocket; diff --git a/compose/nginx/tn.conf.d/local.conf b/compose/nginx/tn.conf.d/local.conf index 67e2a64..b5bbb19 100644 --- a/compose/nginx/tn.conf.d/local.conf +++ b/compose/nginx/tn.conf.d/local.conf @@ -18,7 +18,7 @@ upstream robosats_daphne_websocket { server { listen 80; - server_name testnet.robosats.com; + server_name satstralia.com; large_client_header_buffers 4 64k; location /static { @@ -36,10 +36,25 @@ server { proxy_set_header Host $host; proxy_redirect off; # Replace with the onion hidden service of your coordinator - add_header Onion-Location https://qu6xztmzhlve6nxbb77jldek53pvhkaltz6seni7wq6g6yyj233qp4yd.onion$request_uri; + add_header Onion-Location https://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion$request_uri; limit_req zone=fivepersec burst=10; } + location /coordinator { + # Blocks admin access from the public onion address + if ($host ~* "testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion") { + return 403; # Forbidden + } + + proxy_pass http://robosats_gunicorn_rest; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + # Replace with the onion hidden service of your coordinator + add_header Onion-Location https://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion$request_uri; + + } + location /ws/ { # websockets are passed to Daphne proxy_pass http://robosats_daphne_websocket; From a6522e3822de044ca9db4885b23803fc5f7cecd1 Mon Sep 17 00:00:00 2001 From: Satstralia Date: Sun, 7 Jul 2024 13:37:13 +0000 Subject: [PATCH 07/56] Add torrc changes --- compose/env-sample/lndtn/torrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index a0539c7..82bcdb9 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -17,6 +17,10 @@ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:80 # Robosats Admin Testnet Onion Service +HiddenServiceDir /var/lib/tor/satstralia-admin/ +HiddenServiceVersion 3 +HiddenServicePort 80 127.0.0.1:80 + HiddenServiceDir /var/lib/tor/robotest-thunderhub/ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:3000 From 54b7032ed354fc2390107edebc20599b8b364612 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 11:10:05 +0000 Subject: [PATCH 08/56] Update docker-compose.yml --- compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index f79b63c..d2af79f 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -162,7 +162,7 @@ services: NETWORK: ${NETWORK} volumes: - ${DATABASE}:/running/database:ro - - ${BITCOIN_DATA}:/running/bitcoin:ro + - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro - ${LND_DATA}:/running/lnd:ro - ${LIT_DATA}:/running/lit:ro - ${STATIC}:/running/static:ro From 2eabc26f2f65cc8fe143daeac7eb7b3e2ccd6e75 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 11:10:52 +0000 Subject: [PATCH 09/56] Update docker-compose.yml --- compose/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d2af79f..3eff8e5 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -166,9 +166,9 @@ services: - ${LND_DATA}:/running/lnd:ro - ${LIT_DATA}:/running/lit:ro - ${STATIC}:/running/static:ro - - ${BU_DIR1}:/backup1 - - ${BU_DIR2}:/backup2 - - ${BU_DIR3}:/backup3 + - ${BU_DIR1}:/backup1:rw + - ${BU_DIR2}:/backup2:rw + - ${BU_DIR3}:/backup3:rw volumes: redisdata: From 8f7e4e8c27035f88d8089e82994e61e441f9fcbc Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:14:47 +0000 Subject: [PATCH 10/56] Update Dockerfile --- compose/backup/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/backup/Dockerfile b/compose/backup/Dockerfile index 4950b17..df3bc3a 100644 --- a/compose/backup/Dockerfile +++ b/compose/backup/Dockerfile @@ -5,6 +5,6 @@ RUN apt-get install rsync -y WORKDIR /usr/src/backup.sh -COPY backup.sh /usr/src/backup.sh +COPY backup.sh /usr/src CMD ["bash","backup.sh"] From eaffd39f0f0c6dd4f84c29e6a2067c6f4b1be899 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:15:42 +0000 Subject: [PATCH 11/56] Update Dockerfile --- compose/backup/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/backup/Dockerfile b/compose/backup/Dockerfile index df3bc3a..98d50ef 100644 --- a/compose/backup/Dockerfile +++ b/compose/backup/Dockerfile @@ -3,8 +3,8 @@ FROM debian:bullseye-slim RUN apt update RUN apt-get install rsync -y -WORKDIR /usr/src/backup.sh - COPY backup.sh /usr/src +WORKDIR /usr/src + CMD ["bash","backup.sh"] From 110768f693ab0eb13498dcedebf308c084cd4634 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:22:00 +0000 Subject: [PATCH 12/56] Update docker-compose.yml --- compose/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 3eff8e5..e2504a6 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -164,6 +164,7 @@ services: - ${DATABASE}:/running/database:ro - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro - ${LND_DATA}:/running/lnd:ro + - ${LND_CONF}:/running/lnd/lnd.conf:ro - ${LIT_DATA}:/running/lit:ro - ${STATIC}:/running/static:ro - ${BU_DIR1}:/backup1:rw From 848fed9477d569f97dfd2966710bdd1b66d2e895 Mon Sep 17 00:00:00 2001 From: koalasat Date: Fri, 9 Aug 2024 16:42:50 +0200 Subject: [PATCH 13/56] Satstralia relay --- compose/strfry/mn.onion_urls.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index 6f593e0..7412b4c 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -1,4 +1,5 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr -ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr \ No newline at end of file +ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr +wss://nostr.satstralia.com \ No newline at end of file From fa3bae9d92ff87291ffc3f46d37edf4e865faf98 Mon Sep 17 00:00:00 2001 From: Satstralia Date: Fri, 6 Sep 2024 18:59:30 +0000 Subject: [PATCH 14/56] disable ports --- compose/docker-compose.override-lnd.yml | 8 ++++---- compose/docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index c50508b..d5c7474 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -47,10 +47,10 @@ services: - ${LIT_DATA:?}:/root/ # Patch common services - tor: - ports: - - ${THUB_LOCAL_PORT}:3000 - - ${LIT_LOCAL_PORT}:8443 +# tor: + # ports: + # - ${THUB_LOCAL_PORT}:3000 + # - ${LIT_LOCAL_PORT}:8443 robosats: volumes: - ${LND_DATA}:/lnd diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index e2504a6..6a9e76a 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -9,10 +9,10 @@ services: volumes: - ${TOR_DATA:?}:/var/lib/tor - ${TOR_CONFIG:?}:/etc/tor/torrc - ports: - - ${WEB_LOCAL_PORT}:80 - - ${THUB_LOCAL_PORT}:3000 - - ${LIT_LOCAL_PORT}:8443 + # ports: + # - ${WEB_LOCAL_PORT}:80 + # - ${THUB_LOCAL_PORT}:3000 + # - ${LIT_LOCAL_PORT}:8443 bitcoind: image: ruimarinho/bitcoin-core:${BITCOIND_TAG:-24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc} From 38876873451a6f50b8f3a7dd1312716b71388d63 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sun, 22 Sep 2024 23:54:53 +0200 Subject: [PATCH 15/56] Add missing line to Strfry sync relays --- compose/strfry/mn.onion_urls.txt | 2 +- compose/strfry/tn.onion_urls.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index 7412b4c..d5c8972 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -2,4 +2,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -wss://nostr.satstralia.com \ No newline at end of file +wss://nostr.satstralia.com diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.onion_urls.txt index 92abf18..5252819 100644 --- a/compose/strfry/tn.onion_urls.txt +++ b/compose/strfry/tn.onion_urls.txt @@ -1,4 +1,4 @@ ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr -ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr \ No newline at end of file +ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr From 1d5918dd97a90c96461178f93e2d4fdf963edbbf Mon Sep 17 00:00:00 2001 From: koalasat Date: Sun, 22 Sep 2024 23:58:19 +0200 Subject: [PATCH 16/56] Add missing line to Strfry sync relays --- compose/strfry/mn.onion_urls.txt | 2 +- compose/strfry/tn.onion_urls.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index 7412b4c..d5c8972 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -2,4 +2,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -wss://nostr.satstralia.com \ No newline at end of file +wss://nostr.satstralia.com diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.onion_urls.txt index 92abf18..5252819 100644 --- a/compose/strfry/tn.onion_urls.txt +++ b/compose/strfry/tn.onion_urls.txt @@ -1,4 +1,4 @@ ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr -ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr \ No newline at end of file +ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr From 9b5dafc06d24e141dcb5781eb9e0cac9351684c1 Mon Sep 17 00:00:00 2001 From: Satstralia Date: Sun, 22 Sep 2024 22:07:58 +0000 Subject: [PATCH 17/56] Add extra line --- compose/strfry/mn.onion_urls.txt | 1 + compose/strfry/tn.onion_urls.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index d5c8972..cdd5772 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -3,3 +3,4 @@ ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr wss://nostr.satstralia.com + diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.onion_urls.txt index 5252819..ddb149d 100644 --- a/compose/strfry/tn.onion_urls.txt +++ b/compose/strfry/tn.onion_urls.txt @@ -2,3 +2,4 @@ ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr + From 4274312c332b8831199305caee3929d686d13ad0 Mon Sep 17 00:00:00 2001 From: koalasat Date: Mon, 23 Sep 2024 00:14:51 +0200 Subject: [PATCH 18/56] Add missing line to Strfry sync relays --- compose/strfry/mn.onion_urls.txt | 3 +-- compose/strfry/tn.onion_urls.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index cdd5772..7d05477 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -2,5 +2,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -wss://nostr.satstralia.com - +ws://nostr.satstralia.com diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.onion_urls.txt index ddb149d..5252819 100644 --- a/compose/strfry/tn.onion_urls.txt +++ b/compose/strfry/tn.onion_urls.txt @@ -2,4 +2,3 @@ ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr - From 921fadca27058529905f2cf6134f7c1cf895a9d0 Mon Sep 17 00:00:00 2001 From: koalasat Date: Mon, 23 Sep 2024 00:16:21 +0200 Subject: [PATCH 19/56] Add missing line to Strfry sync relays --- compose/strfry/mn.onion_urls.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index 7d05477..d5c8972 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -2,4 +2,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -ws://nostr.satstralia.com +wss://nostr.satstralia.com From 0b08773889eb3df2823d458967725e8be178a657 Mon Sep 17 00:00:00 2001 From: koalasat Date: Mon, 14 Oct 2024 23:09:00 +0200 Subject: [PATCH 20/56] Add LNDg --- compose/docker-compose.override-lnd.yml | 16 ++++++++++++++++ compose/env-sample/lndtn/compose.env | 4 ++-- compose/env-sample/lndtn/torrc | 4 ++++ compose/lndg/Dockerfile | 9 +++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 compose/lndg/Dockerfile diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index d5c7474..772fe92 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -45,6 +45,22 @@ services: volumes: - ${LND_DATA:?}:/lnd/:ro - ${LIT_DATA:?}:/root/ + + lndg: + build: ./lndg + restart: always + container_name: lndg${SUFFIX} + volumes: + - ${LNDG_CONF}:/root/.lnd:ro + - ${LNDG_DATA}:/lndg/data:rw + depends_on: + - tor + - lnd + command: + - sh + - -c + - python initialize.py -net 'mainnet' -server '127.0.0.1:10009' -d && supervisord && python manage.py runserver 0.0.0.0:8889 + network_mode: service:tor # Patch common services # tor: diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 802227b..bad437a 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -62,8 +62,8 @@ THUB_ACCOUNTS='./env/lndtn/thunderhub-accounts.yml' # THUB_ACCOUNTS_CONFIG_PATH must match thub...env THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml' - - +LNDG_CONF='/custom_path/testnet/lndg/config' +LNDG_DATA='/custom_path/testnet/lndg/data' LIT_LOCAL_PORT=4001 LIT_PASSWORD=999999999 diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index 82bcdb9..825abdc 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -28,3 +28,7 @@ HiddenServicePort 80 127.0.0.1:3000 HiddenServiceDir /var/lib/tor/robotest-lit/ HiddenServiceVersion 3 HiddenServicePort 8443 127.0.0.1:8443 + +HiddenServiceDir /var/lib/tor/robotest-lndg/ +HiddenServiceVersion 3 +HiddenServicePort 8889 127.0.0.1:8889 diff --git a/compose/lndg/Dockerfile b/compose/lndg/Dockerfile new file mode 100644 index 0000000..12dd729 --- /dev/null +++ b/compose/lndg/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:jammy +ENV TZ=Europe/London +ENV PYTHONUNBUFFERED 1 + +RUN apk add git g++ linux-headers && git clone https://github.com/cryptosharks131/lndg /app +WORKDIR /app +RUN git checkout "master" +RUN pip install -r requirements.txt +RUN pip install supervisor whitenoise From b244f9b217744705d867a76c058aa884572ad5df Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 10:23:40 +0200 Subject: [PATCH 21/56] Tor 80 --- compose/env-sample/lndtn/torrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index 825abdc..d8881ed 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -31,4 +31,4 @@ HiddenServicePort 8443 127.0.0.1:8443 HiddenServiceDir /var/lib/tor/robotest-lndg/ HiddenServiceVersion 3 -HiddenServicePort 8889 127.0.0.1:8889 +HiddenServicePort 80 127.0.0.1:8889 From 74fb8f20fdfee02ef7072c7c0102bd4dd1f69925 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 10:27:17 +0200 Subject: [PATCH 22/56] Change Dockerfile --- compose/lndg/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/lndg/Dockerfile b/compose/lndg/Dockerfile index 12dd729..4153641 100644 --- a/compose/lndg/Dockerfile +++ b/compose/lndg/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM python:3-alpine ENV TZ=Europe/London ENV PYTHONUNBUFFERED 1 From a685d55acea87c410af8afdcfbfc789f674ad42a Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 10:42:54 +0200 Subject: [PATCH 23/56] Initialize --- compose/docker-compose.override-lnd.yml | 4 ++-- compose/env-sample/lndtn/compose.env | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 772fe92..2b2cf1e 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -51,7 +51,7 @@ services: restart: always container_name: lndg${SUFFIX} volumes: - - ${LNDG_CONF}:/root/.lnd:ro + - ${LND_DATA}:/root/.lnd:ro - ${LNDG_DATA}:/lndg/data:rw depends_on: - tor @@ -59,7 +59,7 @@ services: command: - sh - -c - - python initialize.py -net 'mainnet' -server '127.0.0.1:10009' -d && supervisord && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index bad437a..3c889e6 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -62,8 +62,9 @@ THUB_ACCOUNTS='./env/lndtn/thunderhub-accounts.yml' # THUB_ACCOUNTS_CONFIG_PATH must match thub...env THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml' -LNDG_CONF='/custom_path/testnet/lndg/config' LNDG_DATA='/custom_path/testnet/lndg/data' +LNDG_USER='lndg-admin' +LNDG_PASSWORD=999999999 LIT_LOCAL_PORT=4001 LIT_PASSWORD=999999999 From bc52e9643642151eec8ce95f6567d5304bb93e12 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 11:34:12 +0200 Subject: [PATCH 24/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 3 ++- compose/env-sample/lndtn/compose.env | 1 + compose/env-sample/lndtn/supervisord.conf | 24 +++++++++++++++++++++++ compose/env-sample/lndtn/torrc | 2 +- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 compose/env-sample/lndtn/supervisord.conf diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 2b2cf1e..2990181 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -51,6 +51,7 @@ services: restart: always container_name: lndg${SUFFIX} volumes: + - ${LND_CONFIG}:/root/supervisord.conf:ro - ${LND_DATA}:/root/.lnd:ro - ${LNDG_DATA}:/lndg/data:rw depends_on: @@ -59,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 3c889e6..ec01fc6 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -62,6 +62,7 @@ THUB_ACCOUNTS='./env/lndtn/thunderhub-accounts.yml' # THUB_ACCOUNTS_CONFIG_PATH must match thub...env THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml' +LNDG_CONFIG='/custom_path/testnet/lndg/config' LNDG_DATA='/custom_path/testnet/lndg/data' LNDG_USER='lndg-admin' LNDG_PASSWORD=999999999 diff --git a/compose/env-sample/lndtn/supervisord.conf b/compose/env-sample/lndtn/supervisord.conf new file mode 100644 index 0000000..157a6e1 --- /dev/null +++ b/compose/env-sample/lndtn/supervisord.conf @@ -0,0 +1,24 @@ +[supervisord] +user=root +childlogdir = /var/log +logfile = /var/log/supervisord.log +logfile_maxbytes = 50MB +logfile_backups = 30 +loglevel = info +pidfile = /var/supervisord.pid +umask = 022 +nodaemon = false +nocleanup = false + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface + +[program:controller] +command = sh -c "python controller.py && sleep 15" +process_name = lndg-controller +directory = /app +autorestart = true +redirect_stderr = true +stdout_logfile = /var/log/lndg-controller.log +stdout_logfile_maxbytes = 150MB +stdout_logfile_backups = 15 diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index d8881ed..fbbf5cd 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -17,7 +17,7 @@ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:80 # Robosats Admin Testnet Onion Service -HiddenServiceDir /var/lib/tor/satstralia-admin/ +HiddenServiceDir /var/lib/tor/robotest-admin/ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:80 From 54cb3f5f22f832af359652df871523c104fbb461 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 11:40:46 +0200 Subject: [PATCH 25/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- compose/env-sample/lndtn/compose.env | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 2990181..a910865 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -51,7 +51,7 @@ services: restart: always container_name: lndg${SUFFIX} volumes: - - ${LND_CONFIG}:/root/supervisord.conf:ro + - ${LNDG_CONFIG}:/root/supervisord.conf:ro - ${LND_DATA}:/root/.lnd:ro - ${LNDG_DATA}:/lndg/data:rw depends_on: diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index ec01fc6..29be292 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -41,15 +41,15 @@ BU_DIR2='/custom_path/backup' BU_DIR3='/custom_path/backup2' BITCOIN_DATA='/custom_path/testnet/bitcoin' -BITCOIN_CONF='./env/lndtn/bitcoin.conf' +BITCOIN_CONF='./env-sample/lndtn/bitcoin.conf' LND_DATA='/custom_path/testnet/lnd' -LND_CONF='./env/lndtn/lnd.conf' +LND_CONF='./env-sample/lndtn/lnd.conf' LIT_DATA='/custom_path/testnet/lit' GUEST_BITCOIN=/home/bitcoin/.bitcoin -TOR_DATA='./env/lndtn/tor' -TOR_CONFIG='./env/lndtn/torrc' +TOR_DATA='./env-sample/lndtn/tor' +TOR_CONFIG='./env-sample/lndtn/torrc' GUEST_LND_RPC_PORT=10009 GUEST_LND_REST_PORT=8080 @@ -58,11 +58,11 @@ HOST_LND_RPC_PORT=10009 HOST_LND_REST_PORT=8080 THUB_LOCAL_PORT=3001 -THUB_ACCOUNTS='./env/lndtn/thunderhub-accounts.yml' +THUB_ACCOUNTS='./env-sample/lndtn/thunderhub-accounts.yml' # THUB_ACCOUNTS_CONFIG_PATH must match thub...env THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml' -LNDG_CONFIG='/custom_path/testnet/lndg/config' +LNDG_CONFIG='./env-sample/lndtn/supervisord.conf' LNDG_DATA='/custom_path/testnet/lndg/data' LNDG_USER='lndg-admin' LNDG_PASSWORD=999999999 @@ -74,4 +74,4 @@ LND_BACKUP_PATH='/custom_path/testnet/lnd-backup' NODE_ALIAS='šŸ¤–RoboSatsāš”(Testnet)' NODE_COLOR='#4126a7' -LND_AUTOUNLOCK_PWD='./env/lndtn/lnd_autounlock_pwd' +LND_AUTOUNLOCK_PWD='./env-sample/lndtn/lnd_autounlock_pwd' From 5864ba0d60c299c90308a995f6a7952b5ff9f2d6 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 11:55:54 +0200 Subject: [PATCH 26/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- compose/env-sample/lndtn/compose.env | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index a910865..f858cbe 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -d -dx -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -p ${LNDG_PASSWORD:?} --supervisord && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 29be292..46a2b5e 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -64,7 +64,6 @@ THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml' LNDG_CONFIG='./env-sample/lndtn/supervisord.conf' LNDG_DATA='/custom_path/testnet/lndg/data' -LNDG_USER='lndg-admin' LNDG_PASSWORD=999999999 LIT_LOCAL_PORT=4001 From 84f861411a94433e403a11e0a000f78eae5a9f73 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:12:28 +0200 Subject: [PATCH 27/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index f858cbe..d3db59c 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -d -dx -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -p ${LNDG_PASSWORD:?} --supervisord && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -d -dx -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} --supervisord && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services From 746d31d9a91eac2015155450c22e0d61b2ee9633 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:29:19 +0200 Subject: [PATCH 28/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- compose/lndg/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index d3db59c..2f5a741 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -d -dx -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} --supervisord && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} --supervisord && python controller.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services diff --git a/compose/lndg/Dockerfile b/compose/lndg/Dockerfile index 4153641..0bbd028 100644 --- a/compose/lndg/Dockerfile +++ b/compose/lndg/Dockerfile @@ -2,7 +2,7 @@ FROM python:3-alpine ENV TZ=Europe/London ENV PYTHONUNBUFFERED 1 -RUN apk add git g++ linux-headers && git clone https://github.com/cryptosharks131/lndg /app +RUN apk add git g++ linux-headers && git clone --branch v1.9.0 https://github.com/cryptosharks131/lndg /app WORKDIR /app RUN git checkout "master" RUN pip install -r requirements.txt From 404f88344f4a866ac3ccfbf656d79e86f2dca285 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:31:03 +0200 Subject: [PATCH 29/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 2f5a741..37f1545 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} --supervisord && python controller.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python controller.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services From 98404be1eaef69838c5b186d728e6acc10acbf11 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:34:32 +0200 Subject: [PATCH 30/56] Fix supervisord --- compose/lndg/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/lndg/Dockerfile b/compose/lndg/Dockerfile index 0bbd028..6d64f8c 100644 --- a/compose/lndg/Dockerfile +++ b/compose/lndg/Dockerfile @@ -4,6 +4,6 @@ ENV PYTHONUNBUFFERED 1 RUN apk add git g++ linux-headers && git clone --branch v1.9.0 https://github.com/cryptosharks131/lndg /app WORKDIR /app -RUN git checkout "master" + RUN pip install -r requirements.txt RUN pip install supervisor whitenoise From b9543e0ea5325e06f3f04d00687ffae596405473 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:44:45 +0200 Subject: [PATCH 31/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 37f1545..c9f3cd7 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python controller.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python manage.py runserver 0.0.0.0:8889 > /var/log/lndg-manage.log 2>&1 & tail -f /var/log/lndg-manage.log network_mode: service:tor # Patch common services From a2300e88c2fb5a1726e6175efe72164dc78519b1 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:46:52 +0200 Subject: [PATCH 32/56] Fix supervisord --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index c9f3cd7..6bd6212 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python manage.py runserver 0.0.0.0:8889 > /var/log/lndg-manage.log 2>&1 & tail -f /var/log/lndg-manage.log + - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services From a5138691f2e5828281c4c23e79ec4f3770dab668 Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 12:52:41 +0200 Subject: [PATCH 33/56] Fix Django --- compose/lndg/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose/lndg/Dockerfile b/compose/lndg/Dockerfile index 6d64f8c..50dd136 100644 --- a/compose/lndg/Dockerfile +++ b/compose/lndg/Dockerfile @@ -2,8 +2,9 @@ FROM python:3-alpine ENV TZ=Europe/London ENV PYTHONUNBUFFERED 1 -RUN apk add git g++ linux-headers && git clone --branch v1.9.0 https://github.com/cryptosharks131/lndg /app +RUN apk add git g++ linux-headers && git clone https://github.com/cryptosharks131/lndg /app WORKDIR /app +RUN git checkout "v1.9.0" RUN pip install -r requirements.txt RUN pip install supervisor whitenoise From f83df5864a286e66622d6a69056688febe4db9ec Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 13:08:23 +0200 Subject: [PATCH 34/56] Fix Django --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 6bd6212..0607d33 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw ${LNDG_PASSWORD:?} && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw '${LNDG_PASSWORD:?}' && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services From d73850e91236eea8018ecf93cba5d8b2b56a3fee Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 13:13:40 +0200 Subject: [PATCH 35/56] Fix Django --- compose/docker-compose.override-lnd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index 0607d33..33e0266 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -60,7 +60,7 @@ services: command: - sh - -c - - python initialize.py -net ${NETWORK} -wn -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw '${LNDG_PASSWORD:?}' && python manage.py runserver 0.0.0.0:8889 + - python initialize.py -net ${NETWORK} -d -dx -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -pw '${LNDG_PASSWORD:?}' && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889 network_mode: service:tor # Patch common services From c32e1dba2e3dee6c6327db934fc7c53940b2d93b Mon Sep 17 00:00:00 2001 From: koalasat Date: Tue, 15 Oct 2024 13:28:21 +0200 Subject: [PATCH 36/56] Supervisorb pass Conflicts: compose/env-sample/lndtn/supervisord.conf --- compose/env-sample/lndtn/supervisord.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/compose/env-sample/lndtn/supervisord.conf b/compose/env-sample/lndtn/supervisord.conf index 157a6e1..55d7d9b 100644 --- a/compose/env-sample/lndtn/supervisord.conf +++ b/compose/env-sample/lndtn/supervisord.conf @@ -10,6 +10,16 @@ umask = 022 nodaemon = false nocleanup = false +[inet_http_server] +port = 9001 +username = lndg-supervisord +password = 8888888888 # Change this password + +[supervisorctl] +serverurl = http://localhost:9001 +username = lndg-supervisord +password = 8888888888 # Change this password + [rpcinterface:supervisor] supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface From 70a236baa24810e7d690ec2b35dd2b5771891549 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sun, 3 Nov 2024 11:55:46 +0100 Subject: [PATCH 37/56] Add over the moon coordinator --- compose/strfry/mn.onion_urls.txt | 1 + compose/strfry/tn.onion_urls.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.onion_urls.txt index d5c8972..3309ad3 100644 --- a/compose/strfry/mn.onion_urls.txt +++ b/compose/strfry/mn.onion_urls.txt @@ -2,4 +2,5 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr +ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr wss://nostr.satstralia.com diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.onion_urls.txt index 5252819..80fc12b 100644 --- a/compose/strfry/tn.onion_urls.txt +++ b/compose/strfry/tn.onion_urls.txt @@ -2,3 +2,4 @@ ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr +ws://otmtestgbj3kqo3nre6oksusuqfb4ids5zg2y5z2qza2jogeu67stwid.onion/nostr From 2cdbffe3f56ee791ea4c3f06381c8eff1c98ddfb Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Wed, 23 Apr 2025 09:37:33 +0000 Subject: [PATCH 38/56] Update sync.sh --- compose/strfry/sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh index 8c47617..1258d45 100644 --- a/compose/strfry/sync.sh +++ b/compose/strfry/sync.sh @@ -1,6 +1,6 @@ #!/bin/sh -filters='{"kinds":[38383]}' +filters='{"kinds":[38383, 31986, 1059]}' while IFS= read -r line; do /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both From ec9b304555cadf4e9521bbe961199f87d59e382a Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 16:27:53 +0200 Subject: [PATCH 39/56] Fix file --- .../strfry/{mn.federation_urls .txt => mn.federation_urls.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename compose/strfry/{mn.federation_urls .txt => mn.federation_urls.txt} (100%) diff --git a/compose/strfry/mn.federation_urls .txt b/compose/strfry/mn.federation_urls.txt similarity index 100% rename from compose/strfry/mn.federation_urls .txt rename to compose/strfry/mn.federation_urls.txt From 7d413b832103b9ec9290c76163a961e2c4238ae6 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 16:34:49 +0200 Subject: [PATCH 40/56] Fix file --- .../{mn.federation_urls .txt => mn.federation_urls.txt} | 2 +- compose/strfry/sync.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename compose/strfry/{mn.federation_urls .txt => mn.federation_urls.txt} (96%) diff --git a/compose/strfry/mn.federation_urls .txt b/compose/strfry/mn.federation_urls.txt similarity index 96% rename from compose/strfry/mn.federation_urls .txt rename to compose/strfry/mn.federation_urls.txt index 64b1eaf..5cded99 100644 --- a/compose/strfry/mn.federation_urls .txt +++ b/compose/strfry/mn.federation_urls.txt @@ -1,4 +1,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr +ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr \ No newline at end of file diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh index 377054b..ff9766d 100644 --- a/compose/strfry/sync.sh +++ b/compose/strfry/sync.sh @@ -1,14 +1,14 @@ #!/bin/sh -filters='{"kinds":[38383]}' +filters_external='{"kinds":[38383]}' while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both + /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both done < /app/external_urls.txt -filters='{"kinds":[38383, 31986, 1059]}' +filters_federation='{"kinds":[38383, 31986, 1059]}' while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both + /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both done < /app/federation_urls.txt From b9603b208ba3dcd3acd3188cd1c62401412cab8c Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 16:40:49 +0200 Subject: [PATCH 41/56] Fix file --- compose/docker-compose.yml | 4 ++-- compose/env-sample/lndtn/compose.env | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 546986f..78aafc2 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -148,8 +148,8 @@ services: container_name: strfry${SUFFIX} restart: always volumes: - - ${STRFRY_URL_FILE}/external_urls.txt:/app/external_urls.txt:ro - - ${STRFRY_URL_FILE}/federation_urls.txt:/app/federation_urls.txt:ro + - ${STRFRY_URL_FILE}:/app/external_urls.txt:ro + - ${STRFRY_URL_FILE}:/app/federation_urls.txt:ro - ${STRFRY_CONF}:/etc/strfry.conf:ro - ${STRFRY_DATA}/db:/app/strfry-db:rw network_mode: service:tor diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 3ed1431..5b2fa1a 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -29,7 +29,8 @@ NGINX_CONFD='./nginx/tn.conf.d' WELLKNOWN='./nginx/tn.well-known' STRFRY_CONF='./env-sample/lndtn/strfry.conf' -STRFRY_URL_FILE='./strfry/' +STRFRY_URL_EXTERNAL='./strfry/external_urls.txt' +STRFRY_URL_FEDERATION='./strfry/federation_urls.txt' STRFRY_DATA='/custom_path/testnet/strfry' # Port and number of HTTP server workers for the robosats backend From e617a70bfd1848fe08d693e3446e07c3701467c4 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 16:44:45 +0200 Subject: [PATCH 42/56] Fix --- compose/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 78aafc2..f61153e 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -148,8 +148,8 @@ services: container_name: strfry${SUFFIX} restart: always volumes: - - ${STRFRY_URL_FILE}:/app/external_urls.txt:ro - - ${STRFRY_URL_FILE}:/app/federation_urls.txt:ro + - ${STRFRY_URL_EXTERNAL}:/app/external_urls.txt:ro + - ${STRFRY_URL_FEDERATION}:/app/federation_urls.txt:ro - ${STRFRY_CONF}:/etc/strfry.conf:ro - ${STRFRY_DATA}/db:/app/strfry-db:rw network_mode: service:tor From 5c5ed0b7e94ec6a7332acd7d9b07298ec5d99a54 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 16:56:37 +0200 Subject: [PATCH 43/56] Fix --- compose/docker-compose.yml | 2 -- compose/env-sample/lndtn/compose.env | 2 -- compose/strfry/Dockerfile | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index f61153e..7ff5005 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -148,8 +148,6 @@ services: container_name: strfry${SUFFIX} restart: always volumes: - - ${STRFRY_URL_EXTERNAL}:/app/external_urls.txt:ro - - ${STRFRY_URL_FEDERATION}:/app/federation_urls.txt:ro - ${STRFRY_CONF}:/etc/strfry.conf:ro - ${STRFRY_DATA}/db:/app/strfry-db:rw network_mode: service:tor diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 5b2fa1a..a798af1 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -29,8 +29,6 @@ NGINX_CONFD='./nginx/tn.conf.d' WELLKNOWN='./nginx/tn.well-known' STRFRY_CONF='./env-sample/lndtn/strfry.conf' -STRFRY_URL_EXTERNAL='./strfry/external_urls.txt' -STRFRY_URL_FEDERATION='./strfry/federation_urls.txt' STRFRY_DATA='/custom_path/testnet/strfry' # Port and number of HTTP server workers for the robosats backend diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index 86a2b08..b8eaba0 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -38,4 +38,6 @@ RUN chmod +x /etc/strfry/sync.sh #Setting up logs RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log +COPY . /app + ENTRYPOINT ["/etc/strfry/entrypoint.sh"] From c50a5b5ef8f55ce4917632fbc42db0ed609b6d0d Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:00:08 +0200 Subject: [PATCH 44/56] Fix --- compose/strfry/mn.federation_urls.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compose/strfry/mn.federation_urls.txt b/compose/strfry/mn.federation_urls.txt index 5cded99..63a94f1 100644 --- a/compose/strfry/mn.federation_urls.txt +++ b/compose/strfry/mn.federation_urls.txt @@ -1,4 +1,8 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr \ No newline at end of file +<<<<<<< Updated upstream +ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr +======= +ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr +>>>>>>> Stashed changes From 71ca0b0eb84ad88c93c50d72dce789e8fe60950f Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:02:19 +0200 Subject: [PATCH 45/56] Fix --- compose/strfry/mn.federation_urls.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/compose/strfry/mn.federation_urls.txt b/compose/strfry/mn.federation_urls.txt index 63a94f1..64b1eaf 100644 --- a/compose/strfry/mn.federation_urls.txt +++ b/compose/strfry/mn.federation_urls.txt @@ -1,8 +1,4 @@ ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -<<<<<<< Updated upstream ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr -======= -ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr ->>>>>>> Stashed changes From de033b48bf8d9d5ac51182e2e4e7000ef71d102a Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:26:01 +0200 Subject: [PATCH 46/56] Fix --- compose/strfry/mn.federation_urls.txt~HEAD | 4 ---- compose/strfry/mn.federation_urls.txt~split-strfry-onions | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 compose/strfry/mn.federation_urls.txt~HEAD delete mode 100644 compose/strfry/mn.federation_urls.txt~split-strfry-onions diff --git a/compose/strfry/mn.federation_urls.txt~HEAD b/compose/strfry/mn.federation_urls.txt~HEAD deleted file mode 100644 index 64b1eaf..0000000 --- a/compose/strfry/mn.federation_urls.txt~HEAD +++ /dev/null @@ -1,4 +0,0 @@ -ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr -ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr -ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr diff --git a/compose/strfry/mn.federation_urls.txt~split-strfry-onions b/compose/strfry/mn.federation_urls.txt~split-strfry-onions deleted file mode 100644 index 64b1eaf..0000000 --- a/compose/strfry/mn.federation_urls.txt~split-strfry-onions +++ /dev/null @@ -1,4 +0,0 @@ -ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr -ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr -ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr -ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr From 6fbc495c004320d15a7b8c0a17c79f4855e33ff7 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:31:44 +0200 Subject: [PATCH 47/56] Fix --- compose/strfry/sync.sh | 14 +++++++------- compose/strfry/tn.external_urls.txt | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh index ff9766d..9e9d406 100644 --- a/compose/strfry/sync.sh +++ b/compose/strfry/sync.sh @@ -1,14 +1,14 @@ #!/bin/sh -filters_external='{"kinds":[38383]}' - -while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both -done < /app/external_urls.txt - - filters_federation='{"kinds":[38383, 31986, 1059]}' while IFS= read -r line; do /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both done < /app/federation_urls.txt + + +filters_external='{"kinds":[38383]}' + +while IFS= read -r line; do + /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both +done < /app/external_urls.txt diff --git a/compose/strfry/tn.external_urls.txt b/compose/strfry/tn.external_urls.txt index 1a6b634..6011963 100644 --- a/compose/strfry/tn.external_urls.txt +++ b/compose/strfry/tn.external_urls.txt @@ -1,5 +1,5 @@ wss://nostr.satstralia.com -wss://freelay.sovbit.host -wss://nostrvista.aaroniumii.com wss://relay.damus.io -wss://relay.mostro.network \ No newline at end of file +wss://relay.mostro.network +wss://nostrvista.aaroniumii.com +wss://freelay.sovbit.host \ No newline at end of file From 77bda73168c616a1962df1aaf7b81c4f46c1641a Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:33:10 +0200 Subject: [PATCH 48/56] Fix --- compose/strfry/mn.external_urls.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/strfry/mn.external_urls.txt b/compose/strfry/mn.external_urls.txt index 1a6b634..6011963 100644 --- a/compose/strfry/mn.external_urls.txt +++ b/compose/strfry/mn.external_urls.txt @@ -1,5 +1,5 @@ wss://nostr.satstralia.com -wss://freelay.sovbit.host -wss://nostrvista.aaroniumii.com wss://relay.damus.io -wss://relay.mostro.network \ No newline at end of file +wss://relay.mostro.network +wss://nostrvista.aaroniumii.com +wss://freelay.sovbit.host \ No newline at end of file From a12e589a0de330099342dc6a25d97318c674a32b Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 17:40:03 +0200 Subject: [PATCH 49/56] Fix --- compose/strfry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index 86a2b08..d00ea7a 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y --no-install-recommends \ libsecp256k1-dev libzstd-dev # setup app -RUN git clone https://github.com/KoalaSat/strfry /app +RUN git clone --branch 1.0.4 --single-branch https://github.com/hoytech/strfry /app WORKDIR /app From f419bfc87232843a9f541d6ca0b87bc49a54cf67 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 18:14:01 +0200 Subject: [PATCH 50/56] Back to extnerl --- compose/strfry/sync.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh index 9e9d406..b577ffa 100644 --- a/compose/strfry/sync.sh +++ b/compose/strfry/sync.sh @@ -1,14 +1,15 @@ #!/bin/sh filters_federation='{"kinds":[38383, 31986, 1059]}' +timeout_duration="10s" while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both done < /app/federation_urls.txt filters_external='{"kinds":[38383]}' while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both done < /app/external_urls.txt From 257c0416c00e314aaf574f492b639b0992733883 Mon Sep 17 00:00:00 2001 From: koalasat Date: Sat, 3 May 2025 18:31:45 +0200 Subject: [PATCH 51/56] Revert --- compose/strfry/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index fe13562..86a2b08 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y --no-install-recommends \ libsecp256k1-dev libzstd-dev # setup app -RUN git clone --branch 1.0.4 --single-branch https://github.com/hoytech/strfry /app +RUN git clone https://github.com/KoalaSat/strfry /app WORKDIR /app @@ -38,6 +38,4 @@ RUN chmod +x /etc/strfry/sync.sh #Setting up logs RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log -COPY . /app - ENTRYPOINT ["/etc/strfry/entrypoint.sh"] From dc2cb9ef8d827f39bbcf059c295720d3d42846a3 Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 8 May 2025 15:36:05 +0200 Subject: [PATCH 52/56] Update strfry --- compose/strfry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index 86a2b08..cec9905 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y --no-install-recommends \ libsecp256k1-dev libzstd-dev # setup app -RUN git clone https://github.com/KoalaSat/strfry /app +RUN git clone --branch 1.0.0 --single-branch https://github.com/hoytech/strfry /app WORKDIR /app From 644a79ee4ff30254a4c9e4d1d6092a60d88df168 Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 8 May 2025 16:49:22 +0200 Subject: [PATCH 53/56] Use new relay Conflicts: compose/relay/sync_external.sh compose/strfry/sync.sh --- compose/docker-compose.yml | 17 ++- compose/env-sample/lndtn/compose.env | 5 + compose/env-sample/lndtn/relay.strfry.conf | 138 +++++++++++++++++++++ compose/nginx/mn.conf.d/local.conf | 8 ++ compose/relay/Dockerfile | 43 +++++++ compose/relay/README.md | 5 + compose/relay/crontab | 25 ++++ compose/relay/entrypoint.sh | 3 + compose/relay/mn.external_urls.txt | 3 + compose/relay/mn.federation_urls.txt | 4 + compose/relay/sync_external.sh | 8 ++ compose/relay/sync_federation.sh | 8 ++ compose/relay/tn.external_urls.txt | 3 + compose/relay/tn.federation_urls.txt | 4 + compose/strfry/Dockerfile | 8 +- compose/strfry/crontab | 3 +- compose/strfry/sync.sh | 7 -- compose/strfry/sync_external.sh | 9 ++ compose/strfry/sync_federation.sh | 8 ++ 19 files changed, 297 insertions(+), 12 deletions(-) create mode 100644 compose/env-sample/lndtn/relay.strfry.conf create mode 100644 compose/relay/Dockerfile create mode 100644 compose/relay/README.md create mode 100644 compose/relay/crontab create mode 100644 compose/relay/entrypoint.sh create mode 100644 compose/relay/mn.external_urls.txt create mode 100644 compose/relay/mn.federation_urls.txt create mode 100644 compose/relay/sync_external.sh create mode 100644 compose/relay/sync_federation.sh create mode 100644 compose/relay/tn.external_urls.txt create mode 100644 compose/relay/tn.federation_urls.txt delete mode 100644 compose/strfry/sync.sh create mode 100644 compose/strfry/sync_external.sh create mode 100644 compose/strfry/sync_federation.sh diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 3e446d3..ba4f347 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -144,7 +144,9 @@ services: network_mode: service:tor strfry: - build: ./strfry + build: + context: ./strfry + dockerfile: old.Dockerfile container_name: strfry${SUFFIX} restart: always volumes: @@ -153,6 +155,19 @@ services: - ${STRFRY_DATA}/db:/app/strfry-db:rw network_mode: service:tor + relay: + build: + context: ./relay + dockerfile: Dockerfile + container_name: relay${SUFFIX} + restart: always + volumes: + - ${RELAY_URLS_EXTERNAL}:/app/external_urls.txt:ro + - ${RELAY_URLS_FEDERATION}:/app/federation_urls.txt:ro + - ${RELAY_CONF}:/etc/strfry.conf:ro + - ${RELAY_DATA}/db:/app/strfry-db:rw + network_mode: service:tor + # Example simple backup service (copy/paste to attached storage locations) # backup: # build: ./backup diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 46a2b5e..5856393 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -32,6 +32,11 @@ STRFRY_CONF='./env-sample/lndtn/strfry.conf' STRFRY_URLS='./strfry/tn.onion_urls.txt' STRFRY_DATA='/custom_path/testnet/strfry' +RELAY_CONF='./env-sample/lndtn/relay.strfry.conf' +RELAY_URLS_EXTERNAL='./strfry/tn.external_urls.txt' +RELAY_URLS_FEDERATION='./strfry/tn.federation_urls.txt' +RELAY_DATA='/custom_path/testnet/relay' + # Port and number of HTTP server workers for the robosats backend WEB_LOCAL_PORT=8001 GUNICORN_WORKERS=2 diff --git a/compose/env-sample/lndtn/relay.strfry.conf b/compose/env-sample/lndtn/relay.strfry.conf new file mode 100644 index 0000000..2109056 --- /dev/null +++ b/compose/env-sample/lndtn/relay.strfry.conf @@ -0,0 +1,138 @@ +## +## Default strfry config +## + +# Directory that contains the strfry LMDB database (restart required) +db = "/app/strfry-db/" + +dbParams { + # Maximum number of threads/processes that can simultaneously have LMDB transactions open (restart required) + maxreaders = 256 + + # Size of mmap() to use when loading LMDB (default is 10TB, does *not* correspond to disk-space used) (restart required) + mapsize = 10995116277760 + + # Disables read-ahead when accessing the LMDB mapping. Reduces IO activity when DB size is larger than RAM. (restart required) + noReadAhead = false +} + +events { + # Maximum size of normalised JSON, in bytes + maxEventSize = 65536 + + # Events newer than this will be rejected + rejectEventsNewerThanSeconds = 900 + + # Events older than this will be rejected + rejectEventsOlderThanSeconds = 94608000 + + # Ephemeral events older than this will be rejected + rejectEphemeralEventsOlderThanSeconds = 60 + + # Ephemeral events will be deleted from the DB when older than this + ephemeralEventsLifetimeSeconds = 300 + + # Maximum number of tags allowed + maxNumTags = 2000 + + # Maximum size for tag values, in bytes + maxTagValSize = 1024 +} + +relay { + # Interface to listen on. Use 0.0.0.0 to listen on all interfaces (restart required) + bind = "0.0.0.0" + + # Port to open for the nostr websocket protocol (restart required) + port = 7778 + + # Set OS-limit on maximum number of open files/sockets (if 0, don't attempt to set) (restart required) + nofiles = 524288 + + # HTTP header that contains the client's real IP, before reverse proxying (ie x-real-ip) (MUST be all lower-case) + realIpHeader = "" + + info { + # NIP-11: Name of this server. Short/descriptive (< 30 characters) + name = "Robosats" + + # NIP-11: Detailed information about relay, free-form + description = "Federation cache system." + + # NIP-11: Administrative nostr pubkey, for contact purposes + pubkey = "" + + # NIP-11: Alternative administrative contact (email, website, etc) + contact = "" + } + + # Maximum accepted incoming websocket frame size (should be larger than max event) (restart required) + maxWebsocketPayloadSize = 131072 + + # Websocket-level PING message frequency (should be less than any reverse proxy idle timeouts) (restart required) + autoPingSeconds = 55 + + # If TCP keep-alive should be enabled (detect dropped connections to upstream reverse proxy) + enableTcpKeepalive = false + + # How much uninterrupted CPU time a REQ query should get during its DB scan + queryTimesliceBudgetMicroseconds = 10000 + + # Maximum records that can be returned per filter + maxFilterLimit = 500 + + # Maximum number of subscriptions (concurrent REQs) a connection can have open at any time + maxSubsPerConnection = 3 + + writePolicy { + # If non-empty, path to an executable script that implements the writePolicy plugin logic + plugin = "" + } + + compression { + # Use permessage-deflate compression if supported by client. Reduces bandwidth, but slight increase in CPU (restart required) + enabled = true + + # Maintain a sliding window buffer for each connection. Improves compression, but uses more memory (restart required) + slidingWindow = false + } + + logging { + # Dump all incoming messages + dumpInAll = false + + # Dump all incoming EVENT messages + dumpInEvents = false + + # Dump all incoming REQ/CLOSE messages + dumpInReqs = false + + # Log performance metrics for initial REQ database scans + dbScanPerf = false + + # Log reason for invalid event rejection? Can be disabled to silence excessive logging + invalidEvents = true + } + + numThreads { + # Ingester threads: route incoming requests, validate events/sigs (restart required) + ingester = 3 + + # reqWorker threads: Handle initial DB scan for events (restart required) + reqWorker = 3 + + # reqMonitor threads: Handle filtering of new events (restart required) + reqMonitor = 3 + + # negentropy threads: Handle negentropy protocol messages (restart required) + negentropy = 2 + } + + negentropy { + # Support negentropy protocol messages + enabled = true + + # Maximum records that sync will process before returning an error + maxSyncEvents = 1000000 + } +} diff --git a/compose/nginx/mn.conf.d/local.conf b/compose/nginx/mn.conf.d/local.conf index a9f7063..f45b779 100644 --- a/compose/nginx/mn.conf.d/local.conf +++ b/compose/nginx/mn.conf.d/local.conf @@ -95,6 +95,14 @@ server { proxy_set_header Host $host; } + location /relay { + proxy_pass http://127.0.0.1:7778; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } + location = /favicon.ico { access_log off; log_not_found off; } } diff --git a/compose/relay/Dockerfile b/compose/relay/Dockerfile new file mode 100644 index 0000000..2c4311f --- /dev/null +++ b/compose/relay/Dockerfile @@ -0,0 +1,43 @@ +FROM ubuntu:jammy +ENV TZ=Europe/London + +RUN apt update && apt install -y --no-install-recommends \ + git g++ make pkg-config libtool ca-certificates \ + libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \ + libsecp256k1-dev libzstd-dev + +# setup app +RUN git clone --branch 1.0.4 --single-branch https://github.com/hoytech/strfry /app + +WORKDIR /app + +RUN git submodule update --init +RUN make setup-golpe +RUN make clean +RUN make -j4 + +RUN apt update && apt install -y --no-install-recommends \ + liblmdb0 libflatbuffers1 libsecp256k1-0 libb2-1 libzstd1 torsocks cron\ + && rm -rf /var/lib/apt/lists/* + +RUN echo "TorAddress 127.0.0.1" >> /etc/tor/torsocks.conf +RUN echo "TorPort 9050" >> /etc/tor/torsocks.conf + +# Setting up crontab +COPY crontab /etc/cron.d/crontab +RUN chmod 0644 /etc/cron.d/crontab +RUN crontab /etc/cron.d/crontab + +# Setting up entrypoints +COPY sync_external.sh /etc/strfry/sync_external.sh +COPY sync_federation.sh /etc/strfry/sync_federation.sh +COPY entrypoint.sh /etc/strfry/entrypoint.sh + +RUN chmod +x /etc/strfry/entrypoint.sh +RUN chmod +x /etc/strfry/sync_external.sh +RUN chmod +x /etc/strfry/sync_federation.sh + +#Setting up logs +RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log + +ENTRYPOINT ["/etc/strfry/entrypoint.sh"] diff --git a/compose/relay/README.md b/compose/relay/README.md new file mode 100644 index 0000000..773586f --- /dev/null +++ b/compose/relay/README.md @@ -0,0 +1,5 @@ +## Synchronization + +To keep a healthy network, make sure your relay sinchronizes with at least 2 clearnet relays (implementing strfry). + +If they are different from other coordinators, better. diff --git a/compose/relay/crontab b/compose/relay/crontab new file mode 100644 index 0000000..407684f --- /dev/null +++ b/compose/relay/crontab @@ -0,0 +1,25 @@ +# Edit this file to introduce tasks to be run by cron. +# +# Each task to run has to be defined through a single line +# indicating with different fields when the task will be run +# and what command to run for the task +# +# To define the time you can provide concrete values for +# minute (m), hour (h), day of month (dom), month (mon), +# and day of week (dow) or use '*' in these fields (for 'any'). +# +# Notice that tasks will be started based on the cron's system +# daemon's notion of time and timezones. +# +# Output of the crontab jobs (including errors) is sent through +# email to the user the crontab file belongs to (unless redirected). +# +# For example, you can run a backup of all your user accounts +# at 5 a.m every week with: +# 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/ +# +# For more information see the manual pages of crontab(5) and cron(8) +# +# m h dom mon dow command +*/2 * * * * torsocks /etc/strfry/sync_federation.sh >> /var/log/cron.log 2>&1 +*/5 * * * * torsocks /etc/strfry/sync_external.sh >> /var/log/cron.log 2>&1 diff --git a/compose/relay/entrypoint.sh b/compose/relay/entrypoint.sh new file mode 100644 index 0000000..efb3062 --- /dev/null +++ b/compose/relay/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cron -f -l 8 & tail -f /var/log/cron.log & /app/strfry relay diff --git a/compose/relay/mn.external_urls.txt b/compose/relay/mn.external_urls.txt new file mode 100644 index 0000000..e79f29e --- /dev/null +++ b/compose/relay/mn.external_urls.txt @@ -0,0 +1,3 @@ +wss://nostr.satstralia.com +wss://relay.damus.io +wss://freelay.sovbit.host diff --git a/compose/relay/mn.federation_urls.txt b/compose/relay/mn.federation_urls.txt new file mode 100644 index 0000000..c6abcc4 --- /dev/null +++ b/compose/relay/mn.federation_urls.txt @@ -0,0 +1,4 @@ +ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/relay +ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/relay +ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/relay +ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/relay diff --git a/compose/relay/sync_external.sh b/compose/relay/sync_external.sh new file mode 100644 index 0000000..e917d00 --- /dev/null +++ b/compose/relay/sync_external.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +filters_external='{"kinds":[38383]}' +timeout_duration="15s" + +while IFS= read -r line; do + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both +done < /app/external_urls.txt diff --git a/compose/relay/sync_federation.sh b/compose/relay/sync_federation.sh new file mode 100644 index 0000000..2a8b98b --- /dev/null +++ b/compose/relay/sync_federation.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +filters_federation='{"kinds":[38383, 31986, 1059]}' +timeout_duration="15s" + +while IFS= read -r line; do + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both +done < /app/federation_urls.txt diff --git a/compose/relay/tn.external_urls.txt b/compose/relay/tn.external_urls.txt new file mode 100644 index 0000000..e79f29e --- /dev/null +++ b/compose/relay/tn.external_urls.txt @@ -0,0 +1,3 @@ +wss://nostr.satstralia.com +wss://relay.damus.io +wss://freelay.sovbit.host diff --git a/compose/relay/tn.federation_urls.txt b/compose/relay/tn.federation_urls.txt new file mode 100644 index 0000000..afe9367 --- /dev/null +++ b/compose/relay/tn.federation_urls.txt @@ -0,0 +1,4 @@ +ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/relay +ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/relay +ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/relay +ws://otmtestgbj3kqo3nre6oksusuqfb4ids5zg2y5z2qza2jogeu67stwid.onion/relay diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index cec9905..4829d2d 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y --no-install-recommends \ libsecp256k1-dev libzstd-dev # setup app -RUN git clone --branch 1.0.0 --single-branch https://github.com/hoytech/strfry /app +RUN git clone https://github.com/KoalaSat/strfry /app WORKDIR /app @@ -29,11 +29,13 @@ RUN chmod 0644 /etc/cron.d/crontab RUN crontab /etc/cron.d/crontab # Setting up entrypoints -COPY sync.sh /etc/strfry/sync.sh +COPY sync_external.sh /etc/strfry/sync_external.sh +COPY sync_federation.sh /etc/strfry/sync_federation.sh COPY entrypoint.sh /etc/strfry/entrypoint.sh RUN chmod +x /etc/strfry/entrypoint.sh -RUN chmod +x /etc/strfry/sync.sh +RUN chmod +x /etc/strfry/sync_external.sh +RUN chmod +x /etc/strfry/sync_federation.sh #Setting up logs RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log diff --git a/compose/strfry/crontab b/compose/strfry/crontab index fb04c49..407684f 100644 --- a/compose/strfry/crontab +++ b/compose/strfry/crontab @@ -21,4 +21,5 @@ # For more information see the manual pages of crontab(5) and cron(8) # # m h dom mon dow command -*/1 * * * * torsocks /etc/strfry/sync.sh >> /var/log/cron.log 2>&1 +*/2 * * * * torsocks /etc/strfry/sync_federation.sh >> /var/log/cron.log 2>&1 +*/5 * * * * torsocks /etc/strfry/sync_external.sh >> /var/log/cron.log 2>&1 diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh deleted file mode 100644 index 1258d45..0000000 --- a/compose/strfry/sync.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -filters='{"kinds":[38383, 31986, 1059]}' - -while IFS= read -r line; do - /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both -done < /app/onion_urls.txt diff --git a/compose/strfry/sync_external.sh b/compose/strfry/sync_external.sh new file mode 100644 index 0000000..b66bfe1 --- /dev/null +++ b/compose/strfry/sync_external.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +filters_external='{"kinds":[38383]}' +timeout_duration="15s" + +while IFS= read -r line; do + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both +done < /app/external_urls.txt + diff --git a/compose/strfry/sync_federation.sh b/compose/strfry/sync_federation.sh new file mode 100644 index 0000000..2a8b98b --- /dev/null +++ b/compose/strfry/sync_federation.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +filters_federation='{"kinds":[38383, 31986, 1059]}' +timeout_duration="15s" + +while IFS= read -r line; do + timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both +done < /app/federation_urls.txt From 082cb4f59b9593eab407bd0768cdbc820b3affec Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 8 May 2025 17:06:27 +0200 Subject: [PATCH 54/56] Fix docker --- compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index ba4f347..347c491 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -146,7 +146,7 @@ services: strfry: build: context: ./strfry - dockerfile: old.Dockerfile + dockerfile: Dockerfile container_name: strfry${SUFFIX} restart: always volumes: From 3b258a4c70d987c890b336542793503b92d4a934 Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 8 May 2025 17:43:04 +0200 Subject: [PATCH 55/56] Fix env-sample --- compose/env-sample/lndtn/compose.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env index 5856393..76d4805 100644 --- a/compose/env-sample/lndtn/compose.env +++ b/compose/env-sample/lndtn/compose.env @@ -33,8 +33,8 @@ STRFRY_URLS='./strfry/tn.onion_urls.txt' STRFRY_DATA='/custom_path/testnet/strfry' RELAY_CONF='./env-sample/lndtn/relay.strfry.conf' -RELAY_URLS_EXTERNAL='./strfry/tn.external_urls.txt' -RELAY_URLS_FEDERATION='./strfry/tn.federation_urls.txt' +RELAY_URLS_EXTERNAL='./relay/tn.external_urls.txt' +RELAY_URLS_FEDERATION='./relay/tn.federation_urls.txt' RELAY_DATA='/custom_path/testnet/relay' # Port and number of HTTP server workers for the robosats backend From 329dfcfed533d72de920bdfea24edb9cf25b83e1 Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 8 May 2025 17:53:57 +0200 Subject: [PATCH 56/56] Add tn conf --- compose/nginx/tn.conf.d/local.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compose/nginx/tn.conf.d/local.conf b/compose/nginx/tn.conf.d/local.conf index 6197cb0..88050f7 100644 --- a/compose/nginx/tn.conf.d/local.conf +++ b/compose/nginx/tn.conf.d/local.conf @@ -83,6 +83,14 @@ server { proxy_set_header Host $host; } + location /relay { + proxy_pass http://127.0.0.1:7778; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } + location = /favicon.ico { access_log off; log_not_found off; } }