Merge pull request #37 from axone-protocol/fix/update-bonded-tokens-f…

…ormula

fix: updated bonded tokens formula

src/core/lib/okp4/enums/endpoints.enum.ts

@@ -12,4 +12,5 @@ export enum Endpoints {
   GOV_PARAMS = 'cosmos/gov/v1/params/:params_type',
   GOV_PROPOSALS = 'cosmos/gov/v1/proposals',
   GOV_PROPOSAL = 'cosmos/gov/v1/proposals/:proposal_id',
+  STAKING_POOL = 'cosmos/staking/v1beta1/pool',
 }

src/core/lib/okp4/okp4.service.ts

@@ -12,7 +12,6 @@ import { DelegatorValidatorsResponse } from "./responses/delegators-validators.r
 import { DelegatorsRewardsResponse } from "./responses/delegators-rewards.response";
 import { SpendableBalancesResponse } from "./responses/spendable-balances.response";
 import { SupplyResponse } from "./responses/supply.response";
-import { ValidatorStatus } from "./enums/validator-status.enum";
 import { ValidatorDelegationsResponse } from "./responses/validator-delegations.response";
 import { fromBase64, toBase64, fromHex, toHex } from "@cosmjs/encoding";
 import { sha256 } from "@cosmjs/crypto";
@@ -24,6 +23,8 @@ import { GovType } from "./enums/gov-type.enum";
 import { GovParamsResponse } from "./responses/gov-params.response";
 import { GetProposalsResponse } from "./responses/get-proposals.response";
 import { GetProposalResponse } from "@core/lib/okp4/responses/get-proposal.response";
+import { StakingPoolResponse } from "./responses/staking-pool.response";
+import { ValidatorStatus } from "./enums/validator-status.enum";
 
 @Injectable()
 export class Okp4Service {
@@ -240,4 +241,8 @@ export class Okp4Service {
   ): response is FailedResponse {
     return (response as FailedResponse).message !== undefined;
   }
+
+  async getStakingPool(): Promise<StakingPoolResponse> {
+    return this.getWithErrorHandling(this.constructUrl(Endpoints.STAKING_POOL));
+  }
 }

src/core/lib/okp4/responses/staking-pool.response.ts

@@ -0,0 +1,6 @@
+export interface StakingPoolResponse {
+  pool: {
+    not_bonded_tokens: string;
+    bonded_tokens: string;
+  };
+}

src/modules/staking/services/staking.service.ts

@@ -155,6 +155,7 @@ export class StakingService implements OnModuleInit {
       this.okp4Service.getBondValidators(),
       this.osmosisService.getStakingApr(),
       this.fetchTotalSupply(),
+      this.okp4Service.getStakingPool(),
     ]);
 
     const totalStaked = this.calculateTotalStaked(rez[0].validators);
@@ -163,7 +164,7 @@ export class StakingService implements OnModuleInit {
       totalValidators: rez[0].pagination.total,
       apr: rez[1],
       totalStaked,
-      bondedTokens: Big(totalStaked).div(rez[2]!.amount).toString(),
+      bondedTokens: Big(rez[3].pool.bonded_tokens).div(rez[2]!.amount).toString(),
     };
 
     await this.cache.setGlobalStakedOverview(dto);