Merge branch 'master' into log-priority

fix conflicts in backend/src/config.ts and backend/mempool-config.sample.json
2022-02-04 12:32:08 +01:00
parent 5a1d1a2e95 e5b5551d79
commit 723ef1056e
58 changed files with 2845 additions and 1262 deletions
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -12,9 +12,12 @@
    "BLOCK_WEIGHT_UNITS": 4000000,
    "INITIAL_BLOCKS_AMOUNT": 8,
    "MEMPOOL_BLOCKS_AMOUNT": 8,
+    "INDEXING_BLOCKS_AMOUNT": 1100,
    "PRICE_FEED_UPDATE_INTERVAL": 3600,
    "USE_SECOND_NODE_FOR_MINFEE": false,
-    "EXTERNAL_ASSETS": [],
+    "EXTERNAL_ASSETS": [
+      "https://mempool.space/resources/pools.json"
+    ],
    "STDOUT_LOG_MIN_PRIORITY": "debug"
  },
  "CORE_RPC": {