diff --git a/conf/dnsmasq/dnsmasq.conf.exemple b/conf/dnsmasq/dnsmasq.conf.exemple index 010db38c..2ec1bf57 100644 --- a/conf/dnsmasq/dnsmasq.conf.exemple +++ b/conf/dnsmasq/dnsmasq.conf.exemple @@ -15,6 +15,5 @@ address=/sdk-relay2.local/172.20.0.15 address=/sdk-relay3.local/172.20.0.16 address=/sdk-signer.local/172.20.0.17 address=/ihm-client.local/172.20.0.18 -address=/miniback-postgres.local/172.20.0.30 address=/coffre-front.local/172.20.0.32 address=/coffre-back-mini.local/172.20.0.33 diff --git a/docker-compose.yml b/docker-compose.yml index a519afac..362fd217 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,9 @@ version: '3.8' # Updated to use newer Go-based images for builds; placeholder for future dynamic tag adjustments services: - tor: + tor.local: image: dperson/torproxy:latest - container_name: 4nk-tor + container_name: tor.local hostname: tor.local ports: - "9050:9050" @@ -15,12 +15,11 @@ services: ipv4_address: 172.20.0.10 restart: unless-stopped - bitcoin: + bitcoin.local: image: ruimarinho/bitcoin-core:latest container_name: bitcoin.local hostname: bitcoin.local ports: - - "38333:38333" - "38332:38332" - "29000:29000" volumes: @@ -32,9 +31,9 @@ services: ipv4_address: 172.20.0.11 restart: unless-stopped depends_on: - - tor + - tor.local - blindbit-oracle: + blindbit-oracle.local: image: git.4nkweb.com/4nk/blindbit-oracle:dev container_name: blindbit-oracle.local hostname: blindbit-oracle.local @@ -42,8 +41,12 @@ services: - "8000:8000" environment: - - HOST=0.0.0.0:8000 - - CHAIN=signet + - HOST=blindbit-oracle.local:8000 + - CHAIN="signet" + - RPC_ENDPOINT="http://bitcoin.local:38332" + - COOKIE_PATH="/home/bitcoin/.bitcoin/signet/.cookie" + - RPC_USER="" + - RPC_PASS="" - SYNC_START_HEIGHT=1 - MAX_PARALLEL_TWEAK_COMPUTATIONS=4 - MAX_PARALLEL_REQUESTS=4 @@ -51,6 +54,19 @@ services: - TWEAKS_FULL_BASIC=1 - TWEAKS_FULL_WITH_DUST_FILTER=1 - TWEAKS_CUT_THROUGH_WITH_DUST_FILTER=1 + - host="blindbit-oracle.local:8000" + - chain="signet" + - rpc_endpoint="http://bitcoin.local:38332" + - cookie_path="/home/bitcoin/.bitcoin/signet/.cookie" + - rpc_user="" + - rpc_pass="" + - sync_start_height=1 + - max_parallel_tweak_computations=4 + - max_parallel_requests=4 + - tweaks_only=0 + - tweaks_full_basic=1 + - tweaks_full_with_dust_filter=1 + - tweaks_cut_through_with_dust_filter=1 command: [ "/main", "--datadir", "/blindbit-oracle" ] working_dir: / volumes: @@ -62,7 +78,7 @@ services: ipv4_address: 172.20.0.12 restart: unless-stopped depends_on: - - bitcoin + - bitcoin.local healthcheck: test: [ "CMD", "wget", "--quiet", "--tries=1", "--timeout=5", "--spider", "http://localhost:8000" ] interval: 30s @@ -70,9 +86,9 @@ services: retries: 3 start_period: 40s - sdk_storage: + sdk_storage.local: image: git.4nkweb.com/4nk/sdk_storage:dev - container_name: 4nk-sdk-storage + container_name: sdk-storage.local hostname: sdk-storage.local ports: - "8081:8080" @@ -90,16 +106,20 @@ services: retries: 3 start_period: 40s - sdk_relay1: + sdk_relay1.local: image: git.4nkweb.com/4nk/sdk_relay:dev - container_name: 4nk-sdk-relay1 + container_name: sdk-relay1.local hostname: sdk-relay1.local ports: - "8090:8090" - "8091:8091" environment: - - RELAY_RPC_USER=bitcoin - - RELAY_RPC_PASSWORD=bitcoin + - RELAY_RPC_USER="" + - RELAY_RPC_PASSWORD="" + - COOKIE_PATH="/home/bitcoin/.bitcoin/signet/.cookie" + - relay_rpc_user="" + - relay_rpc_password="" + - cookie_path="/home/bitcoin/.bitcoin/signet/.cookie" volumes: - ./modules/sdk_relay1/conf/sdk_relay1.conf:/home/bitcoin/.conf:ro - ./modules/sdk_relay1/logs:/home/bitcoin/logs @@ -109,7 +129,7 @@ services: ipv4_address: 172.20.0.14 restart: unless-stopped depends_on: - - blindbit-oracle + - blindbit-oracle.local healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:8090/health" ] interval: 30s @@ -117,16 +137,20 @@ services: retries: 3 start_period: 40s - sdk_relay2: + sdk_relay2.local: image: git.4nkweb.com/4nk/sdk_relay:dev - container_name: 4nk-sdk-relay2 + container_name: sdk-relay2.local hostname: sdk-relay2.local ports: - "8092:8090" - "8093:8091" environment: - - RELAY_RPC_USER=bitcoin - - RELAY_RPC_PASSWORD=bitcoin + - RELAY_RPC_USER="" + - RELAY_RPC_PASSWORD="" + - COOKIE_PATH="/home/bitcoin/.bitcoin/signet/.cookie" + - relay_rpc_user="" + - relay_rpc_password="" + - cookie_path="/home/bitcoin/.bitcoin/signet/.cookie" volumes: - ./modules/sdk_relay2/conf/sdk_relay2.conf:/home/bitcoin/.conf:ro - ./modules/sdk_relay2/logs:/home/bitcoin/logs @@ -136,7 +160,7 @@ services: ipv4_address: 172.20.0.15 restart: unless-stopped depends_on: - - blindbit-oracle + - blindbit-oracle.local healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:8090/health" ] interval: 30s @@ -144,16 +168,20 @@ services: retries: 3 start_period: 40s - sdk_relay3: + sdk_relay3.local: image: git.4nkweb.com/4nk/sdk_relay:dev - container_name: 4nk-sdk-relay3 + container_name: sdk-relay3.local hostname: sdk-relay3.local ports: - "8094:8090" - "8095:8091" environment: - - RELAY_RPC_USER=bitcoin - - RELAY_RPC_PASSWORD=bitcoin + - RELAY_RPC_USER="" + - RELAY_RPC_PASSWORD="" + - COOKIE_PATH="/home/bitcoin/.bitcoin/signet/.cookie" + - relay_rpc_user="" + - relay_rpc_password="" + - cookie_path="/home/bitcoin/.bitcoin/signet/.cookie" volumes: - ./modules/sdk_relay3/conf/sdk_relay3.conf:/home/bitcoin/.conf:ro - ./modules/sdk_relay3/logs:/home/bitcoin/logs @@ -163,7 +191,7 @@ services: ipv4_address: 172.20.0.16 restart: unless-stopped depends_on: - - blindbit-oracle + - blindbit-oracle.local healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:8090/health" ] interval: 30s @@ -171,9 +199,9 @@ services: retries: 3 start_period: 40s - sdk_signer: + sdk_signer.local: image: git.4nkweb.com/4nk/sdk_signer:dev - container_name: 4nk-sdk-signer + container_name: sdk-signer.local hostname: sdk-signer.local ports: - "9090:9090" @@ -186,10 +214,10 @@ services: ipv4_address: 172.20.0.17 restart: unless-stopped depends_on: - - sdk_storage - - sdk_relay1 - - sdk_relay2 - - sdk_relay3 + - sdk_storage.local + - sdk_relay1.local + - sdk_relay2.local + - sdk_relay3.local healthcheck: test: [ "CMD", "wget", "--quiet", "--tries=1", "--timeout=5", "--spider", "http://localhost:9090" ] interval: 30s @@ -197,9 +225,9 @@ services: retries: 3 start_period: 40s - ihm_client: + ihm_client.local: image: git.4nkweb.com/4nk/ihm_client:dev - container_name: 4nk-ihm-client + container_name: ihm-client.local hostname: ihm-client.local ports: - "8080:80" @@ -211,10 +239,10 @@ services: ipv4_address: 172.20.0.18 restart: unless-stopped depends_on: - - sdk_storage - - sdk_relay1 - - sdk_relay2 - - sdk_relay3 + - sdk_storage.local + - sdk_relay1.local + - sdk_relay2.local + - sdk_relay3.local healthcheck: test: [ "CMD", "wget", "--quiet", "--tries=1", "--timeout=5", "--spider", "http://localhost" ] interval: 30s @@ -222,26 +250,11 @@ services: retries: 3 start_period: 40s - miniback-postgres: - image: postgres:16 - container_name: miniback-postgres - hostname: miniback-postgres.local - environment: - - POSTGRES_USER=miniback - - POSTGRES_PASSWORD=minibackpassword - - POSTGRES_DB=miniback - volumes: - - miniback_pg_data:/var/lib/postgresql/data - networks: - 4nk_network: - ipv4_address: 172.20.0.30 - restart: unless-stopped - ports: - - "5432:5432" - coffre_front: + + coffre-front.local: image: git.4nkweb.com/4nk/lecoffre-front:dev - container_name: coffre-front + container_name: coffre-front.local hostname: coffre-front.local volumes: - ./projects/lecoffre/lecoffre-front/logs:/logs @@ -250,24 +263,20 @@ services: ipv4_address: 172.20.0.32 restart: unless-stopped depends_on: - - coffre_back_mini - - ihm_client - - sdk_signer + - coffre-back-mini.local + - ihm_client.local + - sdk_signer.local - coffre_back_mini: + coffre-back-mini.local: image: git.4nkweb.com/4nk/lecoffre-back-mini:dev - container_name: coffre-back-mini + container_name: coffre-back-mini.local hostname: coffre-back-mini.local networks: 4nk_network: ipv4_address: 172.20.0.33 restart: unless-stopped - depends_on: - - miniback-postgres volumes: - miniback_pg_data: - networks: 4nk_network: diff --git a/docs/BITCOIN_TROUBLESHOOTING.md b/docs/BITCOIN_TROUBLESHOOTING.md index 06db9de7..92f9564c 100644 --- a/docs/BITCOIN_TROUBLESHOOTING.md +++ b/docs/BITCOIN_TROUBLESHOOTING.md @@ -140,6 +140,6 @@ ls -la modules/bitcoin/data/ --- -**Date de création** : 2025-09-10 -**Dernière mise à jour** : 2025-09-10 +**Date de création** : 2025-09-10 +**Dernière mise à jour** : 2025-09-10 **Statut** : En cours de diagnostic diff --git a/modules/bitcoin/conf/bitcoin.conf b/modules/bitcoin/conf/bitcoin.conf index a57cff41..d9e0ce4d 100644 --- a/modules/bitcoin/conf/bitcoin.conf +++ b/modules/bitcoin/conf/bitcoin.conf @@ -23,8 +23,8 @@ zmqpubrawtx=tcp://bitcoin.local:29000 [signet] listen=1 bind=bitcoin.local:38333 -rpcbind=bitcoin.local:18443 -rpcport=18443 +rpcbind=bitcoin.local:38332 +rpcport=38332 fallbackfee=0.0001 blockfilterindex=1 datacarriersize=205 diff --git a/modules/bitcoin/conf/bitcoin.conf.exemple b/modules/bitcoin/conf/bitcoin.conf.exemple index a57cff41..d9e0ce4d 100644 --- a/modules/bitcoin/conf/bitcoin.conf.exemple +++ b/modules/bitcoin/conf/bitcoin.conf.exemple @@ -23,8 +23,8 @@ zmqpubrawtx=tcp://bitcoin.local:29000 [signet] listen=1 bind=bitcoin.local:38333 -rpcbind=bitcoin.local:18443 -rpcport=18443 +rpcbind=bitcoin.local:38332 +rpcport=38332 fallbackfee=0.0001 blockfilterindex=1 datacarriersize=205 diff --git a/modules/ihm_client/conf/.env.exemple b/modules/ihm_client/conf/.env.exemple index 013d3805..14b846a7 100644 --- a/modules/ihm_client/conf/.env.exemple +++ b/modules/ihm_client/conf/.env.exemple @@ -1,16 +1,16 @@ [PROD] U32_MAX=4294967295 -BASEURL="http://ihm-client.4nk.local" -BOOTSTRAPURL=["http://sdk-relay1.4nk.local:8090"] -STORAGEURL="http://sdk-storage.4nk.local/storage" -BLINDBITURL="http://blindbit.4nk.local:8000" +BASEURL="http://ihm-client.local" +BOOTSTRAPURL=["http://sdk-relay1.local:8090"] +STORAGEURL="http://sdk-storage.local/storage" +BLINDBITURL="http://blindbit.local:8000" DEFAULTAMOUNT=1000 [DEV] U32_MAX=4294967295 -BASEURL="http://ihm-client.4nk.local" -BOOTSTRAPURL=["http://sdk-relay1.4nk.local:8090"] -STORAGEURL="http://sdk-storage.4nk.local/storage" -BLINDBITURL="http://blindbit.4nk.local:8000" +BASEURL="http://ihm-client.local" +BOOTSTRAPURL=["http://sdk-relay1.local:8090"] +STORAGEURL="http://sdk-storage.local/storage" +BLINDBITURL="http://blindbit.local:8000" DEFAULTAMOUNT=1000 \ No newline at end of file diff --git a/modules/sdk_relay1/conf/sdk_relay1.conf.exemple b/modules/sdk_relay1/conf/sdk_relay1.conf.exemple index 2d2cab44..2902c07b 100644 --- a/modules/sdk_relay1/conf/sdk_relay1.conf.exemple +++ b/modules/sdk_relay1/conf/sdk_relay1.conf.exemple @@ -1,9 +1,9 @@ -core_url="http://bitcoin:38332" +core_url="http://bitcoin.local:38332" ws_url="sdk-relay1.local:8090" wallet_name="default" network="signet" blindbit_url="http://blindbit-oracle.local:8000" -zmq_url="tcp://bitcoin:29000" +zmq_url="tcp://bitcoin.local:29000" storage="https://sdk-storage.local/storage" data_dir="/home/bitcoin/.4nk" -bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file +bitcoin_data_dir="/home/bitcoin/.bitcoin" diff --git a/modules/sdk_relay2/conf/sdk_relay2.conf.exemple b/modules/sdk_relay2/conf/sdk_relay2.conf.exemple index ea1c02dd..8d5cb13e 100644 --- a/modules/sdk_relay2/conf/sdk_relay2.conf.exemple +++ b/modules/sdk_relay2/conf/sdk_relay2.conf.exemple @@ -1,9 +1,9 @@ -core_url="http://bitcoin:38332" +core_url="http://bitcoin.local:38332" ws_url="sdk-relay2.local:8090" wallet_name="default" network="signet" blindbit_url="http://blindbit-oracle.local:8000" -zmq_url="tcp://bitcoin:29000" +zmq_url="tcp://bitcoin.local:29000" storage="https://sdk-storage.local/storage" data_dir="/home/bitcoin/.4nk" -bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file +bitcoin_data_dir="/home/bitcoin/.bitcoin" diff --git a/modules/sdk_relay3/conf/sdk_relay3.conf.exemple b/modules/sdk_relay3/conf/sdk_relay3.conf.exemple index 81f8b3a9..5e041773 100644 --- a/modules/sdk_relay3/conf/sdk_relay3.conf.exemple +++ b/modules/sdk_relay3/conf/sdk_relay3.conf.exemple @@ -1,9 +1,9 @@ -core_url="http://bitcoin:38332" +core_url="http://bitcoin.local:38332" ws_url="sdk-relay3.local:8090" wallet_name="default" network="signet" blindbit_url="http://blindbit-oracle.local:8000" -zmq_url="tcp://bitcoin:29000" +zmq_url="tcp://bitcoin.local:29000" storage="https://sdk-storage.local/storage" data_dir="/home/bitcoin/.4nk" -bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file +bitcoin_data_dir="/home/bitcoin/.bitcoin" diff --git a/modules/sdk_signer/conf/.env.exemple b/modules/sdk_signer/conf/.env.exemple index ad113073..51bb0692 100644 --- a/modules/sdk_signer/conf/.env.exemple +++ b/modules/sdk_signer/conf/.env.exemple @@ -13,6 +13,8 @@ bitcoin_rpc_url = "http://bitcoin.local:38332" # Authentification Bitcoin bitcoin_rpc_user = "bitcoin" bitcoin_rpc_password = "bitcoin" +data_dir="/home/bitcoin/.4nk" +bitcoin_data_dir="/home/bitcoin/.bitcoin" # Mode développement dev_mode = true diff --git a/modules/sdk_signer/data/CURRENT b/modules/sdk_signer/data/CURRENT index 951d7de3..6b017c6f 100644 --- a/modules/sdk_signer/data/CURRENT +++ b/modules/sdk_signer/data/CURRENT @@ -1 +1 @@ -MANIFEST-000517 +MANIFEST-000791 diff --git a/modules/sdk_signer/data/LOG b/modules/sdk_signer/data/LOG index 4c08a6fc..f90f7df8 100644 --- a/modules/sdk_signer/data/LOG +++ b/modules/sdk_signer/data/LOG @@ -1,3 +1,3 @@ -2025/09/10-16:33:07.003716 7fdbf603cb38 Recovering log #516 -2025/09/10-16:33:07.019125 7fdbf603cb38 Delete type=0 #516 -2025/09/10-16:33:07.019162 7fdbf603cb38 Delete type=3 #515 +2025/09/11-07:35:29.765658 7f32ae08cb38 Recovering log #790 +2025/09/11-07:35:29.783093 7f32ae08cb38 Delete type=3 #789 +2025/09/11-07:35:29.783159 7f32ae08cb38 Delete type=0 #790 diff --git a/modules/sdk_signer/data/LOG.old b/modules/sdk_signer/data/LOG.old index 5052fe45..6161e147 100644 --- a/modules/sdk_signer/data/LOG.old +++ b/modules/sdk_signer/data/LOG.old @@ -1,3 +1,3 @@ -2025/09/10-16:32:35.916719 7f0ece79cb38 Recovering log #514 -2025/09/10-16:32:35.932279 7f0ece79cb38 Delete type=0 #514 -2025/09/10-16:32:35.932310 7f0ece79cb38 Delete type=3 #513 +2025/09/11-07:34:58.695441 7eff68c3fb38 Recovering log #788 +2025/09/11-07:34:58.713050 7eff68c3fb38 Delete type=0 #788 +2025/09/11-07:34:58.713099 7eff68c3fb38 Delete type=3 #787 diff --git a/modules/sdk_signer/data/MANIFEST-000517 b/modules/sdk_signer/data/MANIFEST-000791 similarity index 57% rename from modules/sdk_signer/data/MANIFEST-000517 rename to modules/sdk_signer/data/MANIFEST-000791 index 9e916531..6b1c8e1c 100644 Binary files a/modules/sdk_signer/data/MANIFEST-000517 and b/modules/sdk_signer/data/MANIFEST-000791 differ diff --git a/modules/sdk_storage/conf/.gitkeep b/modules/sdk_storage/conf/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/modules/sdk_storage/conf/sdk_storage.conf.exemple b/modules/sdk_storage/conf/sdk_storage.conf.exemple deleted file mode 100644 index 550e01d4..00000000 --- a/modules/sdk_storage/conf/sdk_storage.conf.exemple +++ /dev/null @@ -1,33 +0,0 @@ -# Configuration sdk_storage - Module 4NK_node - -# Port d'écoute -http_port = 8080 - -# Base de données -db_path = "/home/bitcoin/.4nk/storage.db" - -# URLs des services -relay_urls = ["http://sdk-relay1.local:8091", "http://sdk-relay2.local:8093", "http://4nk-sdk-relay3:8095"] -bitcoin_rpc_url = "http://bitcoin.local:38332" -bitcoin_rpc_user = "bitcoin" -bitcoin_rpc_password = "bitcoin" - -# Mode développement -dev_mode = true -debug_level = "info" - -# Limites de connexions -max_connections = 100 -timeout = 30 - -# Logging -log_level = "info" -log_file = "/home/bitcoin/logs/sdk_storage.log" - -# Stockage de fichiers -file_storage_path = "/home/bitcoin/.4nk/files" -max_file_size = "100MB" - -# Sécurité -enable_tls = false -enable_auth = false diff --git a/tests/connectivity/check_http_endpoints.sh b/tests/connectivity/check_http_endpoints.sh index 42506967..7318e1d4 100755 --- a/tests/connectivity/check_http_endpoints.sh +++ b/tests/connectivity/check_http_endpoints.sh @@ -26,6 +26,7 @@ for h in "${hostnames[@]}"; do done declare -A ports=( + [bitcoin.local]=38332 [blindbit-oracle.local]=8000 [sdk-storage.local]=8080 [sdk-relay1.local]=8090