From 7ceb13c8cc28b6a1b46906890c285895a10fa534 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Tue, 12 Feb 2019 08:40:18 +0200 Subject: [PATCH] fix(core-api): use the supply calculator in the v1 API --- packages/core-api/src/versions/1/blocks/controller.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/core-api/src/versions/1/blocks/controller.ts b/packages/core-api/src/versions/1/blocks/controller.ts index ef791fe30b..32206d0ad3 100644 --- a/packages/core-api/src/versions/1/blocks/controller.ts +++ b/packages/core-api/src/versions/1/blocks/controller.ts @@ -1,3 +1,4 @@ +import { supplyCalculator } from "@arkecosystem/core-utils"; import { bignumify } from "@arkecosystem/core-utils"; import Boom from "boom"; import Hapi from "hapi"; @@ -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);