diff --git a/README.md b/README.md index e51af55e6..cf6df21ca 100644 --- a/README.md +++ b/README.md @@ -96,18 +96,18 @@ JSON: docker-compose overrides:: ``` - MEMPOOL_BACKEND_NETWORK: "" + MEMPOOL_NETWORK: "" MEMPOOL_BACKEND: "" - BACKEND_MAINNET_HTTP_PORT: "" + MEMPOOL_HTTP_PORT: "" MEMPOOL_SPAWN_CLUSTER_PROCS: "" MEMPOOL_API_URL_PREFIX: "" MEMPOOL_POLL_RATE_MS: "" - CACHE_DIR: "" + MEMPOOL_CACHE_DIR: "" MEMPOOL_CLEAR_PROTECTION_MINUTES: "" MEMPOOL_RECOMMENDED_FEE_PERCENTILE: "" MEMPOOL_BLOCK_WEIGHT_UNITS: "" MEMPOOL_INITIAL_BLOCKS_AMOUNT: "" - MEMPOOL_BLOCKS_AMOUNT: "" + MEMPOOL_MEMPOOL_BLOCKS_AMOUNT: "" MEMPOOL_PRICE_FEED_UPDATE_INTERVAL: "" MEMPOOL_USE_SECOND_NODE_FOR_MINFEE: "" MEMPOOL_EXTERNAL_ASSETS: "" @@ -124,10 +124,10 @@ JSON: ``` docker-compose overrides: ``` - RPC_HOST: "" - RPC_PORT: "" - RPC_USER: "" - RPC_PASS: "" + CORE_RPC_HOST: "" + CORE_RPC_PORT: "" + CORE_RPC_USERNAME: "" + CORE_RPC_PASSWORD: "" ``` JSON: @@ -171,8 +171,8 @@ docker-compose overrides: ``` SECOND_RPC_HOST: "" SECOND_RPC_PORT: "" - SECOND_RPC_USER: "" - SECOND_RPC_PASS: "" + SECOND_RPC_USERNAME: "" + SECOND_RPC_PASSWORD: "" ``` JSON: @@ -189,12 +189,12 @@ JSON: docker-compose overrides: ``` - MYSQL_ENABLED: "" - MYSQL_HOST: "" - MYSQL_PORT: "" - MYSQL_DATABASE: "" - MYSQL_USER: "" - MYSQL_PASS: "" + DATABASE_ENABLED: "" + DATABASE_HOST: "" + DATABASE_PORT: "" + DATABASE_DATABASE: "" + DATABASE_USERAME: "" + DATABASE_PASSWORD: "" ``` JSON: diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 4ae23123e..00dc31aad 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -1,48 +1,48 @@ { "MEMPOOL": { - "NETWORK": "__MEMPOOL_BACKEND_NETWORK__", + "NETWORK": "__MEMPOOL_NETWORK__", "BACKEND": "__MEMPOOL_BACKEND__", - "HTTP_PORT": __MEMPOOL_BACKEND_MAINNET_HTTP_PORT__, + "HTTP_PORT": __MEMPOOL_HTTP_PORT__, "SPAWN_CLUSTER_PROCS": __MEMPOOL_SPAWN_CLUSTER_PROCS__, "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__", "POLL_RATE_MS": __MEMPOOL_POLL_RATE_MS__, - "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__", - "CLEAR_PROTECTION_MINUTES": __MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__, + "CACHE_DIR": "__MEMPOOL_CACHE_DIR__", + "CLEAR_PROTECTION_MINUTES": __MEMPOOL_CLEAR_PROTECTION_MINUTES__, "RECOMMENDED_FEE_PERCENTILE": __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__, "BLOCK_WEIGHT_UNITS": __MEMPOOL_BLOCK_WEIGHT_UNITS__, "INITIAL_BLOCKS_AMOUNT": __MEMPOOL_INITIAL_BLOCKS_AMOUNT__, - "MEMPOOL_BLOCKS_AMOUNT": __MEMPOOL_BLOCKS_AMOUNT__, + "MEMPOOL_BLOCKS_AMOUNT": __MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__, "PRICE_FEED_UPDATE_INTERVAL": __MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__, "USE_SECOND_NODE_FOR_MINFEE": __MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__, "EXTERNAL_ASSETS": __MEMPOOL_EXTERNAL_ASSETS__ }, "CORE_RPC": { - "HOST": "__BITCOIN_MAINNET_RPC_HOST__", - "PORT": __BITCOIN_MAINNET_RPC_PORT__, - "USERNAME": "__BITCOIN_MAINNET_RPC_USER__", - "PASSWORD": "__BITCOIN_MAINNET_RPC_PASS__" + "HOST": "__CORE_RPC_HOST__", + "PORT": __CORE_RPC_PORT__, + "USERNAME": "__CORE_RPC_USERNAME__", + "PASSWORD": "__CORE_RPC_PASSWORD__" }, "ELECTRUM": { - "HOST": "__ELECTRUM_MAINNET_HTTP_HOST__", - "PORT": __ELECTRUM_MAINNET_HTTP_PORT__, - "TLS_ENABLED": __ELECTRUM_MAINNET_TLS_ENABLED__ + "HOST": "__ELECTRUM_HOST__", + "PORT": __ELECTRUM_PORT__, + "TLS_ENABLED": __ELECTRUM_TLS_ENABLED__ }, "ESPLORA": { "REST_API_URL": "__ESPLORA_REST_API_URL__" }, "SECOND_CORE_RPC": { - "HOST": "__SECOND_RPC_HOST__", - "PORT": __SECOND_RPC_PORT__, - "USERNAME": "__SECOND_RPC_USER__", - "PASSWORD": "__SECOND_RPC_PASS__" + "HOST": "__SECOND_CORE_RPC_HOST__", + "PORT": __SECOND_CORE_RPC_PORT__, + "USERNAME": "__SECOND_CORE_RPC_USERNAME__", + "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__" }, "DATABASE": { - "ENABLED": __MYSQL_ENABLED__, - "HOST": "__MYSQL_HOST__", - "PORT": __MYSQL_PORT__, - "DATABASE": "__MYSQL_DATABASE__", - "USERNAME": "__MYSQL_USERNAME__", - "PASSWORD": "__MYSQL_PASSWORD__" + "ENABLED": __DATABASE_ENABLED__, + "HOST": "__DATABASE_HOST__", + "PORT": __DATABASE_PORT__, + "DATABASE": "__DATABASE_DATABASE__", + "USERNAME": "__DATABASE_USERNAME__", + "PASSWORD": "__DATABASE_PASSWORD__" }, "SYSLOG": { "ENABLED": __SYSLOG_ENABLED__, diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 0c5ae8461..73556ee20 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -1,32 +1,32 @@ #!/bin/sh # MEMPOOL -__MEMPOOL_BACKEND_NETWORK__=${MEMPOOL_BACKEND_NETWORK:=mainnet} +__MEMPOOL_NETWORK__=${MEMPOOL_NETWORK:=mainnet} __MEMPOOL_BACKEND__=${MEMPOOL_BACKEND:=electrum} -__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT:=8999} +__MEMPOOL_HTTP_PORT__=${BACKEND_HTTP_PORT:=8999} __MEMPOOL_SPAWN_CLUSTER_PROCS__=${MEMPOOL_SPAWN_CLUSTER_PROCS:=0} __MEMPOOL_API_URL_PREFIX__=${MEMPOOL_API_URL_PREFIX:=/api/v1/} __MEMPOOL_POLL_RATE_MS__=${MEMPOOL_POLL_RATE_MS:=2000} -__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./cache} -__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20} +__MEMPOOL_CACHE_DIR__=${MEMPOOL_CACHE_DIR:=./cache} +__MEMPOOL_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20} __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__=${MEMPOOL_RECOMMENDED_FEE_PERCENTILE:=50} __MEMPOOL_BLOCK_WEIGHT_UNITS__=${MEMPOOL_BLOCK_WEIGHT_UNITS:=4000000} __MEMPOOL_INITIAL_BLOCKS_AMOUNT__=${MEMPOOL_INITIAL_BLOCKS_AMOUNT:=8} -__MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_BLOCKS_AMOUNT:=8} +__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_MEMPOOL_BLOCKS_AMOUNT:=8} __MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__=${MEMPOOL_PRICE_FEED_UPDATE_INTERVAL:=3600} __MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__=${MEMPOOL_USE_SECOND_NODE_FOR_MINFEE:=false} __MEMPOOL_EXTERNAL_ASSETS__=${MEMPOOL_EXTERNAL_ASSETS:=[]} # CORE_RPC -__BITCOIN_MAINNET_RPC_HOST__=${RPC_HOST:=127.0.0.1} -__BITCOIN_MAINNET_RPC_PORT__=${RPC_PORT:=8332} -__BITCOIN_MAINNET_RPC_USER__=${RPC_USER:=mempool} -__BITCOIN_MAINNET_RPC_PASS__=${RPC_PASS:=mempool} +__CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} +__CORE_RPC_PORT__=${CORE_RPC_PORT:=8332} +__CORE_RPC_USERNAME__=${CORE_RPC_USER:=mempool} +__CORE_RPC_PASSWORD__=${CORE_RPC_PASS:=mempool} # ELECTRUM -__ELECTRUM_MAINNET_HTTP_HOST__=${ELECTRUM_HOST:=127.0.0.1} -__ELECTRUM_MAINNET_HTTP_PORT__=${ELECTRUM_PORT:=50002} -__ELECTRUM_MAINNET_TLS_ENABLED__=${ELECTRUM_TLS:=false} +__ELECTRUM_HOST__=${ELECTRUM_HOST:=127.0.0.1} +__ELECTRUM_PORT__=${ELECTRUM_PORT:=50002} +__ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS:=false} # ESPLORA __ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000} @@ -34,16 +34,16 @@ __ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000} # SECOND_CORE_RPC __SECOND_RPC_HOST__=${SECOND_RPC_HOST:=127.0.0.1} __SECOND_RPC_PORT__=${SECOND_RPC_PORT:=8332} -__SECOND_RPC_USER__=${SECOND_RPC_USER:=mempool} -__SECOND_RPC_PASS__=${SECOND_RPC_PASS:=mempool} +__SECOND_RPC_USERNAME__=${SECOND_RPC_USERNAME:=mempool} +__SECOND_RPC_PASSWORD__=${SECOND_RPC_PASSWORD:=mempool} # DATABASE -__MYSQL_ENABLED__=${MYSQL_ENABLED:=true} -__MYSQL_HOST__=${MYSQL_HOST:=127.0.0.1} -__MYSQL_PORT__=${MYSQL_PORT:=3306} -__MYSQL_DATABASE__=${MYSQL_DATABASE:=mempool} -__MYSQL_USERNAME__=${MYSQL_USER:=mempool} -__MYSQL_PASSWORD__=${MYSQL_PASS:=mempool} +__DATABASE_ENABLED__=${DATABASE_ENABLED:=true} +__DATABASE_HOST__=${DATABASE_HOST:=127.0.0.1} +__DATABASE_PORT__=${DATABASE_PORT:=3306} +__DATABASE_DATABASE__=${DATABASE_DATABASE:=mempool} +__DATABASE_USERNAME__=${DATABASE_USERNAME:=mempool} +__DATABASE_PASSWORD__=${DATABASE_PASSWORD:=mempool} # SYSLOG __SYSLOG_ENABLED__=${SYSLOG_ENABLED:=false} @@ -60,48 +60,56 @@ __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__=${STATISTICS_TX_PER_SECOND_SAMPLE_PER __BISQ_ENABLED__=${BISQ_ENABLED:=false} __BISQ_DATA_PATH__=${BISQ_DATA_PATH:=/bisq/statsnode-data/btc_mainnet/db} -mkdir -p "${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}" +mkdir -p "${__MEMPOOL_CACHE_DIR__}" -sed -i "s/__MEMPOOL_BACKEND_NETWORK__/${__MEMPOOL_BACKEND_NETWORK__}/g" mempool-config.json +sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json sed -i "s/__MEMPOOL_BACKEND__/${__MEMPOOL_BACKEND__}/g" mempool-config.json -sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/${__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__}/g" mempool-config.json +sed -i "s/__MEMPOOL_HTTP_PORT__/${__MEMPOOL_HTTP_PORT__}/g" mempool-config.json sed -i "s/__MEMPOOL_SPAWN_CLUSTER_PROCS__/${__MEMPOOL_SPAWN_CLUSTER_PROCS__}/g" mempool-config.json sed -i "s!__MEMPOOL_API_URL_PREFIX__!${__MEMPOOL_API_URL_PREFIX__}!g" mempool-config.json sed -i "s/__MEMPOOL_POLL_RATE_MS__/${__MEMPOOL_POLL_RATE_MS__}/g" mempool-config.json -sed -i "s!__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__!${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}!g" mempool-config.json -sed -i "s/__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json +sed -i "s!__MEMPOOL_CACHE_DIR__!${__MEMPOOL_CACHE_DIR__}!g" mempool-config.json +sed -i "s/__MEMPOOL_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json sed -i "s/__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__/${__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__}/g" mempool-config.json sed -i "s/__MEMPOOL_BLOCK_WEIGHT_UNITS__/${__MEMPOOL_BLOCK_WEIGHT_UNITS__}/g" mempool-config.json sed -i "s/__MEMPOOL_INITIAL_BLOCKS_AMOUNT__/${__MEMPOOL_INITIAL_BLOCKS_AMOUNT__}/g" mempool-config.json -sed -i "s/__MEMPOOL_BLOCKS_AMOUNT__/${__MEMPOOL_BLOCKS_AMOUNT__}/g" mempool-config.json +sed -i "s/__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__/${__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__}/g" mempool-config.json sed -i "s/__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__/${__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__}/g" mempool-config.json sed -i "s/__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__/${__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__}/g" mempool-config.json sed -i "s/__MEMPOOL_EXTERNAL_ASSETS__/${__MEMPOOL_EXTERNAL_ASSETS__}/g" mempool-config.json -sed -i "s/__BITCOIN_MAINNET_RPC_HOST__/${__BITCOIN_MAINNET_RPC_HOST__}/g" mempool-config.json -sed -i "s/__BITCOIN_MAINNET_RPC_PORT__/${__BITCOIN_MAINNET_RPC_PORT__}/g" mempool-config.json -sed -i "s/__BITCOIN_MAINNET_RPC_USER__/${__BITCOIN_MAINNET_RPC_USER__}/g" mempool-config.json -sed -i "s/__BITCOIN_MAINNET_RPC_PASS__/${__BITCOIN_MAINNET_RPC_PASS__}/g" mempool-config.json -sed -i "s/__ELECTRUM_MAINNET_HTTP_HOST__/${__ELECTRUM_MAINNET_HTTP_HOST__}/g" mempool-config.json -sed -i "s/__ELECTRUM_MAINNET_HTTP_PORT__/${__ELECTRUM_MAINNET_HTTP_PORT__}/g" mempool-config.json -sed -i "s/__ELECTRUM_MAINNET_TLS_ENABLED__/${__ELECTRUM_MAINNET_TLS_ENABLED__}/g" mempool-config.json + +sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json +sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json +sed -i "s/__CORE_RPC_USERNAME__/${__CORE_RPC_USER__}/g" mempool-config.json +sed -i "s/__CORE_RPC_PASSWORD__/${__CORE_RPC_PASS__}/g" mempool-config.json + +sed -i "s/__ELECTRUM_HTTP_HOST__/${__ELECTRUM_HTTP_HOST__}/g" mempool-config.json +sed -i "s/__ELECTRUM_HTTP_PORT__/${__ELECTRUM_HTTP_PORT__}/g" mempool-config.json +sed -i "s/__ELECTRUM_TLS_ENABLED__/${__ELECTRUM_TLS_ENABLED__}/g" mempool-config.json + sed -i "s!__ESPLORA_REST_API_URL__!${__ESPLORA_REST_API_URL__}!g" mempool-config.json + sed -i "s/__SECOND_RPC_HOST__/${__SECOND_RPC_HOST__}/g" mempool-config.json sed -i "s/__SECOND_RPC_PORT__/${__SECOND_RPC_PORT__}/g" mempool-config.json -sed -i "s/__SECOND_RPC_USER__/${__SECOND_RPC_USER__}/g" mempool-config.json -sed -i "s/__SECOND_RPC_PASS__/${__SECOND_RPC_PASS__}/g" mempool-config.json -sed -i "s/__MYSQL_ENABLED__/${__MYSQL_ENABLED__}/g" mempool-config.json -sed -i "s/__MYSQL_HOST__/${__MYSQL_HOST__}/g" mempool-config.json -sed -i "s/__MYSQL_PORT__/${__MYSQL_PORT__}/g" mempool-config.json -sed -i "s/__MYSQL_DATABASE__/${__MYSQL_DATABASE__}/g" mempool-config.json -sed -i "s/__MYSQL_USERNAME__/${__MYSQL_USERNAME__}/g" mempool-config.json -sed -i "s/__MYSQL_PASSWORD__/${__MYSQL_PASSWORD__}/g" mempool-config.json +sed -i "s/__SECOND_RPC_USERNAME__/${__SECOND_RPC_USERNAME__}/g" mempool-config.json +sed -i "s/__SECOND_RPC_PASSWORD__/${__SECOND_RPC_PASSWORD__}/g" mempool-config.json + +sed -i "s/__DATABASE_ENABLED__/${__DATABASE_ENABLED__}/g" mempool-config.json +sed -i "s/__DATABASE_HOST__/${__DATABASE_HOST__}/g" mempool-config.json +sed -i "s/__DATABASE_PORT__/${__DATABASE_PORT__}/g" mempool-config.json +sed -i "s/__DATABASE_DATABASE__/${__DATABASE_DATABASE__}/g" mempool-config.json +sed -i "s/__DATABASE_USERNAME__/${__DATABASE_USERNAME__}/g" mempool-config.json +sed -i "s/__DATABASE_PASSWORD__/${__DATABASE_PASSWORD__}/g" mempool-config.json + sed -i "s/__SYSLOG_ENABLED__/${__SYSLOG_ENABLED__}/g" mempool-config.json sed -i "s/__SYSLOG_HOST__/${__SYSLOG_HOST__}/g" mempool-config.json sed -i "s/__SYSLOG_PORT__/${__SYSLOG_PORT__}/g" mempool-config.json sed -i "s/__SYSLOG_MIN_PRIORITY__/${__SYSLOG_MIN_PRIORITY__}/g" mempool-config.json sed -i "s/__SYSLOG_FACILITY__/${__SYSLOG_FACILITY__}/g" mempool-config.json + sed -i "s/__STATISTICS_ENABLED__/${__STATISTICS_ENABLED__}/g" mempool-config.json sed -i "s/__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__/${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}/g" mempool-config.json + sed -i "s/__BISQ_ENABLED__/${__BISQ_ENABLED__}/g" mempool-config.json sed -i "s!__BISQ_DATA_PATH__!${__BISQ_DATA_PATH__}!g" mempool-config.json diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d1a24a007..68e73a1c8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -15,12 +15,15 @@ services: api: environment: MEMPOOL_BACKEND: "none" - RPC_HOST: "172.27.0.1" - RPC_PORT: "8332" - RPC_USER: "mempool" - RPC_PASS: "mempool" - MYSQL_ENABLED: "true" - MYSQL_HOST: "db" + CORE_RPC_HOST: "172.27.0.1" + CORE_RPC_PORT: "8332" + CORE_RPC_USERNAME: "mempool" + CORE_RPC_PASSWORD: "mempool" + DATABASE_ENABLED: "true" + DATABASE_HOST: "db" + DATABASE_DATABASE: "mempool" + DATABASE_USERNAME: "mempool" + DATABASE_PASSWORD: "mempool" STATISTICS_ENABLED: "true" image: mempool/backend:latest user: "1000:1000"