mirror of
https://github.com/mempool/mempool.git
synced 2024-12-27 08:44:26 +01:00
Replace all avg_XXX
with avgXXX
for consistency
This commit is contained in:
parent
0f0a46cd5c
commit
e101c4e218
@ -474,9 +474,9 @@ class BlocksRepository {
|
|||||||
public async $getHistoricalBlockFees(div: number, interval: string | null): Promise<any> {
|
public async $getHistoricalBlockFees(div: number, interval: string | null): Promise<any> {
|
||||||
try {
|
try {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
CAST(AVG(height) as INT) as avg_height,
|
CAST(AVG(height) as INT) as avgHeight,
|
||||||
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
||||||
CAST(AVG(fees) as INT) as avg_fees
|
CAST(AVG(fees) as INT) as avgFees
|
||||||
FROM blocks`;
|
FROM blocks`;
|
||||||
|
|
||||||
if (interval !== null) {
|
if (interval !== null) {
|
||||||
@ -499,9 +499,9 @@ class BlocksRepository {
|
|||||||
public async $getHistoricalBlockRewards(div: number, interval: string | null): Promise<any> {
|
public async $getHistoricalBlockRewards(div: number, interval: string | null): Promise<any> {
|
||||||
try {
|
try {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
CAST(AVG(height) as INT) as avg_height,
|
CAST(AVG(height) as INT) as avgHeight,
|
||||||
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
||||||
CAST(AVG(reward) as INT) as avg_rewards
|
CAST(AVG(reward) as INT) as avgRewards
|
||||||
FROM blocks`;
|
FROM blocks`;
|
||||||
|
|
||||||
if (interval !== null) {
|
if (interval !== null) {
|
||||||
@ -524,15 +524,15 @@ class BlocksRepository {
|
|||||||
public async $getHistoricalBlockFeeRates(div: number, interval: string | null): Promise<any> {
|
public async $getHistoricalBlockFeeRates(div: number, interval: string | null): Promise<any> {
|
||||||
try {
|
try {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
CAST(AVG(height) as INT) as avg_height,
|
CAST(AVG(height) as INT) as avgHeight,
|
||||||
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[0]')) as INT) as avg_fee_0,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[0]')) as INT) as avgFee_0,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[1]')) as INT) as avg_fee_10,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[1]')) as INT) as avgFee_10,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[2]')) as INT) as avg_fee_25,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[2]')) as INT) as avgFee_25,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[3]')) as INT) as avg_fee_50,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[3]')) as INT) as avgFee_50,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[4]')) as INT) as avg_fee_75,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[4]')) as INT) as avgFee_75,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[5]')) as INT) as avg_fee_90,
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[5]')) as INT) as avgFee_90,
|
||||||
CAST(AVG(JSON_EXTRACT(fee_span, '$[6]')) as INT) as avg_fee_100
|
CAST(AVG(JSON_EXTRACT(fee_span, '$[6]')) as INT) as avgFee_100
|
||||||
FROM blocks`;
|
FROM blocks`;
|
||||||
|
|
||||||
if (interval !== null) {
|
if (interval !== null) {
|
||||||
@ -555,9 +555,9 @@ class BlocksRepository {
|
|||||||
public async $getHistoricalBlockSizes(div: number, interval: string | null): Promise<any> {
|
public async $getHistoricalBlockSizes(div: number, interval: string | null): Promise<any> {
|
||||||
try {
|
try {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
CAST(AVG(height) as INT) as avg_height,
|
CAST(AVG(height) as INT) as avgHeight,
|
||||||
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
||||||
CAST(AVG(size) as INT) as avg_size
|
CAST(AVG(size) as INT) as avgSize
|
||||||
FROM blocks`;
|
FROM blocks`;
|
||||||
|
|
||||||
if (interval !== null) {
|
if (interval !== null) {
|
||||||
@ -580,9 +580,9 @@ class BlocksRepository {
|
|||||||
public async $getHistoricalBlockWeights(div: number, interval: string | null): Promise<any> {
|
public async $getHistoricalBlockWeights(div: number, interval: string | null): Promise<any> {
|
||||||
try {
|
try {
|
||||||
let query = `SELECT
|
let query = `SELECT
|
||||||
CAST(AVG(height) as INT) as avg_height,
|
CAST(AVG(height) as INT) as avgHeight,
|
||||||
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
CAST(AVG(UNIX_TIMESTAMP(blockTimestamp)) as INT) as timestamp,
|
||||||
CAST(AVG(weight) as INT) as avg_weight
|
CAST(AVG(weight) as INT) as avgWeight
|
||||||
FROM blocks`;
|
FROM blocks`;
|
||||||
|
|
||||||
if (interval !== null) {
|
if (interval !== null) {
|
||||||
|
@ -89,13 +89,13 @@ export class BlockFeeRatesGraphComponent implements OnInit {
|
|||||||
};
|
};
|
||||||
for (const rate of data.blockFeeRates) {
|
for (const rate of data.blockFeeRates) {
|
||||||
const timestamp = rate.timestamp * 1000;
|
const timestamp = rate.timestamp * 1000;
|
||||||
seriesData['Min'].push([timestamp, rate.avg_fee_0, rate.avg_height]);
|
seriesData['Min'].push([timestamp, rate.avgFee_0, rate.avgHeight]);
|
||||||
seriesData['10th'].push([timestamp, rate.avg_fee_10, rate.avg_height]);
|
seriesData['10th'].push([timestamp, rate.avgFee_10, rate.avgHeight]);
|
||||||
seriesData['25th'].push([timestamp, rate.avg_fee_25, rate.avg_height]);
|
seriesData['25th'].push([timestamp, rate.avgFee_25, rate.avgHeight]);
|
||||||
seriesData['Median'].push([timestamp, rate.avg_fee_50, rate.avg_height]);
|
seriesData['Median'].push([timestamp, rate.avgFee_50, rate.avgHeight]);
|
||||||
seriesData['75th'].push([timestamp, rate.avg_fee_75, rate.avg_height]);
|
seriesData['75th'].push([timestamp, rate.avgFee_75, rate.avgHeight]);
|
||||||
seriesData['90th'].push([timestamp, rate.avg_fee_90, rate.avg_height]);
|
seriesData['90th'].push([timestamp, rate.avgFee_90, rate.avgHeight]);
|
||||||
seriesData['Max'].push([timestamp, rate.avg_fee_100, rate.avg_height]);
|
seriesData['Max'].push([timestamp, rate.avgFee_100, rate.avgHeight]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare chart
|
// Prepare chart
|
||||||
|
@ -71,7 +71,7 @@ export class BlockFeesGraphComponent implements OnInit {
|
|||||||
.pipe(
|
.pipe(
|
||||||
tap((response) => {
|
tap((response) => {
|
||||||
this.prepareChartOptions({
|
this.prepareChartOptions({
|
||||||
blockFees: response.body.map(val => [val.timestamp * 1000, val.avg_fees / 100000000]),
|
blockFees: response.body.map(val => [val.timestamp * 1000, val.avgFees / 100000000]),
|
||||||
});
|
});
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
}),
|
}),
|
||||||
|
@ -69,7 +69,7 @@ export class BlockRewardsGraphComponent implements OnInit {
|
|||||||
.pipe(
|
.pipe(
|
||||||
tap((response) => {
|
tap((response) => {
|
||||||
this.prepareChartOptions({
|
this.prepareChartOptions({
|
||||||
blockRewards: response.body.map(val => [val.timestamp * 1000, val.avg_rewards / 100000000]),
|
blockRewards: response.body.map(val => [val.timestamp * 1000, val.avgRewards / 100000000]),
|
||||||
});
|
});
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
}),
|
}),
|
||||||
|
@ -83,8 +83,8 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
|
|||||||
tap((response) => {
|
tap((response) => {
|
||||||
const data = response.body;
|
const data = response.body;
|
||||||
this.prepareChartOptions({
|
this.prepareChartOptions({
|
||||||
sizes: data.sizes.map(val => [val.timestamp * 1000, val.avg_size / 1000000, val.avg_height]),
|
sizes: data.sizes.map(val => [val.timestamp * 1000, val.avgSize / 1000000, val.avgHeight]),
|
||||||
weights: data.weights.map(val => [val.timestamp * 1000, val.avg_weight / 1000000, val.avg_height]),
|
weights: data.weights.map(val => [val.timestamp * 1000, val.avgWeight / 1000000, val.avgHeight]),
|
||||||
});
|
});
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
}),
|
}),
|
||||||
|
Loading…
Reference in New Issue
Block a user