Merge pull request #2865 from mempool/mononaut/document-backend-config
Add missing vars to docker config & readme
This commit is contained in:
		
						commit
						fc56c371ec
					
				| @ -27,7 +27,7 @@ | |||||||
|     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master", |     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master", | ||||||
|     "ADVANCED_GBT_AUDIT": false, |     "ADVANCED_GBT_AUDIT": false, | ||||||
|     "ADVANCED_GBT_MEMPOOL": false, |     "ADVANCED_GBT_MEMPOOL": false, | ||||||
|     "TRANSACTION_INDEXING": false |     "CPFP_INDEXING": false | ||||||
|   }, |   }, | ||||||
|   "CORE_RPC": { |   "CORE_RPC": { | ||||||
|     "HOST": "127.0.0.1", |     "HOST": "127.0.0.1", | ||||||
|  | |||||||
| @ -26,9 +26,9 @@ | |||||||
|     "INDEXING_BLOCKS_AMOUNT": 14, |     "INDEXING_BLOCKS_AMOUNT": 14, | ||||||
|     "POOLS_JSON_TREE_URL": "__POOLS_JSON_TREE_URL__", |     "POOLS_JSON_TREE_URL": "__POOLS_JSON_TREE_URL__", | ||||||
|     "POOLS_JSON_URL": "__POOLS_JSON_URL__", |     "POOLS_JSON_URL": "__POOLS_JSON_URL__", | ||||||
|     "ADVANCED_GBT_AUDIT": "__ADVANCED_GBT_AUDIT__", |     "ADVANCED_GBT_AUDIT": "__MEMPOOL_ADVANCED_GBT_AUDIT__", | ||||||
|     "ADVANCED_GBT_MEMPOOL": "__ADVANCED_GBT_MEMPOOL__", |     "ADVANCED_GBT_MEMPOOL": "__MEMPOOL_ADVANCED_GBT_MEMPOOL__", | ||||||
|     "TRANSACTION_INDEXING": "__TRANSACTION_INDEXING__" |     "CPFP_INDEXING": "__MEMPOOL_CPFP_INDEXING__" | ||||||
|   }, |   }, | ||||||
|   "CORE_RPC": { |   "CORE_RPC": { | ||||||
|     "HOST": "__CORE_RPC_HOST__", |     "HOST": "__CORE_RPC_HOST__", | ||||||
|  | |||||||
| @ -40,7 +40,7 @@ describe('Mempool Backend Config', () => { | |||||||
|         POOLS_JSON_URL: 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json', |         POOLS_JSON_URL: 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json', | ||||||
|         ADVANCED_GBT_AUDIT: false, |         ADVANCED_GBT_AUDIT: false, | ||||||
|         ADVANCED_GBT_MEMPOOL: false, |         ADVANCED_GBT_MEMPOOL: false, | ||||||
|         TRANSACTION_INDEXING: false, |         CPFP_INDEXING: false, | ||||||
|       }); |       }); | ||||||
| 
 | 
 | ||||||
