machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/feature/fee-redesign

Browse Source
This commit is contained in:
wiz 2022-06-01 17:22:01 +09:00 committed by GitHub
commit 7f8834a2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/api/websocket-handler.ts
View File

@ -200,6 +200,7 @@ class WebsocketHandler {
'backendInfo': backendInfo.getBackendInfo(), 'backendInfo': backendInfo.getBackendInfo(),
'loadingIndicators': loadingIndicators.getLoadingIndicators(), 'loadingIndicators': loadingIndicators.getLoadingIndicators(),
'da': difficultyAdjustment.getDifficultyAdjustment(), 'da': difficultyAdjustment.getDifficultyAdjustment(),
'fees': feeApi.getRecommendedFee(),
...this.extraInitProperties ...this.extraInitProperties
}; };
} }
@ -403,6 +404,9 @@ class WebsocketHandler {
block.extras.matchRate = matchRate; block.extras.matchRate = matchRate;
} }
const da = difficultyAdjustment.getDifficultyAdjustment();
const fees = feeApi.getRecommendedFee();
this.wss.clients.forEach((client) => { this.wss.clients.forEach((client) => {
if (client.readyState !== WebSocket.OPEN) { if (client.readyState !== WebSocket.OPEN) {
return; return;
@ -415,8 +419,8 @@ class WebsocketHandler {
const response = { const response = {
'block': block, 'block': block,
'mempoolInfo': memPool.getMempoolInfo(), 'mempoolInfo': memPool.getMempoolInfo(),
'da': difficultyAdjustment.getDifficultyAdjustment(), 'da': da,
'fees': feeApi.getRecommendedFee(), 'fees': fees,
}; };
if (mBlocks && client['want-mempool-blocks']) { if (mBlocks && client['want-mempool-blocks']) {

1
backend/src/repositories/BlocksRepository.ts
View File

@ -307,6 +307,7 @@ class BlocksRepository {
try { try {
const [rows]: any[] = await DB.query(`SELECT const [rows]: any[] = await DB.query(`SELECT
height, height,
hash,
hash as id, hash as id,
UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
size, size,