Skip to content

fix(core-api): use the supply calculator in the v1 API #2083

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.

Sign up for GitHub

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

Merged
j-a-m-l merged 1 commit into from
Feb 12, 2019
Merged

fix(core-api): use the supply calculator in the v1 API #2083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions packages/core-api/src/versions/1/blocks/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { supplyCalculator } from "@arkecosystem/core-utils";
import { bignumify } from "@arkecosystem/core-utils";
import Boom from "boom";
import Hapi from "hapi";
Expand Down Expand Up @@ -105,14 +106,8 @@ export class BlocksController extends Controller {

public async supply(request: Hapi.Request, h: Hapi.ResponseToolkit) {
try {
const lastBlock = this.blockchain.getLastBlock();
const constants = this.config.getMilestone(lastBlock.data.height);
const rewards = bignumify(constants.reward).times(lastBlock.data.height - constants.height);

return super.respondWith({
supply: +bignumify(this.config.get("genesisBlock.totalAmount"))
.plus(rewards)
.toFixed(),
supply: supplyCalculator.calculate(this.blockchain.getLastBlock().data.height),
});
} catch (error) {
return Boom.badImplementation(error);
Expand Down