diff --git a/docker-compose.yml b/docker-compose.yml index 1b6790fb..a519afac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: bitcoin: image: ruimarinho/bitcoin-core:latest - container_name: 4nk-bitcoin + container_name: bitcoin.local hostname: bitcoin.local ports: - "38333:38333" @@ -36,7 +36,7 @@ services: blindbit-oracle: image: git.4nkweb.com/4nk/blindbit-oracle:dev - container_name: 4nk-blindbit-oracle + container_name: blindbit-oracle.local hostname: blindbit-oracle.local ports: - "8000:8000" diff --git a/modules/bitcoin/conf/bitcoin.conf.exemple b/modules/bitcoin/conf/bitcoin.conf.exemple index 94e4cd1f..34cf0a8d 100644 --- a/modules/bitcoin/conf/bitcoin.conf.exemple +++ b/modules/bitcoin/conf/bitcoin.conf.exemple @@ -1,5 +1,5 @@ listen=1 -daemon=1 +daemon=0 [signet] whitelist=download@bitcoin.local diff --git a/modules/blindbit-oracle/conf/blindbit.toml.exemple b/modules/blindbit-oracle/conf/blindbit.toml.exemple index 2a4c2855..03041c0c 100644 --- a/modules/blindbit-oracle/conf/blindbit.toml.exemple +++ b/modules/blindbit-oracle/conf/blindbit.toml.exemple @@ -1,50 +1,28 @@ -# 0.0.0.0:8000 to expose outside of localhost -# default: "127.0.0.1:8000" -host="blindbit-core.4nk.local:8000" +# Configuration pour blindbit-oracle +host = "blindbit-oracle.local:8000" -# Defines on which chain the wallet runs. Allowed values: main, testnet, signet, regtest. -# default: signet -chain="signet" +# Définit la chaîne sur laquelle le wallet fonctionne +chain = "signet" -# default: http://bitcoin.4nk.local:8332 -rpc_endpoint="http://4nk-bitcoin:38332" +# Point d'accès RPC Bitcoin +rpc_endpoint = "http://bitcoin.local:38332" -# required, unless rpc_user and rpc_pass are set -# cookie_path="" +# Chemin vers le fichier cookie RPC Bitcoin +cookie_path = "/home/bitcoin/.bitcoin/signet/.cookie" -# required, unless cookie_path is set -rpc_pass="bitcoin" +# Identifiants RPC Bitcoin (non utilisés avec cookie_path) +rpc_user = "" +rpc_pass = "" -# required, unless cookie_path is set -rpc_user="bitcoin" +# Hauteur de départ pour la synchronisation +sync_start_height = 1 -# required (has to be >= 1) -sync_start_height=1 +# Paramètres de performance +max_parallel_tweak_computations = 4 +max_parallel_requests = 4 -# the default for this is 1, but should be set to a higher value to increase performance, -# one should set this in accordance to how many cores one wants to use -max_parallel_tweak_computations=4 - -# (depends on max-rpc-workers of the underlying full node) -max_parallel_requests=4 - -# optional - will only generate tweaks (still both cut-through and full-index) -# default: 0 -tweaks_only=0 - -# The base index. Only includes the tweaks. No dust filtering or cut-through possible -# default: 1 -tweaks_full_basic=1 - -# if this is set a full non-cut-through index will be created. -# This index can be used to filter for dust (?dustLimit=). If this is active the base index will not be created. -# All full index queries will be served from this with or without (?dustLimit=) set in the query. -# default 0 -tweaks_full_with_dust_filter=0 - -# This index applies cut-through and dust filtering. -# Beware that it will be stored in addition to any full index (with or without dust) if activated. -# It has more storage requirements than the simple indices. -# Currently still requires tweaks_only=0. -# default: 0 -tweaks_cut_through_with_dust_filter=0 \ No newline at end of file +# Configuration des index +tweaks_only = 0 +tweaks_full_basic = 1 +tweaks_full_with_dust_filter = 1 +tweaks_cut_through_with_dust_filter = 1 \ 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 40dbf8c8..2d2cab44 100644 --- a/modules/sdk_relay1/conf/sdk_relay1.conf.exemple +++ b/modules/sdk_relay1/conf/sdk_relay1.conf.exemple @@ -1,6 +1,9 @@ -core_url="http://4nk-bitcoin:38332" +core_url="http://bitcoin:38332" ws_url="sdk-relay1.local:8090" wallet_name="default" network="signet" -blindbit_url="http://4nk-blindbit-oracle:8000" -zmq_url="tcp://4nk-bitcoin:29000" \ No newline at end of file +blindbit_url="http://blindbit-oracle.local:8000" +zmq_url="tcp://bitcoin:29000" +storage="https://sdk-storage.local/storage" +data_dir="/home/bitcoin/.4nk" +bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file diff --git a/modules/sdk_relay2/conf/sdk_relay2.conf.exemple b/modules/sdk_relay2/conf/sdk_relay2.conf.exemple index 40dbf8c8..ea1c02dd 100644 --- a/modules/sdk_relay2/conf/sdk_relay2.conf.exemple +++ b/modules/sdk_relay2/conf/sdk_relay2.conf.exemple @@ -1,6 +1,9 @@ -core_url="http://4nk-bitcoin:38332" -ws_url="sdk-relay1.local:8090" +core_url="http://bitcoin:38332" +ws_url="sdk-relay2.local:8090" wallet_name="default" network="signet" -blindbit_url="http://4nk-blindbit-oracle:8000" -zmq_url="tcp://4nk-bitcoin:29000" \ No newline at end of file +blindbit_url="http://blindbit-oracle.local:8000" +zmq_url="tcp://bitcoin:29000" +storage="https://sdk-storage.local/storage" +data_dir="/home/bitcoin/.4nk" +bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file diff --git a/modules/sdk_relay3/conf/sdk_relay3.conf.exemple b/modules/sdk_relay3/conf/sdk_relay3.conf.exemple index 40dbf8c8..81f8b3a9 100644 --- a/modules/sdk_relay3/conf/sdk_relay3.conf.exemple +++ b/modules/sdk_relay3/conf/sdk_relay3.conf.exemple @@ -1,6 +1,9 @@ -core_url="http://4nk-bitcoin:38332" -ws_url="sdk-relay1.local:8090" +core_url="http://bitcoin:38332" +ws_url="sdk-relay3.local:8090" wallet_name="default" network="signet" -blindbit_url="http://4nk-blindbit-oracle:8000" -zmq_url="tcp://4nk-bitcoin:29000" \ No newline at end of file +blindbit_url="http://blindbit-oracle.local:8000" +zmq_url="tcp://bitcoin:29000" +storage="https://sdk-storage.local/storage" +data_dir="/home/bitcoin/.4nk" +bitcoin_data_dir="/home/bitcoin/.bitcoin" \ No newline at end of file diff --git a/modules/sdk_signer/conf/.env.exemple b/modules/sdk_signer/conf/.env.exemple index 67d262b7..85df1c5f 100644 --- a/modules/sdk_signer/conf/.env.exemple +++ b/modules/sdk_signer/conf/.env.exemple @@ -8,7 +8,7 @@ http_port = 9092 relay_urls = ["http://4nk-sdk-relay1:8091", "http://4nk-sdk-relay2:8093", "http://4nk-sdk-relay3:8095"] storage_url = "http://4nk-sdk-storage:8081" blindbit_url = "http://4nk-blindbit:8000" -bitcoin_rpc_url = "http://4nk-bitcoin:38332" +bitcoin_rpc_url = "http://bitcoin.local:38332" # Authentification Bitcoin bitcoin_rpc_user = "bitcoin" diff --git a/modules/sdk_storage/conf/sdk_storage.conf.exemple b/modules/sdk_storage/conf/sdk_storage.conf.exemple index 4d225f91..550e01d4 100644 --- a/modules/sdk_storage/conf/sdk_storage.conf.exemple +++ b/modules/sdk_storage/conf/sdk_storage.conf.exemple @@ -7,8 +7,8 @@ http_port = 8080 db_path = "/home/bitcoin/.4nk/storage.db" # URLs des services -relay_urls = ["http://4nk-sdk-relay1:8091", "http://4nk-sdk-relay2:8093", "http://4nk-sdk-relay3:8095"] -bitcoin_rpc_url = "http://4nk-bitcoin:38332" +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" diff --git a/projects/lecoffre/lecoffre-back-mini/conf/.env.exemple b/projects/lecoffre/lecoffre-back-mini/conf/.env.exemple index 790ea2d4..4cee83d7 100644 --- a/projects/lecoffre/lecoffre-back-mini/conf/.env.exemple +++ b/projects/lecoffre/lecoffre-back-mini/conf/.env.exemple @@ -1,47 +1,47 @@ # Configuration OVH -OVH_APP_KEY= -OVH_APP_SECRET= -OVH_CONSUMER_KEY= -OVH_SMS_SERVICE_NAME= +OVH_APP_KEY=5ab0709bbb65ef26 +OVH_APP_SECRET=de1fac1779d707d263a611a557cd5766 +OVH_CONSUMER_KEY=5fe817829b8a9c780cfa2354f8312ece +OVH_SMS_SERVICE_NAME=sms-tt802880-1 # Configuration SMS Factor -SMS_FACTOR_TOKEN= +SMS_FACTOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4NzgzNiIsImlhdCI6MTcwMTMzOTY1Mi45NDUzOH0.GNoqLb5MDBWuniNlQjbr1PKolwxGqBZe_tf4IMObvHw #Configuration Mailchimp -MAILCHIMP_API_KEY= -MAILCHIMP_KEY= -MAILCHIMP_LIST_ID= +MAILCHIMP_API_KEY=md-VVfaml-ApIV4nsGgaJKl0A +MAILCHIMP_KEY=3fa54304bc766dfd0b8043a827b28a3a-us17 +MAILCHIMP_LIST_ID=a48d9ad852 #Configuration Stripe -STRIPE_SECRET_KEY= +STRIPE_SECRET_KEY=sk_test_51OwKmMP5xh1u9BqSeFpqw0Yr15hHtFsh0pvRGaE0VERhlYtvw33ND1qiGA6Dy1DPmmV61B6BqIimlhuv7bwElhjF00PLQwD60n STRIPE_WEBHOOK_SECRET= -STRIPE_STANDARD_SUBSCRIPTION_PRICE_ID= -STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID= -STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID= -STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID= +STRIPE_STANDARD_SUBSCRIPTION_PRICE_ID=price_1P66fuP5xh1u9BqSHj0O6Uy3 +STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID=price_1P9NsRP5xh1u9BqSFgkUDbQY +STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID=price_1P66RqP5xh1u9BqSuUzkQNac +STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID=price_1P9NpKP5xh1u9BqSApFogvUB # Configuration serveur -APP_HOST=http://coffre-back-mini.4nk.local +APP_HOST=http://coffre-back-mini.local PORT=8080 # Configuration front-end -NEXT_PUBLIC_4NK_URL=http://ihm-client.4nk.local -NEXT_PUBLIC_FRONT_APP_HOST=http://coffre-front.4nk.local:3000 +NEXT_PUBLIC_4NK_URL=http://ihm-client.local +NEXT_PUBLIC_FRONT_APP_HOST=http://coffre-front.local:3000 NEXT_PUBLIC_IDNOT_BASE_URL=https://qual-connexion.idnot.fr NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT=/IdPOAuth2/authorize/idnot_idp_v1 -NEXT_PUBLIC_IDNOT_CLIENT_ID= +NEXT_PUBLIC_IDNOT_CLIENT_ID=4501646203F3EF67 NEXT_PUBLIC_BACK_API_PROTOCOL=http -NEXT_PUBLIC_BACK_API_HOST=coffre-back-mini.4nk.local +NEXT_PUBLIC_BACK_API_HOST=localhost BACK_API_PORT=8080 BACK_API_ROOT_URL=/api BACK_API_VERSION=/v1 # Configuration idnot IDNOT_ANNUARY_BASE_URL='https://qual-api.notaires.fr/annuaire' -IDNOT_API_KEY=' +IDNOT_API_KEY='ba557f84-0bf6-4dbf-844f-df2767555e3e' # Configuration PostgreSQL -DB_HOST=miniback-postgres.4nk.local +DB_HOST=miniback-postgres.local DB_PORT=5432 DB_NAME=miniback DB_USER=miniback diff --git a/projects/lecoffre/lecoffre-front/conf/.env.exemple b/projects/lecoffre/lecoffre-front/conf/.env.exemple index d6067881..9d1c8386 100644 --- a/projects/lecoffre/lecoffre-front/conf/.env.exemple +++ b/projects/lecoffre/lecoffre-front/conf/.env.exemple @@ -1,10 +1,10 @@ -NEXT_PUBLIC_4NK_URL="http://ihm-client.4nk.local:3003" -NEXT_PUBLIC_FRONT_APP_HOST="http://coffre-front.4nk.local:3000" +NEXT_PUBLIC_4NK_URL="http://ihm-client.local:3003" +NEXT_PUBLIC_FRONT_APP_HOST="http://coffre-front.local:3000" NEXT_PUBLIC_IDNOT_BASE_URL="https://qual-connexion.idnot.fr" NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT="/IdPOAuth2/authorize/idnot_idp_v1" -NEXT_PUBLIC_IDNOT_CLIENT_ID="" +NEXT_PUBLIC_IDNOT_CLIENT_ID="4501646203F3EF67" NEXT_PUBLIC_BACK_API_PROTOCOL=http:// -NEXT_PUBLIC_BACK_API_HOST=coffre-front.4nk.local +NEXT_PUBLIC_BACK_API_HOST=localhost NEXT_PUBLIC_BACK_API_PORT=8080 NEXT_PUBLIC_BACK_API_ROOT_URL=/api NEXT_PUBLIC_BACK_API_VERSION=/v1 \ No newline at end of file