Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Add daily transactions statistics #1278

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/src/models/influx/nova/IInfluxDbCache.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { IBlocksDailyInflux } from "./IInfluxTimedEntries";
import { IBlocksDailyInflux, ITransactionsDailyInflux } from "./IInfluxTimedEntries";
import { DayKey } from "../types";

/**
* The cache for influx graphs (daily).
*/
export interface IInfluxDailyCache {
blocksDaily: Map<DayKey, IBlocksDailyInflux>;
transactionsDaily: Map<DayKey, ITransactionsDailyInflux>;
}

/**
Expand All @@ -14,4 +15,5 @@ export interface IInfluxDailyCache {
*/
export const initializeEmptyDailyCache = () => ({
blocksDaily: new Map(),
transactionsDaily: new Map(),
});
5 changes: 5 additions & 0 deletions api/src/models/influx/nova/IInfluxTimedEntries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ export type IBlocksDailyInflux = ITimedEntry & {
validation: number | null;
candidacy: number | null;
};

export type ITransactionsDailyInflux = ITimedEntry & {
finalized: number | null;
failed: number | null;
};
4 changes: 3 additions & 1 deletion api/src/routes/nova/analytics/influx/daily/get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ServiceFactory } from "../../../../../factories/serviceFactory";
import { INetworkBoundGetRequest } from "../../../../../models/api/INetworkBoundGetRequest";
import { IConfiguration } from "../../../../../models/configuration/IConfiguration";
import { NOVA } from "../../../../../models/db/protocolVersion";
import { IBlocksDailyInflux } from "../../../../../models/influx/nova/IInfluxTimedEntries";
import { IBlocksDailyInflux, ITransactionsDailyInflux } from "../../../../../models/influx/nova/IInfluxTimedEntries";
import { NetworkService } from "../../../../../services/networkService";
import { InfluxServiceNova } from "../../../../../services/nova/influx/influxServiceNova";
import { ValidationHelper } from "../../../../../utils/validationHelper";
Expand All @@ -13,6 +13,7 @@ import { ValidationHelper } from "../../../../../utils/validationHelper";
export interface IDailyAnalyticsResponse {
error?: string;
blocksDaily?: IBlocksDailyInflux[];
transactionsDaily?: ITransactionsDailyInflux[];
}

