fix #1453

docker-compose.yml

@@ -518,8 +518,7 @@ services:
       CONNECT: "localhost:8025"
     cpu_shares: "${CPU_SHARES_LOW}"
   nwc_send:
-    build:
+    image: ghcr.io/benthecarman/nostr-wallet-connect-lnd:master
-      context: ./docker/nwc
     container_name: nwc_send
     profiles:
       - wallets
@@ -529,17 +528,18 @@ services:
         condition: service_healthy
         restart: true
     volumes:
-      - ./docker/lnd/stacker:/root/.lnd
+      - ./docker/lnd/stacker:/app/.lnd
+      - nwc_send:/app
     environment:
       - RUST_LOG=info
     entrypoint:
-      - 'nostr-wallet-connect-lnd'
+      - './nostr-wallet-connect-lnd'
       - '--relay'
       - 'wss://relay.primal.net'
-      - '--admin-macaroon-file'
+      - '--macaroon-file'
-      - '/root/.lnd/regtest/admin.macaroon'
+      - '/app/.lnd/regtest/admin.macaroon'
       - '--cert-file'
-      - '/root/.lnd/tls.cert'
+      - '/app/.lnd/tls.cert'
       - '--lnd-host'
       - 'stacker_lnd'
       - '--lnd-port'
@@ -549,11 +549,10 @@ services:
       - '--daily-limit'
       - '0'
       - '--keys-file'
-      - 'admin-keys.json'
+      - 'keys-file.json'
     cpu_shares: "${CPU_SHARES_LOW}"
   nwc_recv:
-    build:
+    image: ghcr.io/benthecarman/nostr-wallet-connect-lnd:master
-      context: ./docker/nwc
     container_name: nwc_recv
     profiles:
       - wallets
@@ -563,17 +562,18 @@ services:
         condition: service_healthy
         restart: true
     volumes:
-      - ./docker/lnd/stacker:/root/.lnd
+      - ./docker/lnd/stacker:/app/.lnd
+      - nwc_recv:/app
     environment:
       - RUST_LOG=info
     entrypoint:
-      - 'nostr-wallet-connect-lnd'
+      - './nostr-wallet-connect-lnd'
       - '--relay'
       - 'wss://relay.primal.net'
       - '--invoice-macaroon-file'
-      - '/root/.lnd/regtest/invoice.macaroon'
+      - '/app/.lnd/regtest/invoice.macaroon'
       - '--cert-file'
-      - '/root/.lnd/tls.cert'
+      - '/app/.lnd/tls.cert'
       - '--lnd-host'
       - 'stacker_lnd'
       - '--lnd-port'
@@ -583,7 +583,7 @@ services:
       - '--daily-limit'
       - '0'
       - '--keys-file'
-      - 'invoice-keys.json'
+      - 'keys-file.json'
     cpu_shares: "${CPU_SHARES_LOW}"
   lnbits:
     image: lnbits/lnbits:0.12.5
@@ -614,3 +614,5 @@ volumes:
   stacker_lnd:
   stacker_cln:
   s3:
+  nwc_send:
+  nwc_recv:

docker/nwc/Dockerfile

@@ -1,16 +0,0 @@
-FROM rust:1.78
-
-ARG KEY_FILE
-
-RUN wget https://github.com/ekzyis/nostr-wallet-connect-lnd/archive/a02939c350191f8a6750a72d2456fbdf567e5848.zip \
- && unzip a02939c350191f8a6750a72d2456fbdf567e5848.zip
-
-WORKDIR nostr-wallet-connect-lnd-a02939c350191f8a6750a72d2456fbdf567e5848
-
-RUN apt-get update -y \
-  && apt-get install -y cmake \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN cargo build --release && cargo install --path .
-
-COPY . .

docker/nwc/admin-keys.json

@@ -1,5 +0,0 @@
-{
-    "server_key": "ea7b559d5b49e6d4a22f57cc84a15fd3b87742ff91a85bb871242e09e6d0b0d7",
-    "user_key": "c8f7fcb4707863ba1cc1b32c8871585ddb1eb7a555925cd2818a6caf4a21fb90",
-    "sent_info": true
-}

docker/nwc/invoice-keys.json

@@ -1,5 +0,0 @@
-{
-    "server_key": "86e7b8a53c22677066d882618f28f8e1f39e4676114c0ae019e9d86518177e49",
-    "user_key": "87e73293804edb089e0be8bf01ab2f6f219591f91998479851a7a2d1daf1a617",
-    "sent_info": true
-}

wallets/nwc/ATTACH.md

@@ -2,12 +2,14 @@ Use these NWC strings to attach the wallet
 
 * sending:
 
+run the following command:
 ```
-nostr+walletconnect://b7dcc7aca6e27ec2bc2374eef1a3ce1f975b76ea8ebc806fcbb9e4d359ced47e?relay=wss%3A%2F%2Frelay.primal.net&secret=c8f7fcb4707863ba1cc1b32c8871585ddb1eb7a555925cd2818a6caf4a21fb90
+sndev logs --since 0  nwc_send | awk '/nostr\+walletconnect/{print $3; exit}'
 ```
 
 - receiving:
 
+run the following command:
 ```
-nostr+walletconnect://ed77e8af26fee9d179443505ad7d11d5a535e1767eb3058b01673c3f56f08191?relay=wss%3A%2F%2Frelay.primal.net&secret=87e73293804edb089e0be8bf01ab2f6f219591f91998479851a7a2d1daf1a617
+sndev logs --since 0  nwc_recv | awk '/nostr\+walletconnect/{print $3; exit}'
 ```