Merge branch 'master' of https://github.com/mempool/mempool

.gitattributes

@@ -1,3 +1,3 @@
 # ignore all differences in line endings
-package.json -crlf
-*/package.json -crlf
+package.json eol=crlf -crlf
+*/package.json eol=crlf -crlf

backend/mempool-config.sample.json

@@ -5,16 +5,20 @@
   "DB_USER": "mempool",
   "DB_PASSWORD": "mempool",
   "DB_DATABASE": "mempool",
+  "DB_DISABLED": false,
   "API_ENDPOINT": "/api/v1/",
   "ELECTRS_POLL_RATE_MS": 2000,
   "MEMPOOL_REFRESH_RATE_MS": 2000,
   "DEFAULT_PROJECTED_BLOCKS_AMOUNT": 8,
   "KEEP_BLOCK_AMOUNT": 24,
   "INITIAL_BLOCK_AMOUNT": 8,
   "TX_PER_SECOND_SPAN_SECONDS": 150,
-  "ELECTRS_API_URL": "https://www.blockstream.info/testnet/api",
+  "ELECTRS_API_URL": "http://localhost:50001",
+  "CLUSTER_NUM_CORES": 1,
   "BISQ_ENABLED": false,
-  "BSQ_BLOCKS_DATA_PATH": "/bisq/data",
+  "BISQ_BLOCKS_DATA_PATH": "/bisq/seednode-data/btc_mainnet/db/json",
+  "BISQ_MARKET_ENABLED": false,
+  "BISQ_MARKETS_DATA_PATH": "/bisq/seednode-data/btc_mainnet/db",
   "SSL": false,
   "SSL_CERT_FILE_PATH": "/etc/letsencrypt/live/mysite/fullchain.pem",
   "SSL_KEY_FILE_PATH": "/etc/letsencrypt/live/mysite/privkey.pem"