Merge branch 'master' into payment_qr_popup

Author: m0wer

.env.development

@@ -184,6 +184,7 @@ grpc_proxy=http://tor:7050/
 
 # lnbits
 LNBITS_WEB_PORT=5001
+LNBITS_WEB_PORT_V1=5002
 
 # CPU shares for each category
 CPU_SHARES_IMPORTANT=1024

awards.csv

@@ -233,5 +233,10 @@ brymut,pr,#2171,#2164,easy,,,,100k,[email protected],2025-05-21
 SouthKoreaLN,issue,#2171,#2164,easy,,,,10k,[email protected],2025-05-21
 brymut,pr,#2175,#2173,good-first-issue,,,,20k,[email protected],2025-05-21
 sutt,pr,#2185,#2183,easy,high,,,200k,[email protected],???
-sutt,issue,#2185,#2183,easy,high,,,20k,[email protected],???
-axelvyrn,advisory,GHSA-x2xp-x867-4jfc,,,,,100k,[email protected],???
+sutt,issue,#2185,#2183,easy,high,,,20k,[email protected],2025-06-06
+axelvyrn,advisory,#2205,GHSA-x2xp-x867-4jfc,,,,,100k,[email protected],2025-06-06
+brymut,pr,#2184,#2165,easy,,,,100k,[email protected],2025-06-06
+sutt,pr,#2190,#2187,easy,,,,100k,[email protected],2025-06-06
+sutt,issue,#2190,#2187,easy,,,,10k,[email protected],2025-06-06
+sutt,pr,#2192,#2188,medium,,,,250k,[email protected],???
+sutt,issue,#2192,#2188,medium,,,,25k,[email protected],???

docker-compose.yml

@@ -356,7 +356,9 @@ services:
       ofelia.job-exec.sn_channel_cron.schedule: "@every 1m"
       ofelia.job-exec.sn_channel_cron.command: >
         su lnd -c bash -c "
-          if [ $$(lncli getinfo | jq '.num_active_channels + .num_pending_channels') -ge 3 ]; then
+          if [ $$(lncli getinfo | jq '.num_active_channels + .num_pending_channels') -ge 6 ]; then
+            exit 0
+          elif [ $$(lncli listchannels --peer=$ROUTER_LND_PUBKEY | jq '.channels | length') -ge 3 ]; then
             exit 0
           else
             lncli openchannel --node_key=$ROUTER_LND_PUBKEY --connect router_lnd:9735 --sat_per_vbyte 1 \\
@@ -809,6 +811,36 @@ services:
       CONNECT: "localhost:${LNBITS_WEB_PORT}"
       TORDIR: "/app/.tor"
     cpu_shares: "${CPU_SHARES_LOW}"
+  lnbits-v1:
+    build:
+      context: ./docker/lnbits-v1
+    container_name: lnbits-v1
+    profiles:
+      - wallets
+    restart: unless-stopped
+    ports:
+      - "${LNBITS_WEB_PORT_V1}:5000"
+    depends_on:
+      tor:
+        condition: service_healthy
+        restart: true
+      lnd:
+        condition: service_healthy
+        restart: true
+    environment:
+      - LNBITS_ADMIN_UI=true
+      - LNBITS_BACKEND_WALLET_CLASS=LndWallet
+      - LND_GRPC_ENDPOINT=lnd
+      - LND_GRPC_PORT=10009
+      - LND_GRPC_CERT=/app/.lnd/tls.cert
+      - LND_GRPC_MACAROON=/app/.lnd/data/chain/bitcoin/regtest/admin.macaroon
+    volumes:
+      - lnd:/app/.lnd
+      - tordata:/app/.tor
+    labels:
+      CONNECT: "localhost:${LNBITS_WEB_PORT_V1}"
+      TORDIR: "/app/.tor"
+    cpu_shares: "${CPU_SHARES_LOW}"
   dnsmasq:
     image: 4km3/dnsmasq:2.90-r3
     profiles:

docker/lnbits-v1/Dockerfile

@@ -0,0 +1,5 @@
+FROM lnbits/lnbits:latest
+
+
+COPY ["./data/database.sqlite3", "/app/data/database.sqlite3"]
+COPY ["./data/.super_user", "/app/data/.super_user"]

docker/lnbits-v1/data/.super_user

@@ -0,0 +1 @@
+e46288268b67457399a5fca81809573e

docker/lnbits-v1/data/database.sqlite3

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIChTCCAiugAwIBAgIRAJyfH7pGCdHWMRYTj5wZJJAwCgYIKoZIzj0EAwIwODEf
+MB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMMGUyOGU4
+ODI3NjYwMB4XDTI1MDYwNTE4MjMyNloXDTI2MDczMTE4MjMyNlowODEfMB0GA1UE
+ChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMMGUyOGU4ODI3NjYw
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPMeodXa1vyuqaqZ6IWmx+45Ev0dR
+fBF9Ivm1NqASGPiFORnpKqePUnm1ZfeMCDO+pphP0zFaXxePTSppic+ayKOCARQw
+ggEQMA4GA1UdDwEB/wQEAwICpDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBTbGJ2VCz3yZATwRePmdrGo2xdVajCBuAYDVR0R
+BIGwMIGtggwwZTI4ZTg4Mjc2NjCCCWxvY2FsaG9zdIIDbG5kghRob3N0LmRvY2tl
+ci5pbnRlcm5hbII+NzUyeGV5b2xmcHBjMnRnZ2l6ZHFhamJoeWdscG5xemtlamVj
+YmhxbHBzM254enZ0c2g3d2FtcWQub25pb26CBHVuaXiCCnVuaXhwYWNrZXSCB2J1
+ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAcwCgYIKoZIzj0EAwID
+SAAwRQIgcjYgj9aXiB9N9PfAJtqfQm+haWinftE5WvBwV+8783MCIQCrhLvC+7G4
+7sgxCrbyf//VvlI7pdjDeTS4Xg8xpvReDA==
+-----END CERTIFICATE-----

docker/lnd/router/regtest/wallet.db

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINsmkDkccjFM+Yzi2LgZsaIHc6LBFZihEnBLnte6h2f9oAoGCCqGSM49
+AwEHoUQDQgAEPMeodXa1vyuqaqZ6IWmx+45Ev0dRfBF9Ivm1NqASGPiFORnpKqeP
+Unm1ZfeMCDO+pphP0zFaXxePTSppic+ayA==
+-----END EC PRIVATE KEY-----

docker/lnd/stacker/tls.cert

@@ -38,7 +38,7 @@ export async function createInvoice (
 
   if (process.env.NODE_ENV !== 'production' && hostname.startsWith('localhost:')) {
     // to make it possible to attach LNbits for receives during local dev
-    hostname = 'lnbits:5000'
+    hostname = hostname === `localhost:${process.env.LNBITS_WEB_PORT}` ? 'lnbits:5000' : 'lnbits-v1:5000'
   }
 
   let res