Merge branch 'dev' of https://git.4nkweb.com/4nk/lecoffre_node into dev

bitcoin/bitcoin.conf

@@ -1,13 +1,18 @@
 # Configuration globale
-datadir=/home/bitcoin/.bitcoin
+signet=1
 server=1
+datadir=/home/bitcoin/.bitcoin
+
+[signet]
+daemon=0
 txindex=1
+upnp=1
 #debug=1
 #loglevel=debug
 logthreadnames=1
-signet=1
 onion=tor:9050
 listenonion=1
+onlynet=onion
 
 # Paramètres RPC
 rpcauth=bitcoin:c8ea921c7357bd6a5a8a7c43a12350a7$955e25b17672987b17c5a12f12cd8b9c1d38f0f86201c8cd47fc431f2e1c7956
@@ -18,9 +23,8 @@ rpcdoccheck=1
 
 # Paramètres ZMQ
 zmqpubhashblock=tcp://0.0.0.0:29000
-zmqpubrawtx=tcp://0.0.0.0:29000
+zmqpubrawtx=tcp://0.0.0.0:29001
 
-[signet]
 listen=1
 bind=0.0.0.0:38333
 rpcbind=0.0.0.0:38332
@@ -38,4 +42,4 @@ wallet=watchonly
 maxtxfee=1
 addnode=tlv2yqamflv22vfdzy2hha2nwmt6zrwrhjjzz4lx7qyq7lyc6wfhabyd.onion
 addnode=6xi33lwwslsx3yi3f7c56wnqtdx4v73vj2up3prrwebpwbz6qisnqbyd.onion
-addnode=id7e3r3d2epen2v65jebjhmx77aimu7oyhcg45zadafypr4crqsytfid.onion
+addnode=id7e3r3d2epen2v65jebjhmx77aimu7oyhcg45zadafypr4crqsytfid.onion

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   tor:
-    image: dperson/torproxy
+    image: btcpayserver/tor:0.4.8.10
     container_name: tor-proxy
     networks:
       btcnet:
@@ -49,13 +49,19 @@ services:
       btcnet:
         aliases:
           - blindbit
+    healthcheck:
+      test: ["CMD-SHELL", "code=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:8000); [ \"$code\" != \"000\" ]"]
+      interval: 15s
+      timeout: 5s
+      retries: 10
     restart: unless-stopped
 
   sdk_relay:
     image: git.4nkweb.com/4nk/sdk_relay:dev
     container_name: sdk_relay
     depends_on:
-      - blindbit
+      blindbit:
+        condition: service_healthy
     volumes:
       - ./relay/sdk_relay.conf:/home/bitcoin/.conf:ro
       - sdk_data:/home/bitcoin/.4nk
@@ -75,7 +81,14 @@ services:
       - HOME=/home/bitcoin
       - RUST_LOG=DEBUG
     entrypoint: >
-      /bin/sh -lc "mkdir -p /home/bitcoin/.4nk/logs && exec /usr/local/bin/sdk_relay --config /home/bitcoin/.conf 2>&1 | tee -a /home/bitcoin/.4nk/logs/sdk_relay.log"
+      /bin/sh -lc '
+        echo "[relay] waiting for blindbit:8000...";
+        until [ "$(curl -s -o /dev/null -w "%{http_code}" http://blindbit:8000)" != "000" ]; do sleep 2; done
+        echo "[relay] waiting for bitcoind RPC 38332...";
+        until [ "$(curl -s -o /dev/null -w "%{http_code}" http://bitcoin:38332)" != "000" ]; do sleep 2; done
+        mkdir -p /home/bitcoin/.4nk/logs
+        exec /usr/local/bin/sdk_relay --config /home/bitcoin/.conf 2>&1 | tee -a /home/bitcoin/.4nk/logs/sdk_relay.log
+      '
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8090/health"]
       interval: 30s
@@ -116,6 +129,8 @@ services:
   ihm_client:
     image: git.4nkweb.com/4nk/ihm_client:dev
     container_name: ihm_client
+    env_file:
+      - .env
     ports:
       - "3003:3003"
     networks:
@@ -126,21 +141,6 @@ services:
       - "com.centurylinklabs.watchtower.enable=true"
     restart: unless-stopped
 
-  sdk_signer:
-    image: git.4nkweb.com/4nk/sdk_signer:dev
-    container_name: sdk_signer
-    env_file:
-      - .env
-    ports:
-      - "9090:9090"
-    networks:
-      btcnet:
-        aliases:
-          - sdk_signer
-    labels:
-      - "com.centurylinklabs.watchtower.enable=true"
-    restart: unless-stopped
-
   sdk_storage:
     image: git.4nkweb.com/4nk/sdk_storage:dev
     container_name: sdk_storage
@@ -185,4 +185,4 @@ networks:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.20.0.0/16
+        - subnet: 172.20.0.0/16