This repository has been archived by the owner on Jun 11, 2024. It is now read-only.
Fixed fees calculations in getForgedByAccount endpoint #384
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MaciejBaj
reviewed
Jan 10, 2017
| @@ -761,8 +761,11 @@ shared.getForgedByAccount = function (req, cb) { | |||
| return setImmediate(cb, err[0].message); | |||
| } | |||
|
|
|||
| if (req.body.start && req.body.end) { | |||
| if (req.body.start !== undefined || req.body.end !== undefined) { | |||
There was a problem hiding this comment.
Why changed condition here?
There was a problem hiding this comment.
We should allow start/end to be 0 and search by only one border, previous cond not allow that.
MaciejBaj
reviewed
Jan 10, 2017
| modules.blocks.aggregateBlocksReward({generatorPublicKey: req.body.generatorPublicKey, start: req.body.start, end: req.body.end}, function (err, reward) { | ||
| if (err) { | ||
| return setImmediate(cb, err || 'Error calculating block rewards'); |
There was a problem hiding this comment.
you will never be able to see the 'Error calculating block rewards' here, because 'err' satisfies the condition line above
There was a problem hiding this comment.
You are right, will fix that.
MaciejBaj
reviewed
Jan 10, 2017
| 'sum (rsc.blocks) as count,', | ||
| 'sum(floor(rsc.fees/${delegates})*rsc.blocks + (CASE WHEN rsc.last = 1 THEN (rsc.fees-floor(rsc.fees/${delegates})*${delegates}) ELSE 0 END)) as fees,', | ||
| 'sum(rsc.rewards) as rewards', | ||
| 'FROM rsc' |
There was a problem hiding this comment.
@4miners: Would it be possible to move this query to a postgres view?
karmacoma
suggested changes
Jan 20, 2017
| 'sum (rsc.blocks) as count,', | ||
| 'sum(floor(rsc.fees/${delegates})*rsc.blocks + (CASE WHEN rsc.last = 1 THEN (rsc.fees-floor(rsc.fees/${delegates})*${delegates}) ELSE 0 END)) as fees,', | ||
| 'sum(rsc.rewards) as rewards', | ||
| 'FROM rsc' |
There was a problem hiding this comment.
@4miners: Would it be possible to move this query to a postgres view?
| 'FROM rs, borders)', | ||
| 'SELECT', | ||
| '(SELECT * FROM delegate) as delegate,', | ||
| 'sum (rsc.blocks) as count,', |
There was a problem hiding this comment.
@4miners Please capitalize postgres syntax such as SUM, AS. I think more clear.
| var data = rows[0]; | ||
| if (data.delegate === null) { | ||
| return setImmediate(cb, 'Account not exists or is not a delegate'); |
There was a problem hiding this comment.
@4miners Account not found or is not a delegate.
|
@karmacoma Thank you for review, fixed. For postgres view I opened another issue - #403. |
4miners
commented
Jan 24, 2017
| @@ -19,7 +19,7 @@ var RoundsSql = { | |||
|
|
|||
| updateBlockId: 'UPDATE mem_accounts SET "blockId" = ${newId} WHERE "blockId" = ${oldId};', | |||
|
|
|||
| summedRound: 'SELECT SUM(b."totalFee")::bigint AS "fees", ARRAY_AGG(b."reward") AS "rewards", ARRAY_AGG(ENCODE(b."generatorPublicKey", \'hex\')) AS "delegates" FROM blocks b WHERE (SELECT (CAST(b."height" / ${activeDelegates} AS INTEGER) + (CASE WHEN b."height" % ${activeDelegates} > 0 THEN 1 ELSE 0 END))) = ${round}' | |||
| summedRound: 'WITH round_blocks as (SELECT ((${round}-1)*${activeDelegates})+1 as min, ${round}*${activeDelegates} as max) SELECT SUM(b."totalFee")::bigint AS "fees", ARRAY_AGG(b."reward") AS "rewards", ARRAY_AGG(ENCODE(b."generatorPublicKey", \'hex\')) AS "delegates" FROM blocks b WHERE b.height BETWEEN (SELECT min FROM round_blocks) AND (SELECT max FROM round_blocks)' | |||
There was a problem hiding this comment.
From 1200-3500 msec to 0.2-0.3 msec.
Before:
EXPLAIN ANALYZE SELECT SUM(b."totalFee")::bigint AS "fees", ARRAY_AGG(b."reward") AS "rewards", ARRAY_AGG(ENCODE(b."generatorPublicKey", 'hex')) AS "delegates" FROM blocks b WHERE (SELECT (CAST(b."height" / 101 AS INTEGER) + (CASE WHEN b."height" % 101 > 0 THEN 1 ELSE 0 END))) = 17400;
After:
EXPLAIN ANALYZE WITH round_blocks as (SELECT ((17400-1)*101)+1 as min, 17400*101 as max) SELECT SUM(b."totalFee")::bigint AS "fees", ARRAY_AGG(b."reward") AS "rewards", ARRAY_AGG(ENCODE(b."generatorPublicKey", 'hex')) AS "delegates" FROM blocks b WHERE b.height BETWEEN (SELECT min FROM round_blocks) AND (SELECT max FROM round_blocks);
karmacoma
approved these changes
Jan 24, 2017
karmacoma
approved these changes
Jan 24, 2017
karmacoma
added
ready
and removed
type: test
standards
type: improvement
type: bug
labels
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
That query is little complicated and heavy, but should return very accurate results. Executing time for calculations of average active delegate: ~300ms to ~1sec.
Closes #396