|       expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true }); |       expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true }); | ||||||
|  | |||||||
| @ -525,7 +525,7 @@ class Blocks { | |||||||
|             for (let i = 10; i >= 0; --i) { |             for (let i = 10; i >= 0; --i) { | ||||||
|               const newBlock = await this.$indexBlock(lastBlock['height'] - i); |               const newBlock = await this.$indexBlock(lastBlock['height'] - i); | ||||||
|               await this.$getStrippedBlockTransactions(newBlock.id, true, true); |               await this.$getStrippedBlockTransactions(newBlock.id, true, true); | ||||||
|               if (config.MEMPOOL.TRANSACTION_INDEXING) { |               if (config.MEMPOOL.CPFP_INDEXING) { | ||||||
|                 await this.$indexCPFP(newBlock.id, lastBlock['height'] - i); |                 await this.$indexCPFP(newBlock.id, lastBlock['height'] - i); | ||||||
|               } |               } | ||||||
|             } |             } | ||||||
| @ -553,7 +553,7 @@ class Blocks { | |||||||
|           if (Common.blocksSummariesIndexingEnabled() === true) { |           if (Common.blocksSummariesIndexingEnabled() === true) { | ||||||
|             await this.$getStrippedBlockTransactions(blockExtended.id, true); |             await this.$getStrippedBlockTransactions(blockExtended.id, true); | ||||||
|           } |           } | ||||||
|           if (config.MEMPOOL.TRANSACTION_INDEXING) { |           if (config.MEMPOOL.CPFP_INDEXING) { | ||||||
|             this.$indexCPFP(blockExtended.id, this.currentBlockHeight); |             this.$indexCPFP(blockExtended.id, this.currentBlockHeight); | ||||||
|           } |           } | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -190,7 +190,7 @@ export class Common { | |||||||
|   static cpfpIndexingEnabled(): boolean { |   static cpfpIndexingEnabled(): boolean { | ||||||
|     return ( |     return ( | ||||||
|       Common.indexingEnabled() && |       Common.indexingEnabled() && | ||||||
|       config.MEMPOOL.TRANSACTION_INDEXING === true |       config.MEMPOOL.CPFP_INDEXING === true | ||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -31,7 +31,7 @@ interface IConfig { | |||||||
|     POOLS_JSON_TREE_URL: string, |     POOLS_JSON_TREE_URL: string, | ||||||
|     ADVANCED_GBT_AUDIT: boolean; |     ADVANCED_GBT_AUDIT: boolean; | ||||||
|     ADVANCED_GBT_MEMPOOL: boolean; |     ADVANCED_GBT_MEMPOOL: boolean; | ||||||
|     TRANSACTION_INDEXING: boolean; |     CPFP_INDEXING: boolean; | ||||||
|   }; |   }; | ||||||
|   ESPLORA: { |   ESPLORA: { | ||||||
|     REST_API_URL: string; |     REST_API_URL: string; | ||||||
| @ -152,7 +152,7 @@ const defaults: IConfig = { | |||||||
|     'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master', |     'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master', | ||||||
|     'ADVANCED_GBT_AUDIT': false, |     'ADVANCED_GBT_AUDIT': false, | ||||||
|     'ADVANCED_GBT_MEMPOOL': false, |     'ADVANCED_GBT_MEMPOOL': false, | ||||||
|     'TRANSACTION_INDEXING': false, |     'CPFP_INDEXING': false, | ||||||
|   }, |   }, | ||||||
|   'ESPLORA': { |   'ESPLORA': { | ||||||
|     'REST_API_URL': 'http://127.0.0.1:3000', |     'REST_API_URL': 'http://127.0.0.1:3000', | ||||||
|  | |||||||
| @ -100,12 +100,18 @@ Below we list all settings from `mempool-config.json` and the corresponding over | |||||||
|     "BLOCK_WEIGHT_UNITS": 4000000, |     "BLOCK_WEIGHT_UNITS": 4000000, | ||||||
|     "INITIAL_BLOCKS_AMOUNT": 8, |     "INITIAL_BLOCKS_AMOUNT": 8, | ||||||
|     "MEMPOOL_BLOCKS_AMOUNT": 8, |     "MEMPOOL_BLOCKS_AMOUNT": 8, | ||||||
|  |     "BLOCKS_SUMMARIES_INDEXING": false, | ||||||
|     "PRICE_FEED_UPDATE_INTERVAL": 600, |     "PRICE_FEED_UPDATE_INTERVAL": 600, | ||||||
|     "USE_SECOND_NODE_FOR_MINFEE": false, |     "USE_SECOND_NODE_FOR_MINFEE": false, | ||||||
|     "EXTERNAL_ASSETS": ["https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json"], |     "EXTERNAL_ASSETS": ["https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json"], | ||||||
|     "STDOUT_LOG_MIN_PRIORITY": "info", |     "STDOUT_LOG_MIN_PRIORITY": "info", | ||||||
|  |     "INDEXING_BLOCKS_AMOUNT": false, | ||||||
|  |     "AUTOMATIC_BLOCK_REINDEXING": false, | ||||||
|     "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json", |     "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json", | ||||||
|     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master" |     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master", | ||||||
|  |     "ADVANCED_GBT_AUDIT": false, | ||||||
|  |     "ADVANCED_GBT_MEMPOOL": false, | ||||||
|  |     "CPFP_INDEXING": false, | ||||||
|   }, |   }, | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| @ -125,15 +131,25 @@ Corresponding `docker-compose.yml` overrides: | |||||||
|       MEMPOOL_BLOCK_WEIGHT_UNITS: "" |       MEMPOOL_BLOCK_WEIGHT_UNITS: "" | ||||||
|       MEMPOOL_INITIAL_BLOCKS_AMOUNT: "" |       MEMPOOL_INITIAL_BLOCKS_AMOUNT: "" | ||||||
|       MEMPOOL_MEMPOOL_BLOCKS_AMOUNT: "" |       MEMPOOL_MEMPOOL_BLOCKS_AMOUNT: "" | ||||||
|  |       MEMPOOL_BLOCKS_SUMMARIES_INDEXING: "" | ||||||
|       MEMPOOL_PRICE_FEED_UPDATE_INTERVAL: "" |       MEMPOOL_PRICE_FEED_UPDATE_INTERVAL: "" | ||||||
|       MEMPOOL_USE_SECOND_NODE_FOR_MINFEE: "" |       MEMPOOL_USE_SECOND_NODE_FOR_MINFEE: "" | ||||||
|       MEMPOOL_EXTERNAL_ASSETS: "" |       MEMPOOL_EXTERNAL_ASSETS: "" | ||||||
|       MEMPOOL_STDOUT_LOG_MIN_PRIORITY: "" |       MEMPOOL_STDOUT_LOG_MIN_PRIORITY: "" | ||||||
|  |       MEMPOOL_INDEXING_BLOCKS_AMOUNT: "" | ||||||
|  |       MEMPOOL_AUTOMATIC_BLOCK_REINDEXING: "" | ||||||
|       MEMPOOL_POOLS_JSON_URL: "" |       MEMPOOL_POOLS_JSON_URL: "" | ||||||
|       MEMPOOL_POOLS_JSON_TREE_URL: "" |       MEMPOOL_POOLS_JSON_TREE_URL: "" | ||||||
|  |       MEMPOOL_ADVANCED_GBT_AUDIT: "" | ||||||
|  |       MEMPOOL_ADVANCED_GBT_MEMPOOL: "" | ||||||
|  |       MEMPOOL_CPFP_INDEXING: "" | ||||||
|       ... |       ... | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | `ADVANCED_GBT_AUDIT` AND `ADVANCED_GBT_MEMPOOL` enable a more accurate (but slower) block prediction algorithm for the block audit feature and the projected mempool-blocks respectively. | ||||||
|  | 
 | ||||||
|  | `CPFP_INDEXING` enables indexing CPFP (Child Pays For Parent) information for the last `INDEXING_BLOCKS_AMOUNT` blocks. | ||||||
|  | 
 | ||||||
| <br/> | <br/> | ||||||
| 
 | 
 | ||||||
| `mempool-config.json`: | `mempool-config.json`: | ||||||
|  | |||||||
| @ -22,7 +22,10 @@ | |||||||
|     "STDOUT_LOG_MIN_PRIORITY": "__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__", |     "STDOUT_LOG_MIN_PRIORITY": "__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__", | ||||||
|     "INDEXING_BLOCKS_AMOUNT": __MEMPOOL_INDEXING_BLOCKS_AMOUNT__, |     "INDEXING_BLOCKS_AMOUNT": __MEMPOOL_INDEXING_BLOCKS_AMOUNT__, | ||||||
|     "BLOCKS_SUMMARIES_INDEXING": __MEMPOOL_BLOCKS_SUMMARIES_INDEXING__, |     "BLOCKS_SUMMARIES_INDEXING": __MEMPOOL_BLOCKS_SUMMARIES_INDEXING__, | ||||||
|     "AUTOMATIC_BLOCK_REINDEXING": __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__ |     "AUTOMATIC_BLOCK_REINDEXING": __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__, | ||||||
|  |     "ADVANCED_GBT_AUDIT": __MEMPOOL_ADVANCED_GBT_AUDIT__, | ||||||
|  |     "ADVANCED_GBT_MEMPOOL": __MEMPOOL_ADVANCED_GBT_MEMPOOL__, | ||||||
|  |     "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__ | ||||||
|   }, |   }, | ||||||
|   "CORE_RPC": { |   "CORE_RPC": { | ||||||
|     "HOST": "__CORE_RPC_HOST__", |     "HOST": "__CORE_RPC_HOST__", | ||||||
|  | |||||||
| @ -27,6 +27,9 @@ __MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false} | |||||||
| __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false} | __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false} | ||||||
| __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json} | __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json} | ||||||
| __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master} | __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master} | ||||||
|  | __MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false} | ||||||
|  | __MEMPOOL_ADVANCED_GBT_MEMPOOL__=${MEMPOOL_ADVANCED_GBT_MEMPOOL:=false} | ||||||
|  | __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false} | ||||||
| 
 | 
 | ||||||
| # CORE_RPC | # CORE_RPC | ||||||
| __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} | __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} | ||||||
| @ -136,6 +139,8 @@ sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT_ | |||||||
| sed -i "s/__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__/${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}/g" mempool-config.json | sed -i "s/__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__/${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}/g" mempool-config.json | ||||||
| sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json | sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json | ||||||
| sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json | sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json | ||||||
|  | sed -i "s!__MEMPOOL_ADVANCED_GBT_MEMPOOL__!${__MEMPOOL_ADVANCED_GBT_MEMPOOL__}!g" mempool-config.json | ||||||
|  | sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json | ||||||
| 
 | 
 | ||||||
| sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/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_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user