Show expected fees in blocks list

This commit is contained in:
Joost Jager
2023-06-06 08:52:29 +02:00
parent 3c0bb11208
commit 74b2014dff
7 changed files with 15 additions and 2 deletions

View File

@@ -282,10 +282,12 @@ class Blocks {
}
extras.matchRate = null;
extras.expectedFees = null;
if (config.MEMPOOL.AUDIT) {
const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(block.id);
if (auditScore != null) {
extras.matchRate = auditScore.matchRate;
extras.expectedFees = auditScore.expectedFees;
}
}
}

View File

@@ -598,6 +598,7 @@ class WebsocketHandler {
if (block.extras) {
block.extras.matchRate = matchRate;
block.extras.expectedFees = totalFees;
block.extras.similarity = similarity;
}
}

View File

@@ -41,6 +41,7 @@ export interface BlockAudit {
export interface AuditScore {
hash: string,
matchRate?: number,
expectedFees?: number
}
export interface MempoolBlock {
@@ -183,6 +184,7 @@ export interface BlockExtension {
feeRange: number[]; // fee rate percentiles
reward: number;
matchRate: number | null;
expectedFees: number | null;
similarity?: number;
pool: {
id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`

View File

@@ -81,7 +81,7 @@ class BlocksAuditRepositories {
public async $getBlockAuditScore(hash: string): Promise<AuditScore> {
try {
const [rows]: any[] = await DB.query(
`SELECT hash, match_rate as matchRate
`SELECT hash, match_rate as matchRate, expected_fees as expectedFees
FROM blocks_audits
WHERE blocks_audits.hash = "${hash}"
`);
@@ -95,7 +95,7 @@ class BlocksAuditRepositories {
public async $getBlockAuditScores(maxHeight: number, minHeight: number): Promise<AuditScore[]> {
try {
const [rows]: any[] = await DB.query(
`SELECT hash, match_rate as matchRate
`SELECT hash, match_rate as matchRate, expected_fees as expectedFees
FROM blocks_audits
WHERE blocks_audits.height BETWEEN ? AND ?
`, [minHeight, maxHeight]);

View File

@@ -1032,10 +1032,12 @@ class BlocksRepository {
// Match rate is not part of the blocks table, but it is part of APIs so we must include it
extras.matchRate = null;
extras.expectedFees = null;
if (config.MEMPOOL.AUDIT) {
const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(dbBlk.id);
if (auditScore != null) {
extras.matchRate = auditScore.matchRate;
extras.expectedFees = auditScore.expectedFees;
}
}