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

Merge pull request #1685 from mempool/nymkappa/feature/update-api-case

Browse Source 
Update case in some mining API endpoint response
This commit is contained in:
wiz 2022-05-25 18:54:47 +09:00 committed by GitHub
commit e059b9d379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,9 +475,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) {
@ -500,9 +500,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) {
@ -525,15 +525,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) {
@ -556,9 +556,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) {
@ -581,9 +581,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) {

14
frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
View File

@ -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

2
frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
View File

@ -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;
}), }),

2
frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
View File

@ -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;
}), }),

4
frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
View File

@ -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;
}), }),

252
frontend/src/app/docs/api-docs/api-docs-data.ts
View File

@ -3834,34 +3834,34 @@ export const restApiDocsData = [
curl: [`1w`], curl: [`1w`],
response: `[ response: `[
{ {
"avg_height": 735644, "avgHeight": 735644,
"timestamp": 1652119111, "timestamp": 1652119111,
"avg_fees": 24212890 "avgFees": 24212890
}, },
{ {
"avg_height": 735646, "avgHeight": 735646,
"timestamp": 1652120252, "timestamp": 1652120252,
"avg_fees": 21655996 "avgFees": 21655996
}, },
{ {
"avg_height": 735648, "avgHeight": 735648,
"timestamp": 1652121214, "timestamp": 1652121214,
"avg_fees": 20678859 "avgFees": 20678859
}, },
{ {
"avg_height": 735649, "avgHeight": 735649,
"timestamp": 1652121757, "timestamp": 1652121757,
"avg_fees": 21020140 "avgFees": 21020140
}, },
{ {
"avg_height": 735650, "avgHeight": 735650,
"timestamp": 1652122367, "timestamp": 1652122367,
"avg_fees": 23064200 "avgFees": 23064200
}, },
{ {
"avg_height": 735652, "avgHeight": 735652,
"timestamp": 1652122893, "timestamp": 1652122893,
"avg_fees": 17620723 "avgFees": 17620723
}, },
... ...
]` ]`
@ -3872,14 +3872,14 @@ export const restApiDocsData = [
curl: [`1w`], curl: [`1w`],
response: `[ response: `[
{ {
"avg_height": 2224253, "avgHeight": 2224253,
"timestamp": 1652346420, "timestamp": 1652346420,
"avg_fees": 211686 "avgFees": 211686
}, },
{ {
"avg_height": 2224254, "avgHeight": 2224254,
"timestamp": 1652346850, "timestamp": 1652346850,
"avg_fees": 2565952 "avgFees": 2565952
}, },
... ...
]` ]`
@ -3890,14 +3890,14 @@ export const restApiDocsData = [
curl: [`1w`], curl: [`1w`],
response: `[ response: `[
{ {
"avg_height": 89978, "avgHeight": 89978,
"timestamp": 1652346573, "timestamp": 1652346573,
"avg_fees": 1071 "avgFees": 1071
}, },
{ {
"avg_height": 89979, "avgHeight": 89979,
"timestamp": 1652346970, "timestamp": 1652346970,
"avg_fees": 1224 "avgFees": 1224
}, },
... ...
]` ]`
@ -3933,29 +3933,29 @@ export const restApiDocsData = [
curl: [`1d`], curl: [`1d`],
response: `[ response: `[
{ {
"avg_height": 599992, "avgHeight": 599992,
"timestamp": 1571438412, "timestamp": 1571438412,
"avg_rewards": 1260530933 "avgRewards": 1260530933
}, },
{ {
"avg_height": 600000, "avgHeight": 600000,
"timestamp": 1571443398, "timestamp": 1571443398,
"avg_rewards": 1264314538 "avgRewards": 1264314538
}, },
{ {
"avg_height": 725441, "avgHeight": 725441,
"timestamp": 1646139035, "timestamp": 1646139035,
"avg_rewards": 637067563 "avgRewards": 637067563
}, },
{ {
"avg_height": 725585, "avgHeight": 725585,
"timestamp": 1646222444, "timestamp": 1646222444,
"avg_rewards": 646519104 "avgRewards": 646519104
}, },
{ {
"avg_height": 725727, "avgHeight": 725727,
"timestamp": 1646308374, "timestamp": 1646308374,
"avg_rewards": 638709605 "avgRewards": 638709605
}, },
... ...
]` ]`
@ -3966,14 +3966,14 @@ export const restApiDocsData = [
curl: [`1d`], curl: [`1d`],
response: `[ response: `[
{ {
"avg_height": 12, "avgHeight": 12,
"timestamp": 1296689648, "timestamp": 1296689648,
"avg_rewards": 5000000000 "avgRewards": 5000000000
}, },
{ {
"avg_height": 269, "avgHeight": 269,
"timestamp": 1296717674, "timestamp": 1296717674,
"avg_rewards": 5000091820 "avgRewards": 5000091820
}, },
... ...
]` ]`
@ -3984,14 +3984,14 @@ export const restApiDocsData = [
curl: [`1d`], curl: [`1d`],
response: `[ response: `[
{ {
"avg_height": 183, "avgHeight": 183,
"timestamp": 1598962247, "timestamp": 1598962247,
"avg_rewards": 5000000000 "avgRewards": 5000000000
}, },
{ {
"avg_height": 576, "avgHeight": 576,
"timestamp": 1599047892, "timestamp": 1599047892,
"avg_rewards": 5000000000 "avgRewards": 5000000000
}, },
... ...
]` ]`
@ -4029,37 +4029,37 @@ export const restApiDocsData = [
"oldestIndexedBlockTimestamp": 1571434851, "oldestIndexedBlockTimestamp": 1571434851,
"blockFeeRates": [ "blockFeeRates": [
{ {
"avg_height": 732152, "avgHeight": 732152,
"timestamp": 1650132959, "timestamp": 1650132959,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 2, "avgFee_10": 2,
"avg_fee_25": 2, "avgFee_25": 2,
"avg_fee_50": 3, "avgFee_50": 3,
"avg_fee_75": 4, "avgFee_75": 4,
"avg_fee_90": 8, "avgFee_90": 8,
"avg_fee_100": 393 "avgFee_100": 393
}, },
{ {
"avg_height": 732158, "avgHeight": 732158,
"timestamp": 1650134432, "timestamp": 1650134432,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 2, "avgFee_25": 2,
"avg_fee_50": 4, "avgFee_50": 4,
"avg_fee_75": 6, "avgFee_75": 6,
"avg_fee_90": 10, "avgFee_90": 10,
"avg_fee_100": 240 "avgFee_100": 240
}, },
{ {
"avg_height": 732161, "avgHeight": 732161,
"timestamp": 1650135818, "timestamp": 1650135818,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 1, "avgFee_25": 1,
"avg_fee_50": 2, "avgFee_50": 2,
"avg_fee_75": 5, "avgFee_75": 5,
"avg_fee_90": 8, "avgFee_90": 8,
"avg_fee_100": 251 "avgFee_100": 251
}, },
... ...
] ]
@ -4073,26 +4073,26 @@ export const restApiDocsData = [
"oldestIndexedBlockTimestamp": 1296688602, "oldestIndexedBlockTimestamp": 1296688602,
"blockFeeRates": [ "blockFeeRates": [
{ {
"avg_height": 2196306, "avgHeight": 2196306,
"timestamp": 1650360168, "timestamp": 1650360168,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 1, "avgFee_25": 1,
"avg_fee_50": 1, "avgFee_50": 1,
"avg_fee_75": 2, "avgFee_75": 2,
"avg_fee_90": 28, "avgFee_90": 28,
"avg_fee_100": 2644 "avgFee_100": 2644
}, },
{ {
"avg_height": 2196308, "avgHeight": 2196308,
"timestamp": 1650361209, "timestamp": 1650361209,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 1, "avgFee_25": 1,
"avg_fee_50": 4, "avgFee_50": 4,
"avg_fee_75": 12, "avgFee_75": 12,
"avg_fee_90": 65, "avgFee_90": 65,
"avg_fee_100": 102 "avgFee_100": 102
}, },
... ...
] ]
@ -4106,26 +4106,26 @@ export const restApiDocsData = [
"oldestIndexedBlockTimestamp": 1598918400, "oldestIndexedBlockTimestamp": 1598918400,
"blockFeeRates": [ "blockFeeRates": [
{ {
"avg_height": 86620, "avgHeight": 86620,
"timestamp": 1650360010, "timestamp": 1650360010,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 1, "avgFee_25": 1,
"avg_fee_50": 1, "avgFee_50": 1,
"avg_fee_75": 1, "avgFee_75": 1,
"avg_fee_90": 1, "avgFee_90": 1,
"avg_fee_100": 1 "avgFee_100": 1
}, },
{ {
"avg_height": 86623, "avgHeight": 86623,
"timestamp": 1650361330, "timestamp": 1650361330,
"avg_fee_0": 1, "avgFee_0": 1,
"avg_fee_10": 1, "avgFee_10": 1,
"avg_fee_25": 1, "avgFee_25": 1,
"avg_fee_50": 1, "avgFee_50": 1,
"avg_fee_75": 1, "avgFee_75": 1,
"avg_fee_90": 1, "avgFee_90": 1,
"avg_fee_100": 1 "avgFee_100": 1
}, },
... ...
] ]
@ -4163,47 +4163,47 @@ export const restApiDocsData = [
response: `{ response: `{
"sizes": [ "sizes": [
{ {
"avg_height": 576650, "avgHeight": 576650,
"timestamp": 1558212081, "timestamp": 1558212081,
"avg_size": 1271404 "avgSize": 1271404
}, },
{ {
"avg_height": 576715, "avgHeight": 576715,
"timestamp": 1558246272, "timestamp": 1558246272,
"avg_size": 1105893 "avgSize": 1105893
}, },
{ {
"avg_height": 576797, "avgHeight": 576797,
"timestamp": 1558289379, "timestamp": 1558289379,
"avg_size": 1141071 "avgSize": 1141071
}, },
{ {
"avg_height": 576885, "avgHeight": 576885,
"timestamp": 1558330184, "timestamp": 1558330184,
"avg_size": 1108166 "avgSize": 1108166
}, },
... ...
], ],
"weights": [ "weights": [
{ {
"avg_height": 576650, "avgHeight": 576650,
"timestamp": 1558212081, "timestamp": 1558212081,
"avg_weight": 3994002 "avgWeight": 3994002
}, },
{ {
"avg_height": 576715, "avgHeight": 576715,
"timestamp": 1558246272, "timestamp": 1558246272,
"avg_weight": 3756312 "avgWeight": 3756312
}, },
{ {
"avg_height": 576797, "avgHeight": 576797,
"timestamp": 1558289379, "timestamp": 1558289379,
"avg_weight": 3719625 "avgWeight": 3719625
}, },
{ {
"avg_height": 576885, "avgHeight": 576885,
"timestamp": 1558330184, "timestamp": 1558330184,
"avg_weight": 3631381 "avgWeight": 3631381
}, },
... ...
] ]
@ -4216,27 +4216,27 @@ export const restApiDocsData = [
response: `{ response: `{
"sizes": [ "sizes": [
{ {
"avg_height": 1517188, "avgHeight": 1517188,
"timestamp": 1558262730, "timestamp": 1558262730,
"avg_size": 25089 "avgSize": 25089
}, },
{ {
"avg_height": 1517275, "avgHeight": 1517275,
"timestamp": 1558290933, "timestamp": 1558290933,
"avg_size": 21679 "avgSize": 21679
}, },
... ...
], ],
"weights": [ "weights": [
{ {
"avg_height": 1517188, "avgHeight": 1517188,
"timestamp": 1558262730, "timestamp": 1558262730,
"avg_weight": 74921 "avgWeight": 74921
}, },
{ {
"avg_height": 1517275, "avgHeight": 1517275,
"timestamp": 1558290933, "timestamp": 1558290933,
"avg_weight": 65164 "avgWeight": 65164
}, },
... ...
] ]
@ -4249,27 +4249,27 @@ export const restApiDocsData = [
response: `{ response: `{
"sizes": [ "sizes": [
{ {
"avg_height": 83, "avgHeight": 83,
"timestamp": 1598937527, "timestamp": 1598937527,
"avg_size": 329 "avgSize": 329
}, },
{ {
"avg_height": 266, "avgHeight": 266,
"timestamp": 1598982991, "timestamp": 1598982991,
"avg_size": 330 "avgSize": 330
}, },
... ...
], ],
"weights": [ "weights": [
{ {
"avg_height": 83, "avgHeight": 83,
"timestamp": 1598937527, "timestamp": 1598937527,
"avg_weight": 1209 "avgWeight": 1209
}, },
{ {
"avg_height": 266, "avgHeight": 266,
"timestamp": 1598982991, "timestamp": 1598982991,
"avg_weight": 1212 "avgWeight": 1212
}, },
... ...
] ]