Merge branch 'master' into log-priority

fix conflicts in backend/src/config.ts and backend/mempool-config.sample.json
This commit is contained in:
Antoni Spaanderman
2022-02-04 12:32:08 +01:00
58 changed files with 2845 additions and 1262 deletions

View File

@@ -14,6 +14,7 @@ interface IConfig {
BLOCK_WEIGHT_UNITS: number;
INITIAL_BLOCKS_AMOUNT: number;
MEMPOOL_BLOCKS_AMOUNT: number;
INDEXING_BLOCKS_AMOUNT: number;
PRICE_FEED_UPDATE_INTERVAL: number;
USE_SECOND_NODE_FOR_MINFEE: boolean;
EXTERNAL_ASSETS: string[];
@@ -78,9 +79,12 @@ const defaults: IConfig = {
'BLOCK_WEIGHT_UNITS': 4000000,
'INITIAL_BLOCKS_AMOUNT': 8,
'MEMPOOL_BLOCKS_AMOUNT': 8,
'INDEXING_BLOCKS_AMOUNT': 1100, // 0 = disable indexing, -1 = index all blocks
'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',
},
'ESPLORA': {