correcting merge

This commit is contained in:
softsimon 2020-11-23 11:46:04 +07:00
parent 9059c0c7e4
commit bd67eec777
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7

View File

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