Merge branch 'master' into log-priority

i first forgot to fetch upstream in github, conflicts are fixed
2022-02-07 09:15:42 +01:00
parent 5c4f6d6ada 1649cfbde0
commit 62990a95f8
35 changed files with 723 additions and 303 deletions
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ JSON:
    "MEMPOOL_BLOCKS_AMOUNT": 8,
    "PRICE_FEED_UPDATE_INTERVAL": 600,
    "USE_SECOND_NODE_FOR_MINFEE": false,
-    "EXTERNAL_ASSETS": [],
+    "EXTERNAL_ASSETS": ["https://mempool.space/resources/pools.json"],
    "STDOUT_LOG_MIN_PRIORITY": "debug"
  },
 ```