From 738fc5518289773c092fdcf873c21ee93701cc88 Mon Sep 17 00:00:00 2001
From: Arnaud Mimart <33665250+amimart@users.noreply.github.com>
Date: Wed, 19 Jun 2024 12:31:42 +0200
Subject: [PATCH] fix(staking): correct APR computation formula

---
 src/modules/[chain]/staking/[validator].vue | 12 +++++++-----
 src/stores/useBlockchain.ts                 |  4 +++-
 src/stores/useDistributionStore.ts          | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/modules/[chain]/staking/[validator].vue b/src/modules/[chain]/staking/[validator].vue
index d253d092..a4f883c8 100644
--- a/src/modules/[chain]/staking/[validator].vue
+++ b/src/modules/[chain]/staking/[validator].vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import { parseCoins } from '@cosmjs/stargate';
 import {
+  useBankStore,
   useBlockchain,
+  useDistributionStore,
   useFormatter,
   useMintStore,
   useStakingStore,
@@ -64,12 +66,12 @@ blockchain.rpc.getTxsBySender(addresses.value.account).then((x) => {
 });
 
 const apr = computed(() => {
-  const rate = v.value.commission?.commission_rates.rate || 0;
+  const rate = Number(v.value.commission?.commission_rates.rate || 0);
   const inflation = useMintStore().inflation;
-  if (Number(inflation)) {
-    return format.percent((1 - Number(rate)) * Number(inflation));
-  }
-  return '-';
+  const communityTax = Number(useDistributionStore().params.community_tax);
+  const bondedRatio = Number(staking.pool.bonded_tokens) / Number(useBankStore().supply.amount);
+
+  return format.percent((1 - communityTax) * (1 - rate) * Number(inflation) / bondedRatio);
 });
 
 const selfRate = computed(() => {
diff --git a/src/stores/useBlockchain.ts b/src/stores/useBlockchain.ts
index ac1ae2cc..e6a15c55 100644
--- a/src/stores/useBlockchain.ts
+++ b/src/stores/useBlockchain.ts
@@ -16,10 +16,11 @@ import { CosmosRestClient } from '@/libs/client';
 import {
   useBankStore,
   useBaseStore,
+  useDistributionStore,
   useGovStore,
   useMintStore,
   useStakingStore,
-  useWalletStore,
+  useWalletStore
 } from '.';
 import { useBlockModule } from '@/modules/[chain]/block/block';
 import { DEFAULT } from '@/libs';
@@ -151,6 +152,7 @@ export const useBlockchain = defineStore('blockchain', {
       useGovStore().initial();
       useMintStore().initial();
       useBlockModule().initial();
+      useDistributionStore().initial();
     },
 
     randomEndpoint(chainName: string) : Endpoint | undefined {
diff --git a/src/stores/useDistributionStore.ts b/src/stores/useDistributionStore.ts
index d2dc0a8f..8e398417 100644
--- a/src/stores/useDistributionStore.ts
+++ b/src/stores/useDistributionStore.ts
@@ -3,7 +3,14 @@ import { useBlockchain } from './useBlockchain';
 
 export const useDistributionStore = defineStore('distributionStore', {
   state: () => {
-    return {};
+    return {
+      params: {} as {
+        community_tax: string;
+        base_proposer_reward: string;
+        bonus_proposer_reward: string;
+        withdraw_addr_enabled: boolean;
+      },
+    };
   },
   getters: {
     blockchain() {
@@ -11,6 +18,14 @@ export const useDistributionStore = defineStore('distributionStore', {
     },
   },
   actions: {
+    initial() {
+      this.fetchParams();
+    },
+    async fetchParams() {
+      const response = await this.blockchain.rpc?.getDistributionParams();
+      if (response?.params) this.params = response.params;
+      return this.params;
+    },
     async fetchCommunityPool() {
       return this.blockchain.rpc?.getDistributionCommunityPool();
     },