correcting merge

This commit is contained in:
softsimon 2020-11-23 11:46:04 +07:00
parent f1e5ae536e
commit f5058bc32e

View File

@ -126,7 +126,7 @@ class WebsocketHandler {
'vBytesPerSecond': memPool.getVBytesPerSecond(), 'vBytesPerSecond': memPool.getVBytesPerSecond(),
'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(), 'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(),
'blocks': _blocks, 'blocks': _blocks,
'conversions': fiatConversion.getTickers()['BTCUSD'], 'conversions': fiatConversion.getConversionRates(),
'mempool-blocks': mempoolBlocks.getMempoolBlocks(), 'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
'transactions': memPool.getLatestTransactions(), 'transactions': memPool.getLatestTransactions(),
'git-commit': backendInfo.gitCommitHash, 'git-commit': backendInfo.gitCommitHash,