-
-
-
diff --git a/frontend/src/app/docs/code-template/code-template.component.ts b/frontend/src/app/docs/code-template/code-template.component.ts
index 5ef8a64ba..6b91f5a9d 100644
--- a/frontend/src/app/docs/code-template/code-template.component.ts
+++ b/frontend/src/app/docs/code-template/code-template.component.ts
@@ -311,27 +311,29 @@ yarn add @mempool/liquid.js`;
text = text.replace('%{' + indexNumber + '}', textReplace);
}
+ const headersString = code.headers ? ` -H "${code.headers}"` : ``;
+
if (this.env.BASE_MODULE === 'mempool') {
if (this.network === 'main' || this.network === '') {
if (this.method === 'POST') {
- return `curl -X POST -sSLd "${text}"`;
+ return `curl${headersString} -X POST -sSLd "${text}"`;
}
- return `curl -sSL "${this.hostname}${text}"`;
+ return `curl${headersString} -sSL "${this.hostname}${text}"`;
}
if (this.method === 'POST') {
- return `curl -X POST -sSLd "${text}"`;
+ return `curl${headersString} -X POST -sSLd "${text}"`;
}
- return `curl -sSL "${this.hostname}/${this.network}${text}"`;
+ return `curl${headersString} -sSL "${this.hostname}/${this.network}${text}"`;
} else if (this.env.BASE_MODULE === 'liquid') {
if (this.method === 'POST') {
if (this.network !== 'liquid') {
text = text.replace('/api', `/${this.network}/api`);
}
- return `curl -X POST -sSLd "${text}"`;
+ return `curl${headersString} -X POST -sSLd "${text}"`;
}
- return ( this.network === 'liquid' ? `curl -sSL "${this.hostname}${text}"` : `curl -sSL "${this.hostname}/${this.network}${text}"` );
+ return ( this.network === 'liquid' ? `curl${headersString} -sSL "${this.hostname}${text}"` : `curl${headersString} -sSL "${this.hostname}/${this.network}${text}"` );
} else {
- return `curl -sSL "${this.hostname}${text}"`;
+ return `curl${headersString} -sSL "${this.hostname}${text}"`;
}
}
From a3055e20f43252bb3ce49571f42a7f348261e919 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Mon, 29 Jan 2024 01:56:45 -0500
Subject: [PATCH 03/18] Fix signet and testnet docs pages
---
frontend/src/app/docs/api-docs/api-docs-data.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index 8998ec59a..6b765e5c6 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -9891,7 +9891,7 @@ export const restApiDocsData = [
default: "
Returns a list of previous deposits made as prepayment for the accelerator service.
"
},
urlString: "/v1/services/accelerator/deposit-history",
- showConditions: bitcoinNetworks,
+ showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
@@ -9939,7 +9939,7 @@ export const restApiDocsData = [
default: "
Return your current available balance, as well as how much funds are currently locked and much you've been charged so far.
"
},
urlString: "/v1/services/accelerator/balance",
- showConditions: bitcoinNetworks,
+ showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
@@ -9973,7 +9973,7 @@ export const restApiDocsData = [
default: "
Return an estimation of the costs to accelerate a transaction.
"
},
urlString: "/v1/services/accelerator/estimate",
- showConditions: bitcoinNetworks,
+ showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
@@ -10017,7 +10017,7 @@ export const restApiDocsData = [
default: "
Send a request to accelerate a transaction.
"
},
urlString: "/v1/services/accelerator/accelerate",
- showConditions: bitcoinNetworks,
+ showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
@@ -10047,7 +10047,7 @@ export const restApiDocsData = [
default: "
Return the history of previous acceleration requests.
"
},
urlString: "/v1/services/accelerator/history[?status=all|requested|accelerating|mined|completed|failed]",
- showConditions: bitcoinNetworks,
+ showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
From b2a130bb17644a700986faea30746172e638c964 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Mon, 29 Jan 2024 11:45:14 +0100
Subject: [PATCH 04/18] [doc] fix copy, formatting and hide accelerator doc
title if non official instance
---
frontend/src/app/docs/api-docs/api-docs-data.ts | 10 +++++-----
.../src/app/docs/api-docs/api-docs-nav.component.html | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index 6b765e5c6..a0d292925 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -9888,7 +9888,7 @@ export const restApiDocsData = [
fragment: "get-deposit-history",
title: "GET Deposit History",
description: {
- default: "
Returns a list of previous deposits made as prepayment for the accelerator service.
"
+ default: "
Returns a list of deposits made as prepayment for the accelerator service.
"
},
urlString: "/v1/services/accelerator/deposit-history",
showConditions: [""],
@@ -9936,7 +9936,7 @@ export const restApiDocsData = [
fragment: "balance",
title: "GET Available Balance",
description: {
- default: "
Return your current available balance, as well as how much funds are currently locked and much you've been charged so far.
"
+ default: "
Returns your currently available balance, currently locked funds, and total fees paid so far.
"
},
urlString: "/v1/services/accelerator/balance",
showConditions: [""],
@@ -9970,7 +9970,7 @@ export const restApiDocsData = [
fragment: "estimate",
title: "POST Calculate Estimated Costs",
description: {
- default: "
Return an estimation of the costs to accelerate a transaction.
"
+ default: "
Returns estimated costs to accelerate a transaction.
"
},
urlString: "/v1/services/accelerator/estimate",
showConditions: [""],
@@ -10044,9 +10044,9 @@ export const restApiDocsData = [
fragment: "history",
title: "GET Acceleration History",
description: {
- default: "
Return the history of previous acceleration requests.
"
+ default: "
Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
"
},
- urlString: "/v1/services/accelerator/history[?status=all|requested|accelerating|mined|completed|failed]",
+ urlString: "/v1/services/accelerator/history?status=:status",
showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
diff --git a/frontend/src/app/docs/api-docs/api-docs-nav.component.html b/frontend/src/app/docs/api-docs/api-docs-nav.component.html
index ec1cde38f..96622c424 100644
--- a/frontend/src/app/docs/api-docs/api-docs-nav.component.html
+++ b/frontend/src/app/docs/api-docs/api-docs-nav.component.html
@@ -1,4 +1,4 @@
From 1121136a5ec85a71d9ad8ee42f43e0f36c6f9bec Mon Sep 17 00:00:00 2001
From: Mononaut
Date: Thu, 8 Feb 2024 22:40:22 +0000
Subject: [PATCH 05/18] Reduce the network size of mempool block websocket
updates
---
backend/src/api/mempool-blocks.ts | 42 ++++++++++++++++---
backend/src/api/websocket-handler.ts | 4 +-
backend/src/mempool.interfaces.ts | 9 +++-
.../mempool-block-overview.component.ts | 3 +-
.../src/app/interfaces/websocket.interface.ts | 17 ++++++--
frontend/src/app/services/state.service.ts | 2 +-
.../src/app/services/websocket.service.ts | 5 ++-
frontend/src/app/shared/common.utils.ts | 27 ++++++++++++
8 files changed, 93 insertions(+), 16 deletions(-)
diff --git a/backend/src/api/mempool-blocks.ts b/backend/src/api/mempool-blocks.ts
index 58921fcfb..b9da7d4e8 100644
--- a/backend/src/api/mempool-blocks.ts
+++ b/backend/src/api/mempool-blocks.ts
@@ -1,6 +1,6 @@
import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag, TransactionClassified } from '../mempool.interfaces';
+import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag, TransactionClassified, TransactionCompressed, MempoolDeltaChange } from '../mempool.interfaces';
import { Common, OnlineFeeStatsCalculator } from './common';
import config from '../config';
import { Worker } from 'worker_threads';
@@ -171,7 +171,7 @@ class MempoolBlocks {
for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
let added: TransactionClassified[] = [];
let removed: string[] = [];
- const changed: { txid: string, rate: number | undefined, acc: boolean | undefined }[] = [];
+ const changed: TransactionClassified[] = [];
if (mempoolBlocks[i] && !prevBlocks[i]) {
added = mempoolBlocks[i].transactions;
} else if (!mempoolBlocks[i] && prevBlocks[i]) {
@@ -194,14 +194,14 @@ class MempoolBlocks {
if (!prevIds[tx.txid]) {
added.push(tx);
} else if (tx.rate !== prevIds[tx.txid].rate || tx.acc !== prevIds[tx.txid].acc) {
- changed.push({ txid: tx.txid, rate: tx.rate, acc: tx.acc });
+ changed.push(tx);
}
});
}
mempoolBlockDeltas.push({
- added,
+ added: added.map(this.compressTx),
removed,
- changed,
+ changed: changed.map(this.compressDeltaChange),
});
}
return mempoolBlockDeltas;
@@ -691,6 +691,38 @@ class MempoolBlocks {
});
return { blocks: convertedBlocks, blockWeights, rates: convertedRates, clusters: convertedClusters, overflow: convertedOverflow };
}
+
+ public compressTx(tx: TransactionClassified): TransactionCompressed {
+ if (tx.acc) {
+ return [
+ tx.txid,
+ tx.fee,
+ tx.vsize,
+ tx.value,
+ Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
+ tx.flags,
+ 1
+ ];
+ } else {
+ return [
+ tx.txid,
+ tx.fee,
+ tx.vsize,
+ tx.value,
+ Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
+ tx.flags,
+ ];
+ }
+ }
+
+ public compressDeltaChange(tx: TransactionClassified): MempoolDeltaChange {
+ return [
+ tx.txid,
+ Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
+ tx.flags,
+ tx.acc ? 1 : 0,
+ ];
+ }
}
export default new MempoolBlocks();
diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index d0e0b7fd8..3091a09cf 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -259,7 +259,7 @@ class WebsocketHandler {
const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();
response['projected-block-transactions'] = JSON.stringify({
index: index,
- blockTransactions: mBlocksWithTransactions[index]?.transactions || [],
+ blockTransactions: (mBlocksWithTransactions[index]?.transactions || []).map(mempoolBlocks.compressTx),
});
} else {
client['track-mempool-block'] = null;
@@ -999,7 +999,7 @@ class WebsocketHandler {
if (mBlockDeltas[index].added.length > (mBlocksWithTransactions[index]?.transactions.length / 2)) {
response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-full-${index}`, {
index: index,
- blockTransactions: mBlocksWithTransactions[index].transactions,
+ blockTransactions: mBlocksWithTransactions[index].transactions.map(mempoolBlocks.compressTx),
});
} else {
response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-delta-${index}`, {
diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts
index ead0a84ad..71612f25f 100644
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -65,9 +65,9 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
}
export interface MempoolBlockDelta {
- added: TransactionClassified[];
+ added: TransactionCompressed[];
removed: string[];
- changed: { txid: string, rate: number | undefined, flags?: number }[];
+ changed: MempoolDeltaChange[];
}
interface VinStrippedToScriptsig {
@@ -196,6 +196,11 @@ export interface TransactionClassified extends TransactionStripped {
flags: number;
}
+// [txid, fee, vsize, value, rate, flags, acceleration?]
+export type TransactionCompressed = [string, number, number, number, number, number, 1?];
+// [txid, rate, flags, acceleration?]
+export type MempoolDeltaChange = [string, number, number, (1|0)];
+
// binary flags for transaction classification
export const TransactionFlags = {
// features
diff --git a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts
index 7fb036718..5bbf80dd9 100644
--- a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts
+++ b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts
@@ -99,7 +99,7 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang
const inOldBlock = {};
const inNewBlock = {};
const added: TransactionStripped[] = [];
- const changed: { txid: string, rate: number | undefined, acc: boolean | undefined }[] = [];
+ const changed: { txid: string, rate: number | undefined, flags: number, acc: boolean | undefined }[] = [];
const removed: string[] = [];
for (const tx of transactionsStripped) {
inNewBlock[tx.txid] = true;
@@ -117,6 +117,7 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang
changed.push({
txid: tx.txid,
rate: tx.rate,
+ flags: tx.flags,
acc: tx.acc
});
}
diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts
index 35bcbe9cc..ff5977332 100644
--- a/frontend/src/app/interfaces/websocket.interface.ts
+++ b/frontend/src/app/interfaces/websocket.interface.ts
@@ -70,9 +70,15 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
}
export interface MempoolBlockDelta {
- added: TransactionStripped[],
- removed: string[],
- changed?: { txid: string, rate: number | undefined, acc: boolean | undefined }[];
+ added: TransactionStripped[];
+ removed: string[];
+ changed: { txid: string, rate: number, flags: number, acc: boolean }[];
+}
+
+export interface MempoolBlockDeltaCompressed {
+ added: TransactionCompressed[];
+ removed: string[];
+ changed: MempoolDeltaChange[];
}
export interface MempoolInfo {
@@ -97,6 +103,11 @@ export interface TransactionStripped {
context?: 'projected' | 'actual';
}
+// [txid, fee, vsize, value, rate, flags, acceleration?]
+export type TransactionCompressed = [string, number, number, number, number, number, 1?];
+// [txid, rate, flags, acceleration?]
+export type MempoolDeltaChange = [string, number, number, (1|0)];
+
export interface IBackendInfo {
hostname?: string;
gitCommit: string;
diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts
index f87a3dc31..c65432ec1 100644
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -1,7 +1,7 @@
import { Inject, Injectable, PLATFORM_ID, LOCALE_ID } from '@angular/core';
import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable, merge } from 'rxjs';
import { Transaction } from '../interfaces/electrs.interface';
-import { IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, TransactionStripped } from '../interfaces/websocket.interface';
+import { IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, TransactionCompressed, TransactionStripped } from '../interfaces/websocket.interface';
import { BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree } from '../interfaces/node-api.interface';
import { Router, NavigationStart } from '@angular/router';
import { isPlatformBrowser } from '@angular/common';
diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts
index 3c72252db..11e24ef71 100644
--- a/frontend/src/app/services/websocket.service.ts
+++ b/frontend/src/app/services/websocket.service.ts
@@ -8,6 +8,7 @@ import { ApiService } from './api.service';
import { take } from 'rxjs/operators';
import { TransferState, makeStateKey } from '@angular/platform-browser';
import { CacheService } from './cache.service';
+import { uncompressDeltaChange, uncompressTx } from '../shared/common.utils';
const OFFLINE_RETRY_AFTER_MS = 2000;
const OFFLINE_PING_CHECK_AFTER_MS = 30000;
@@ -382,9 +383,9 @@ export class WebsocketService {
if (response['projected-block-transactions']) {
if (response['projected-block-transactions'].index == this.trackingMempoolBlock) {
if (response['projected-block-transactions'].blockTransactions) {
- this.stateService.mempoolBlockTransactions$.next(response['projected-block-transactions'].blockTransactions);
+ this.stateService.mempoolBlockTransactions$.next(response['projected-block-transactions'].blockTransactions.map(uncompressTx));
} else if (response['projected-block-transactions'].delta) {
- this.stateService.mempoolBlockDelta$.next(response['projected-block-transactions'].delta);
+ this.stateService.mempoolBlockDelta$.next(uncompressDeltaChange(response['projected-block-transactions'].delta));
}
}
}
diff --git a/frontend/src/app/shared/common.utils.ts b/frontend/src/app/shared/common.utils.ts
index a04fa1663..18a330fab 100644
--- a/frontend/src/app/shared/common.utils.ts
+++ b/frontend/src/app/shared/common.utils.ts
@@ -1,3 +1,5 @@
+import { MempoolBlockDelta, MempoolBlockDeltaCompressed, MempoolDeltaChange, TransactionCompressed, TransactionStripped } from "../interfaces/websocket.interface";
+
export function isMobile(): boolean {
return (window.innerWidth <= 767.98);
}
@@ -152,4 +154,29 @@ export function seoDescriptionNetwork(network: string): string {
return ' ' + network.charAt(0).toUpperCase() + network.slice(1);
}
return '';
+}
+
+export function uncompressTx(tx: TransactionCompressed): TransactionStripped {
+ return {
+ txid: tx[0],
+ fee: tx[1],
+ vsize: tx[2],
+ value: tx[3],
+ rate: tx[4],
+ flags: tx[5],
+ acc: !!tx[6],
+ };
+}
+
+export function uncompressDeltaChange(delta: MempoolBlockDeltaCompressed): MempoolBlockDelta {
+ return {
+ added: delta.added.map(uncompressTx),
+ removed: delta.removed,
+ changed: delta.changed.map(tx => ({
+ txid: tx[0],
+ rate: tx[1],
+ flags: tx[2],
+ acc: !!tx[3],
+ }))
+ };
}
\ No newline at end of file
From ddee5f927c170884ca16412e19da3201898509a0 Mon Sep 17 00:00:00 2001
From: Mononaut
Date: Thu, 8 Feb 2024 17:44:32 +0000
Subject: [PATCH 06/18] Make dashboard filters persistent, add disjunctive
filter mode
---
.../block-filters.component.html | 11 ++++-
.../block-filters.component.scss | 43 +++++++++++++++++
.../block-filters/block-filters.component.ts | 26 +++++++----
.../block-overview-graph.component.ts | 19 +++++---
.../mempool-block-overview.component.ts | 3 +-
.../app/dashboard/dashboard.component.html | 6 +--
.../src/app/dashboard/dashboard.component.ts | 46 ++++++++++++++++---
frontend/src/app/services/state.service.ts | 3 +-
frontend/src/app/shared/filters.utils.ts | 15 ++++++
9 files changed, 145 insertions(+), 27 deletions(-)
diff --git a/frontend/src/app/components/block-filters/block-filters.component.html b/frontend/src/app/components/block-filters/block-filters.component.html
index f60b04cdd..8c79cd438 100644
--- a/frontend/src/app/components/block-filters/block-filters.component.html
+++ b/frontend/src/app/components/block-filters/block-filters.component.html
@@ -1,4 +1,4 @@
-
diff --git a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.scss b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.scss
index d30dd3305..92964d948 100644
--- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.scss
+++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.scss
@@ -7,6 +7,19 @@
justify-content: center;
align-items: center;
grid-column: 1/-1;
+
+ .placeholder {
+ display: flex;
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ height: 100%;
+ width: 100%;
+ align-items: center;
+ justify-content: center;
+ }
}
.grid-align {
diff --git a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
index f250f3744..95305d72f 100644
--- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
+++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
@@ -10,6 +10,7 @@ import { StateService } from '../../services/state.service';
import { Subscription } from 'rxjs';
import { defaultColorFunction, setOpacity, defaultFeeColors, defaultAuditFeeColors, defaultMarginalFeeColors, defaultAuditColors } from './utils';
import { ActiveFilter, FilterMode, toFlags } from '../../shared/filters.utils';
+import { detectWebGL } from '../../shared/graphs.utils';
const unmatchedOpacity = 0.2;
const unmatchedFeeColors = defaultFeeColors.map(c => setOpacity(c, unmatchedOpacity));
@@ -77,11 +78,14 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
filtersAvailable: boolean = true;
activeFilterFlags: bigint | null = null;
+ webGlEnabled = true;
+
constructor(
readonly ngZone: NgZone,
readonly elRef: ElementRef,
private stateService: StateService,
) {
+ this.webGlEnabled = detectWebGL();
this.vertexArray = new FastVertexArray(512, TxSprite.dataSize);
this.searchSubscription = this.stateService.searchText$.subscribe((text) => {
this.searchText = text;
@@ -506,11 +510,13 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
}
onTxClick(cssX: number, cssY: number, keyModifier: boolean = false) {
- const x = cssX * window.devicePixelRatio;
- const y = cssY * window.devicePixelRatio;
- const selected = this.scene.getTxAt({ x, y });
- if (selected && selected.txid) {
- this.txClickEvent.emit({ tx: selected, keyModifier });
+ if (this.scene) {
+ const x = cssX * window.devicePixelRatio;
+ const y = cssY * window.devicePixelRatio;
+ const selected = this.scene.getTxAt({ x, y });
+ if (selected && selected.txid) {
+ this.txClickEvent.emit({ tx: selected, keyModifier });
+ }
}
}
@@ -529,7 +535,6 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
}
getFilterColorFunction(flags: bigint): ((tx: TxView) => Color) {
- console.log('getting filter color function: ', flags, this.filterMode);
return (tx: TxView) => {
if ((this.filterMode === 'and' && (tx.bigintFlags & flags) === flags) || (this.filterMode === 'or' && (flags === 0n || (tx.bigintFlags & flags) > 0n))) {
return defaultColorFunction(tx);
From a2b01587b15b0d84fa9e3799c80d712d95c8d172 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 10 Feb 2024 10:31:56 +0100
Subject: [PATCH 12/18] [auth] small refactor
---
frontend/src/app/services/services-api.service.ts | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index 3bb459b92..f11b3460c 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -4,7 +4,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
import { StateService } from './state.service';
import { StorageService } from './storage.service';
import { MenuGroup } from '../interfaces/services.interface';
-import { Observable, of, ReplaySubject, tap, catchError, share } from 'rxjs';
+import { Observable, of, ReplaySubject, tap, catchError, share, filter, switchMap } from 'rxjs';
import { IBackendInfo } from '../interfaces/websocket.interface';
import { Acceleration, AccelerationHistoryParams } from '../interfaces/node-api.interface';
@@ -64,13 +64,10 @@ export class ServicesApiServices {
}
this.getUserInfo$().subscribe();
- this.router.events.subscribe((event) => {
- if (event instanceof NavigationStart) {
- if (this.currentAuth !== localStorage.getItem('auth')) {
- this.getUserInfo$().subscribe();
- }
- }
- });
+ this.router.events.pipe(
+ filter((event) => event instanceof NavigationStart && this.currentAuth !== localStorage.getItem('auth')),
+ switchMap(() => this.getUserInfo$()),
+ ).subscribe();
}
/**
From be183ada0a950ebf129bd5db1dcfdda8d82c297a Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 10 Feb 2024 10:56:19 +0100
Subject: [PATCH 13/18] [doc] fix acceleration history endpoint detail
---
frontend/src/app/docs/api-docs/api-docs-data.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index a0d292925..d2cfc0926 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -9955,8 +9955,8 @@ export const restApiDocsData = [
headers: "api_key: stacksats",
response: `{
"balance": 99900000,
- "hold": 0,
- "feesPaid": 200000
+ "hold": 101829,
+ "feesPaid": 133721
}`,
},
}
@@ -10044,15 +10044,15 @@ export const restApiDocsData = [
fragment: "history",
title: "GET Acceleration History",
description: {
- default: "
Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
"
+ default: "
Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
Pass true in :details to get a detailed history of the acceleration request.
"
},
- urlString: "/v1/services/accelerator/history?status=:status",
+ urlString: "/v1/services/accelerator/history?status=:status&details=:details",
showConditions: [""],
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
codeTemplate: {
- curl: `/api/v1/services/accelerator/history?status=all`,
+ curl: `/api/v1/services/accelerator/history?status=all&details=true`,
commonJS: ``,
esModule: ``
},
From 740f9af9af4574cfe03e6b092ef64f09dfead3ea Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 10 Feb 2024 11:40:19 +0100
Subject: [PATCH 14/18] [doc] additional rest api doc for accelerator
---
.../src/app/docs/api-docs/api-docs-data.ts | 123 +++++++++++++++++-
1 file changed, 117 insertions(+), 6 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index d2cfc0926..621f14595 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -9885,7 +9885,7 @@ export const restApiDocsData = [
type: "endpoint",
category: "accelerator",
httpRequestMethod: "GET",
- fragment: "get-deposit-history",
+ fragment: "accelerator-deposit-history",
title: "GET Deposit History",
description: {
default: "
Returns a list of deposits made as prepayment for the accelerator service.
"
@@ -9933,7 +9933,7 @@ export const restApiDocsData = [
type: "endpoint",
category: "accelerator",
httpRequestMethod: "GET",
- fragment: "balance",
+ fragment: "accelerator-balance",
title: "GET Available Balance",
description: {
default: "
Returns your currently available balance, currently locked funds, and total fees paid so far.
"
@@ -9967,7 +9967,7 @@ export const restApiDocsData = [
type: "endpoint",
category: "accelerator",
httpRequestMethod: "POST",
- fragment: "estimate",
+ fragment: "accelerator-estimate",
title: "POST Calculate Estimated Costs",
description: {
default: "
Returns estimated costs to accelerate a transaction.
"
@@ -10011,7 +10011,7 @@ export const restApiDocsData = [
type: "endpoint",
category: "accelerator",
httpRequestMethod: "POST",
- fragment: "accelerate",
+ fragment: "accelerator-accelerate",
title: "POST Accelerate A Transaction",
description: {
default: "
Send a request to accelerate a transaction.
"
@@ -10039,9 +10039,9 @@ export const restApiDocsData = [
{
options: { officialOnly: true },
type: "endpoint",
- category: "history",
+ category: "accelerator",
httpRequestMethod: "GET",
- fragment: "history",
+ fragment: "accelerator-history",
title: "GET Acceleration History",
description: {
default: "
Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
Pass true in :details to get a detailed history of the acceleration request.
"
@@ -10152,6 +10152,117 @@ export const restApiDocsData = [
}
]
}
+]`,
+ },
+ }
+ }
+ },
+ {
+ options: { officialOnly: true },
+ type: "endpoint",
+ category: "accelerator",
+ httpRequestMethod: "GET",
+ fragment: "accelerator-pending",
+ title: "GET Pending Acceleration",
+ description: {
+ default: "
Return the list of currently accelerated transactions.
"
+ },
+ urlString: "/v1/services/accelerator/accelerations",
+ showConditions: [""],
+ showJsExamples: showJsExamplesDefaultFalse,
+ codeExample: {
+ default: {
+ codeTemplate: {
+ curl: `/api/v1/services/accelerator/accelerations`,
+ commonJS: ``,
+ esModule: ``
+ },
+ codeSampleMainnet: {
+ esModule: [],
+ commonJS: [],
+ curl: [],
+ headers: '',
+ response: `[
+ {
+ "txid": "8a183c8ae929a2afb857e7f2acd440aaefdf2797f8f7eab1c5f95ff8602abc81",
+ "added": 1707558316,
+ "feeDelta": 3500,
+ "effectiveVsize": 111,
+ "effectiveFee": 1671,
+ "pools": [
+ 111
+ ]
+ },
+ {
+ "txid": "6097f295e21bdd8d725bd8d9ad4dd72b05bd795dc648bfef52150a9b2b7f7a45",
+ "added": 1707560464,
+ "feeDelta": 60000,
+ "effectiveVsize": 812,
+ "effectiveFee": 7790,
+ "pools": [
+ 111
+ ]
+ }
+]`,
+ },
+ }
+ }
+ },
+ {
+ options: { officialOnly: true },
+ type: "endpoint",
+ category: "accelerator",
+ httpRequestMethod: "GET",
+ fragment: "accelerator-public-history",
+ title: "GET Acceleration History",
+ description: {
+ default: `
Return a list of accelerated transactions.
+ Filters can be applied such as
+ status: all, requested, accelerating, mined, completed, failedtimeframe: 24h, 3d, 1w, 1m, 3m, 6m, 1y, 2y, 3y, allpoolUniqueId: any id from https://github.com/mempool/mining-pools/blob/master/pools-v2.json
+ blockHash: a block hash
+ blockHeight: a block height
+ page: the requested page number if using pagination
+ pageLength: the page lenght if using pagination
+
`
+ },
+ urlString: "/v1/services/accelerator/accelerations/history",
+ showConditions: [""],
+ showJsExamples: showJsExamplesDefaultFalse,
+ codeExample: {
+ default: {
+ codeTemplate: {
+ curl: `/api/v1/services/accelerator/accelerations/history?blockHash=00000000000000000000482f0746d62141694b9210a813b97eb8445780a32003`,
+ commonJS: ``,
+ esModule: ``
+ },
+ codeSampleMainnet: {
+ esModule: [],
+ commonJS: [],
+ curl: [],
+ headers: '',
+ response: `[
+ {
+ "txid": "d7e1796d8eb4a09d4e6c174e36cfd852f1e6e6c9f7df4496339933cd32cbdd1d",
+ "status": "completed",
+ "feePaid": 53239,
+ "added": 1707421053,
+ "lastUpdated": 1707422952,
+ "baseFee": 50000,
+ "vsizeFee": 0,
+ "effectiveFee": 146,
+ "effectiveVsize": 141,
+ "feeDelta": 14000,
+ "blockHash": "00000000000000000000482f0746d62141694b9210a813b97eb8445780a32003",
+ "blockHeight": 829559,
+ "pools": [
+ {
+ "pool_unique_id": 111,
+ "username": "foundryusa"
+ }
+ ]
+ }
]`,
},
}
From a1bd84ea6d5d312f4be4b12af4b8e40988bc814d Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 10 Feb 2024 11:41:30 +0100
Subject: [PATCH 15/18] [doc] separate private/public acceleration history
endpoint title
---
frontend/src/app/docs/api-docs/api-docs-data.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index 621f14595..98da17d35 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -10042,7 +10042,7 @@ export const restApiDocsData = [
category: "accelerator",
httpRequestMethod: "GET",
fragment: "accelerator-history",
- title: "GET Acceleration History",
+ title: "GET Private Acceleration History",
description: {
default: "
Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
Pass true in :details to get a detailed history of the acceleration request.
"
},
@@ -10214,7 +10214,7 @@ export const restApiDocsData = [
category: "accelerator",
httpRequestMethod: "GET",
fragment: "accelerator-public-history",
- title: "GET Acceleration History",
+ title: "GET Public Acceleration History",
description: {
default: `
Return a list of accelerated transactions.
Filters can be applied such as
From 2c222008201dcb071dfbb6903975e77a1aae005c Mon Sep 17 00:00:00 2001
From: softsimon
Date: Sat, 10 Feb 2024 20:45:58 +0800
Subject: [PATCH 16/18] Log mempool stats on new blocks
---
backend/src/api/statistics/statistics.ts | 11 +++++++++--
backend/src/api/websocket-handler.ts | 4 ++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/backend/src/api/statistics/statistics.ts b/backend/src/api/statistics/statistics.ts
index 494777aad..2926a4b17 100644
--- a/backend/src/api/statistics/statistics.ts
+++ b/backend/src/api/statistics/statistics.ts
@@ -6,6 +6,7 @@ import statisticsApi from './statistics-api';
class Statistics {
protected intervalTimer: NodeJS.Timer | undefined;
+ protected lastRun: number = 0;
protected newStatisticsEntryCallback: ((stats: OptimizedStatistic) => void) | undefined;
public setNewStatisticsEntryCallback(fn: (stats: OptimizedStatistic) => void) {
@@ -23,15 +24,21 @@ class Statistics {
setTimeout(() => {
this.runStatistics();
this.intervalTimer = setInterval(() => {
- this.runStatistics();
+ this.runStatistics(true);
}, 1 * 60 * 1000);
}, difference);
}
- private async runStatistics(): Promise {
+ public async runStatistics(skipIfRecent = false): Promise {
if (!memPool.isInSync()) {
return;
}
+
+ if (skipIfRecent && new Date().getTime() / 1000 - this.lastRun < 30) {
+ return;
+ }
+
+ this.lastRun = new Date().getTime() / 1000;
const currentMempool = memPool.getMempool();
const txPerSecond = memPool.getTxPerSecond();
const vBytesPerSecond = memPool.getVBytesPerSecond();
diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index 3091a09cf..b78389b64 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -23,6 +23,7 @@ import priceUpdater from '../tasks/price-updater';
import { ApiPrice } from '../repositories/PricesRepository';
import accelerationApi from './services/acceleration';
import mempool from './mempool';
+import statistics from './statistics/statistics';
interface AddressTransactions {
mempool: MempoolTransactionExtended[],
@@ -723,6 +724,7 @@ class WebsocketHandler {
}
this.printLogs();
+ await statistics.runStatistics();
const _memPool = memPool.getMempool();
@@ -1014,6 +1016,8 @@ class WebsocketHandler {
client.send(this.serializeResponse(response));
}
});
+
+ await statistics.runStatistics();
}
// takes a dictionary of JSON serialized values
From fbabd93b5e3d0085abf622c7ec6818bdae49cd94 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sun, 11 Feb 2024 12:01:09 +0100
Subject: [PATCH 17/18] Update frontend/src/app/docs/api-docs/api-docs-data.ts
Co-authored-by: hunicus <93150691+hunicus@users.noreply.github.com>
---
frontend/src/app/docs/api-docs/api-docs-data.ts | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts
index 98da17d35..b28f45195 100644
--- a/frontend/src/app/docs/api-docs/api-docs-data.ts
+++ b/frontend/src/app/docs/api-docs/api-docs-data.ts
@@ -9888,7 +9888,7 @@ export const restApiDocsData = [
fragment: "accelerator-deposit-history",
title: "GET Deposit History",
description: {
- default: "Returns a list of deposits made as prepayment for the accelerator service.
"
+ default: "Returns a list of deposits the user has made as prepayment for the accelerator service.
"
},
urlString: "/v1/services/accelerator/deposit-history",
showConditions: [""],
@@ -9936,7 +9936,7 @@ export const restApiDocsData = [
fragment: "accelerator-balance",
title: "GET Available Balance",
description: {
- default: "Returns your currently available balance, currently locked funds, and total fees paid so far.
"
+ default: "Returns the user's currently available balance, currently locked funds, and total fees paid so far.
"
},
urlString: "/v1/services/accelerator/balance",
showConditions: [""],
@@ -10014,7 +10014,7 @@ export const restApiDocsData = [
fragment: "accelerator-accelerate",
title: "POST Accelerate A Transaction",
description: {
- default: "Send a request to accelerate a transaction.
"
+ default: "Sends a request to accelerate a transaction.
"
},
urlString: "/v1/services/accelerator/accelerate",
showConditions: [""],
@@ -10044,7 +10044,7 @@ export const restApiDocsData = [
fragment: "accelerator-history",
title: "GET Private Acceleration History",
description: {
- default: "Return the history of previous acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed.
Pass true in :details to get a detailed history of the acceleration request.
"
+ default: "Returns the user's past acceleration requests.
Pass one of the following for :status: all, requested, accelerating, mined, completed, failed. Pass true in :details to get a detailed history of the acceleration request.
"
},
urlString: "/v1/services/accelerator/history?status=:status&details=:details",
showConditions: [""],
@@ -10163,9 +10163,9 @@ export const restApiDocsData = [
category: "accelerator",
httpRequestMethod: "GET",
fragment: "accelerator-pending",
- title: "GET Pending Acceleration",
+ title: "GET Pending Accelerations",
description: {
- default: "Return the list of currently accelerated transactions.
"
+ default: "Returns all transactions currently being accelerated.
"
},
urlString: "/v1/services/accelerator/accelerations",
showConditions: [""],
@@ -10216,8 +10216,8 @@ export const restApiDocsData = [
fragment: "accelerator-public-history",
title: "GET Public Acceleration History",
description: {
- default: `Return a list of accelerated transactions.
- Filters can be applied such as