/**
Expand All @@ -36,6 +37,7 @@ export async function get(_: IConfiguration, request: INetworkBoundGetRequest):
return influxService
? {
blocksDaily: influxService.blocksDaily,
transactionsDaily: influxService.transactionsDaily,
}
: {
error: "Influx service not found for this network.",
Expand Down
19 changes: 19 additions & 0 deletions api/src/services/nova/influx/influxQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,22 @@ export const BLOCK_DAILY_QUERY = {
GROUP BY time(1d) fill(null)
`,
};

export const TRANSACTION_DAILY_QUERY = {
full: `
SELECT
sum("finalized_count") AS "finalized",
sum("failed_count") AS "failed"
FROM "iota_block_activity"
WHERE time < $to
GROUP BY time(1d) fill(null)
`,
partial: `
SELECT
sum("finalized_count") AS "finalized",
sum("failed_count") AS "failed"
FROM "iota_block_activity"
WHERE time >= $from and time <= $to
GROUP BY time(1d) fill(null)
`,
};
9 changes: 7 additions & 2 deletions api/src/services/nova/influx/influxServiceNova.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { InfluxDB } from "influx";
import { BLOCK_DAILY_QUERY } from "./influxQueries";
import { BLOCK_DAILY_QUERY, TRANSACTION_DAILY_QUERY } from "./influxQueries";
import logger from "../../../logger";
import { INetwork } from "../../../models/db/INetwork";
import { IInfluxDailyCache, initializeEmptyDailyCache } from "../../../models/influx/nova/IInfluxDbCache";
import { IBlocksDailyInflux } from "../../../models/influx/nova/IInfluxTimedEntries";
import { IBlocksDailyInflux, ITransactionsDailyInflux } from "../../../models/influx/nova/IInfluxTimedEntries";
import { InfluxDbClient } from "../../influx/influxClient";

export class InfluxServiceNova extends InfluxDbClient {
Expand Down Expand Up @@ -31,6 +31,10 @@ export class InfluxServiceNova extends InfluxDbClient {
return this.mapToSortedValuesArray(this._dailyCache.blocksDaily);
}

public get transactionsDaily() {
return this.mapToSortedValuesArray(this._dailyCache.transactionsDaily);
}

protected setupDataCollection() {
const network = this._network.network;
logger.verbose(`[InfluxNova] Setting up data collection for (${network}).`);
Expand All @@ -46,5 +50,6 @@ export class InfluxServiceNova extends InfluxDbClient {
private async collectGraphsDaily() {
logger.verbose(`[InfluxNova] Collecting daily stats for "${this._network.network}"`);
this.updateCacheEntry<IBlocksDailyInflux>(BLOCK_DAILY_QUERY, this._dailyCache.blocksDaily, "Blocks Daily", true);
this.updateCacheEntry<ITransactionsDailyInflux>(TRANSACTION_DAILY_QUERY, this._dailyCache.transactionsDaily, "Transactions Daily");
}
}
11 changes: 10 additions & 1 deletion client/src/app/components/nova/statistics/InfluxChartsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Modal from "../../Modal";
import StackedLineChart from "../../stardust/statistics/charts/StackedLineChart";

export const InfluxChartsTab: React.FC = () => {
const { dailyBlocks } = useChartsState();
const { dailyBlocks, dailyTransactions } = useChartsState();

const ids = idGenerator();

Expand All @@ -27,6 +27,15 @@ export const InfluxChartsTab: React.FC = () => {
colors={["#4140DF", "#14CABF", "#36A1AC", "#99BEE1"]}
data={dailyBlocks}
/>
<StackedLineChart
chartId={ids.next().value}
title="Daily Transactions"
info={graphMessages.dailyTransactions}
subgroups={["finalized", "failed"]}
groupLabels={["Finalized", "Failed"]}
colors={["#00E0CA", "#36A1AC"]}
data={dailyTransactions}
/>
</div>
</div>
</div>
Expand Down
9 changes: 7 additions & 2 deletions client/src/helpers/nova/hooks/useChartsState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ import { DataPoint, IStatisticsGraphsData, mapDailyStatsToGraphsData } from "../
* State holder for Statistics page chart section.
* @returns The charts state.
*/
export function useChartsState(): { dailyBlocks: DataPoint[] } {
export function useChartsState(): {
dailyBlocks: DataPoint[];
dailyTransactions: DataPoint[];
} {
const { name: network } = useNetworkInfoNova((s) => s.networkInfo);
const [apiClient] = useState(ServiceFactory.get<NovaApiClient>(`api-client-${NOVA}`));
const [dailyBlocks, setDailyBlocks] = useState<DataPoint[]>([]);
const [dailyTransactions, setDailyTransactions] = useState<DataPoint[]>([]);

useEffect(() => {
apiClient
Expand All @@ -22,12 +26,13 @@ export function useChartsState(): { dailyBlocks: DataPoint[] } {
const graphsData: IStatisticsGraphsData = mapDailyStatsToGraphsData(influxStats);

setDailyBlocks(graphsData.blocksDaily);
setDailyTransactions(graphsData.transactionsDaily);
} else {
console.error("Fetching influx stats failed", influxStats.error);
}
})
.catch((e) => console.error("Influx analytics fetch failed", e));
}, [network]);

return { dailyBlocks };
return { dailyBlocks, dailyTransactions };
}
7 changes: 7 additions & 0 deletions client/src/helpers/nova/statisticsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { IInfluxDailyResponse } from "~models/api/nova/influx/IInfluxDailyRespon

export interface IStatisticsGraphsData {
blocksDaily: DataPoint[];
transactionsDaily: DataPoint[];
}

export interface DataPoint {
Expand All @@ -25,6 +26,12 @@ export function mapDailyStatsToGraphsData(data: IInfluxDailyResponse): IStatisti
validation: day.validation ?? 0,
candidacy: day.candidacy ?? 0,
})) ?? [],
transactionsDaily:
data.transactionsDaily?.map((t) => ({
time: moment(t.time).add(1, "minute").unix(),
finalized: t.finalized ?? 0,
failed: t.failed ?? 0,
})) ?? [],
};
}

Expand Down
7 changes: 7 additions & 0 deletions client/src/models/api/nova/influx/IInfluxDailyResponse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ interface IBlocksDailyInflux {
candidacy: number | null;
}

interface ITransactionsDailyInflux {
time: Date;
finalized: number | null;
failed: number | null;
}

export interface IInfluxDailyResponse extends IResponse {
blocksDaily?: IBlocksDailyInflux[];
transactionsDaily?: ITransactionsDailyInflux[];
}
Loading