From dee05c2da63237c1d9e480bf5b40fbfd72567801 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Wed, 12 Jun 2024 16:16:14 +0200
Subject: [PATCH 1/6] Fetch rank rewards

---
 src/staking-v3/logic/interfaces/DappStakingV3.ts           | 1 +
 src/staking-v3/logic/models/DappStaking.ts                 | 1 +
 src/staking-v3/logic/repositories/DappStakingRepository.ts | 1 +
 src/staking-v3/store/state.ts                              | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/staking-v3/logic/interfaces/DappStakingV3.ts b/src/staking-v3/logic/interfaces/DappStakingV3.ts
index 1d1b8bb82..f0e5acb44 100644
--- a/src/staking-v3/logic/interfaces/DappStakingV3.ts
+++ b/src/staking-v3/logic/interfaces/DappStakingV3.ts
@@ -110,6 +110,7 @@ export interface PalletDappStakingV3DAppTierRewards extends Struct {
   readonly dapps: BTreeMap<Compact<u16>, Compact<u8>>;
   readonly rewards: Vec<u128>;
   readonly period: Compact<u32>;
+  readonly rankRewards: Vec<u128>;
 }
 
 export interface PalletDappStakingV3EraInfo extends Struct {
diff --git a/src/staking-v3/logic/models/DappStaking.ts b/src/staking-v3/logic/models/DappStaking.ts
index 1bae9aac2..19ca33525 100644
--- a/src/staking-v3/logic/models/DappStaking.ts
+++ b/src/staking-v3/logic/models/DappStaking.ts
@@ -139,6 +139,7 @@ export interface DAppTierRewards {
   readonly dapps: DAppTier[];
   readonly rewards: bigint[];
   readonly period: number;
+  readonly rankRewards: bigint[];
 }
 
 export interface DAppTier {
diff --git a/src/staking-v3/logic/repositories/DappStakingRepository.ts b/src/staking-v3/logic/repositories/DappStakingRepository.ts
index 7e8ea2165..91feb18e8 100644
--- a/src/staking-v3/logic/repositories/DappStakingRepository.ts
+++ b/src/staking-v3/logic/repositories/DappStakingRepository.ts
@@ -331,6 +331,7 @@ export class DappStakingRepository implements IDappStakingRepository {
       period: tiers.period.toNumber(),
       dapps,
       rewards: tiers.rewards.map((reward) => reward.toBigInt()),
+      rankRewards: tiers.rankRewards?.map((reward) => reward.toBigInt()) ?? [0, 0, 0, 0], // for backward compatibility in case when not deployed on all networks
     };
   }
 
diff --git a/src/staking-v3/store/state.ts b/src/staking-v3/store/state.ts
index 3b8ed111b..2ae18c38f 100644
--- a/src/staking-v3/store/state.ts
+++ b/src/staking-v3/store/state.ts
@@ -68,6 +68,7 @@ export const initialDappTiersConfiguration: DAppTierRewards = {
   dapps: [],
   rewards: [],
   period: 0,
+  rankRewards: [],
 };
 
 export const initialEraLengths: EraLengths = {

From 687625418c4da60afa80998b6d2d17312dcea634 Mon Sep 17 00:00:00 2001
From: green-jay <75261756+green-jay@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:15:44 +0200
Subject: [PATCH 2/6] Add Hydration to XCM (#1315)

---
 src/assets/img/token/hdx.png                  | Bin 0 -> 16836 bytes
 src/modules/xcm/index.ts                      |  14 +++
 src/modules/xcm/tokens/index.ts               |  10 ++
 .../config/xcm/XcmRepositoryConfiguration.ts  |   2 +
 src/v2/models/XcmModels.ts                    |   2 +
 src/v2/repositories/implementations/index.ts  |   1 +
 .../xcm/HydrationXcmRepository.ts             | 109 ++++++++++++++++++
 7 files changed, 138 insertions(+)
 create mode 100644 src/assets/img/token/hdx.png
 create mode 100644 src/v2/repositories/implementations/xcm/HydrationXcmRepository.ts

diff --git a/src/assets/img/token/hdx.png b/src/assets/img/token/hdx.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b6a07963fbaedeb7165315841a4ef250dddfed0
GIT binary patch
literal 16836
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
IqURX?e}76{Pyhe`

literal 0
HcmV?d00001

diff --git a/src/modules/xcm/index.ts b/src/modules/xcm/index.ts
index ce75ac8ed..7fba14724 100644
--- a/src/modules/xcm/index.ts
+++ b/src/modules/xcm/index.ts
@@ -350,6 +350,20 @@ export let xcmChainObj: XcmChainObj = {
     subscan: 'https://unique.subscan.io',
     isAstarNativeToken: false,
   },
+  [Chain.HYDRATION]: {
+    name: Chain.HYDRATION,
+    relayChain: Chain.POLKADOT,
+    img: require('/src/assets/img/token/hdx.png'),
+    parachainId: parachainIds.HYDRATION,
+    endpoints: [
+      'wss://hydradx-rpc.dwellir.com',
+      'wss://rpc.hydradx.cloud',
+      'wss://hydradx.paras.ibp.network',
+      'wss://rpc.helikon.io/hydradx',
+    ],
+    subscan: 'https://hydration.subscan.io',
+    isAstarNativeToken: true,
+  },
 };
 
 export const xcmChains = objToArray(xcmChainObj);
diff --git a/src/modules/xcm/tokens/index.ts b/src/modules/xcm/tokens/index.ts
index 5475a0fcc..6ab948205 100644
--- a/src/modules/xcm/tokens/index.ts
+++ b/src/modules/xcm/tokens/index.ts
@@ -165,6 +165,16 @@ export const xcmToken = {
       originChain: Chain.ASSET_HUB,
       minBridgeAmount: '1',
     },
+    {
+      symbol: 'HDX',
+      isNativeToken: true,
+      assetId: '18446744073709551630',
+      originAssetId: 'HDX',
+      logo: require('/src/assets/img/token/hdx.png'),
+      isXcmCompatible: true,
+      originChain: Chain.HYDRATION,
+      minBridgeAmount: '5',
+    },
   ],
   [endpointKey.SHIDEN]: [
     {
diff --git a/src/v2/config/xcm/XcmRepositoryConfiguration.ts b/src/v2/config/xcm/XcmRepositoryConfiguration.ts
index ce634d71c..362573077 100644
--- a/src/v2/config/xcm/XcmRepositoryConfiguration.ts
+++ b/src/v2/config/xcm/XcmRepositoryConfiguration.ts
@@ -10,6 +10,7 @@ import {
   BifrostXcmRepository,
   EquilibriumXcmRepository,
   UniqueXcmRepository,
+  HydrationXcmRepository,
 } from 'src/v2/repositories/implementations';
 import { Chain } from 'src/v2/models/XcmModels';
 import { TypeMapping } from 'src/v2/config/types';
@@ -34,6 +35,7 @@ export const XcmRepositoryConfiguration: TypeMapping = {
   [Chain.BIFROST_KUSAMA]: BifrostXcmRepository,
   [Chain.EQUILIBRIUM]: EquilibriumXcmRepository,
   [Chain.UNIQUE]: UniqueXcmRepository,
+  [Chain.HYDRATION]: HydrationXcmRepository,
 };
 
 export type AstarToken = 'ASTR' | 'SDN';
diff --git a/src/v2/models/XcmModels.ts b/src/v2/models/XcmModels.ts
index cdb8e0929..5dc33e7d0 100644
--- a/src/v2/models/XcmModels.ts
+++ b/src/v2/models/XcmModels.ts
@@ -21,6 +21,7 @@ export enum Chain {
   BIFROST_KUSAMA = 'Bifrost',
   EQUILIBRIUM = 'Equilibrium',
   UNIQUE = 'Unique',
+  HYDRATION = 'Hydration',
 }
 
 export enum parachainIds {
@@ -41,6 +42,7 @@ export enum parachainIds {
   BIFROST_KUSAMA = 2001,
   EQUILIBRIUM = 2011,
   UNIQUE = 2037,
+  HYDRATION = 2034,
 }
 
 export interface XcmChain {
diff --git a/src/v2/repositories/implementations/index.ts b/src/v2/repositories/implementations/index.ts
index 4826419a3..c8699ef85 100644
--- a/src/v2/repositories/implementations/index.ts
+++ b/src/v2/repositories/implementations/index.ts
@@ -18,6 +18,7 @@ export * from './ZkBridgeRepository';
 export * from './xcm/BifrostXcmRepository';
 export * from './xcm/EquilibriumXcmRepository';
 export * from './xcm/UniqueXcmRepository';
+export * from './xcm/HydrationXcmRepository';
 export * from './NftRepository';
 export * from './AccountUnificationRepository';
 export * from './InflationRepository';
diff --git a/src/v2/repositories/implementations/xcm/HydrationXcmRepository.ts b/src/v2/repositories/implementations/xcm/HydrationXcmRepository.ts
new file mode 100644
index 000000000..d703bc223
--- /dev/null
+++ b/src/v2/repositories/implementations/xcm/HydrationXcmRepository.ts
@@ -0,0 +1,109 @@
+import { BN } from '@polkadot/util';
+import { decodeAddress } from '@polkadot/util-crypto';
+import { XcmTokenInformation } from 'src/modules/xcm';
+import { container } from 'src/v2/common';
+import { ExtrinsicPayload, IApi, IApiFactory } from 'src/v2/integration';
+import { Asset } from 'src/v2/models';
+import { XcmChain } from 'src/v2/models/XcmModels';
+import { TokensAccounts } from 'src/v2/repositories/implementations/xcm/AcalaXcmRepository';
+import { Symbols } from 'src/v2/symbols';
+import { XcmRepository } from '../XcmRepository';
+
+// Mapping object for token IDs
+const TOKEN_IDS: Record<string, { id: number }> = {
+  HDX: { id: 0 },
+  ASTR: { id: 9 },
+};
+
+export class HydrationXcmRepository extends XcmRepository {
+  constructor() {
+    const defaultApi = container.get<IApi>(Symbols.DefaultApi);
+    const apiFactory = container.get<IApiFactory>(Symbols.ApiFactory);
+    const registeredTokens = container.get<XcmTokenInformation[]>(Symbols.RegisteredTokens);
+    super(defaultApi, apiFactory, registeredTokens);
+    this.astarTokens = {
+      ASTR: 9,
+    };
+  }
+
+  public async getTransferCall(
+    from: XcmChain,
+    to: XcmChain,
+    recipientAddress: string,
+    token: Asset,
+    amount: BN,
+    endpoint: string
+  ): Promise<ExtrinsicPayload> {
+    if (!to.parachainId) {
+      throw `Parachain id for ${to.name} is not defined`;
+    }
+
+    const tokenData = TOKEN_IDS[token.originAssetId];
+    if (!tokenData) {
+      throw `Token name for ${token.originAssetId} is not defined`;
+    }
+
+    const version = 'V3';
+
+    const AccountId32 = {
+      id: decodeAddress(recipientAddress),
+    };
+
+    const destination = {
+      [version]: {
+        parents: '1',
+        interior: {
+          X2: [
+            {
+              Parachain: to.parachainId,
+            },
+            {
+              AccountId32,
+            },
+          ],
+        },
+      },
+    };
+
+    const destWeight = {
+      Unlimited: null,
+    };
+
+    return await this.buildTxCall(
+      from,
+      endpoint,
+      'xTokens',
+      'transfer',
+      tokenData,
+      amount,
+      destination,
+      destWeight
+    );
+  }
+
+  public async getTokenBalance(
+    address: string,
+    chain: XcmChain,
+    token: Asset,
+    isNativeToken: boolean,
+    endpoint: string
+  ): Promise<string> {
+    const api = await this.apiFactory.get(endpoint);
+    try {
+      if (token.originAssetId == 'HDX') {
+        return (await this.getNativeBalance(address, chain, endpoint)).toString();
+      } else {
+        const tokenData = TOKEN_IDS[token.originAssetId];
+        if (!tokenData) {
+          return '0';
+        }
+
+        const bal = await api.query.tokens.accounts<TokensAccounts>(address, tokenData);
+        return bal.free.toString();
+      }
+    } catch (e) {
+      console.error(e);
+      return '0';
+    }
+  }
+}

From 4468c48d9c97e0ec7da96a5f8ccca12de02d5e5c Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Mon, 17 Jun 2024 09:00:21 +0200
Subject: [PATCH 3/6] Add rank reward calculation

---
 src/staking-v3/logic/models/DappStaking.ts                 | 3 ++-
 src/staking-v3/logic/repositories/DappStakingRepository.ts | 3 ++-
 src/staking-v3/logic/services/DappStakingService.ts        | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/staking-v3/logic/models/DappStaking.ts b/src/staking-v3/logic/models/DappStaking.ts
index 34a296c4d..f8462ebc2 100644
--- a/src/staking-v3/logic/models/DappStaking.ts
+++ b/src/staking-v3/logic/models/DappStaking.ts
@@ -144,7 +144,8 @@ export interface DAppTierRewards {
 
 export interface DAppTier {
   readonly dappId: number;
-  readonly tierId: number | undefined;
+  readonly tierId: number;
+  readonly rank: number;
 }
 
 export interface Rewards {
diff --git a/src/staking-v3/logic/repositories/DappStakingRepository.ts b/src/staking-v3/logic/repositories/DappStakingRepository.ts
index d9a7045b5..b78131635 100644
--- a/src/staking-v3/logic/repositories/DappStakingRepository.ts
+++ b/src/staking-v3/logic/repositories/DappStakingRepository.ts
@@ -382,7 +382,8 @@ export class DappStakingRepository implements IDappStakingRepository {
     tiers.dapps.forEach((value, key) =>
       dapps.push({
         dappId: key.toNumber(),
-        tierId: value.toNumber(),
+        tierId: value.toNumber() & 0xf,
+        rank: value.toNumber() >> 4,
       })
     );
     return {
diff --git a/src/staking-v3/logic/services/DappStakingService.ts b/src/staking-v3/logic/services/DappStakingService.ts
index 9a0e287ad..477f1eec6 100644
--- a/src/staking-v3/logic/services/DappStakingService.ts
+++ b/src/staking-v3/logic/services/DappStakingService.ts
@@ -576,7 +576,9 @@ export class DappStakingService extends SignerService implements IDappStakingSer
         if (tierReward) {
           const dApp = tierReward?.dapps.find((d) => d.dappId === dapp.id);
           if (dApp && dApp.tierId !== undefined) {
-            result.rewards += tierReward.rewards[dApp.tierId];
+            result.rewards +=
+              tierReward.rewards[dApp.tierId] +
+              BigInt(dApp.rank) * tierReward.rankRewards[dApp.tierId];
             result.erasToClaim.push(firstEra + index);
           }
         }

From 42fca5e16592e1e0a6be06b3f8a1600d1cb55ff7 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Mon, 17 Jun 2024 09:44:04 +0200
Subject: [PATCH 4/6] Map rankTier

---
 src/staking-v3/hooks/useLeaderboard.ts        |  8 +++----
 .../repositories/DappStakingRepository.ts     | 22 ++++++++++++-------
 .../repositories/IDappStakingRepository.ts    |  3 ++-
 src/staking-v3/store/getters.ts               |  3 ++-
 src/staking-v3/store/mutations.ts             |  3 ++-
 src/staking-v3/store/state.ts                 |  5 +++--
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/staking-v3/hooks/useLeaderboard.ts b/src/staking-v3/hooks/useLeaderboard.ts
index a716d860c..1a3ef0119 100644
--- a/src/staking-v3/hooks/useLeaderboard.ts
+++ b/src/staking-v3/hooks/useLeaderboard.ts
@@ -1,5 +1,5 @@
 import { watch, ref, computed } from 'vue';
-import { CombinedDappInfo, PeriodType, useDappStaking, useDapps } from '..';
+import { CombinedDappInfo, DAppTier, PeriodType, useDappStaking, useDapps } from '..';
 import { useStore } from 'src/store';
 import { sort } from 'src/v2/common';
 
@@ -9,7 +9,7 @@ export function useLeaderboard() {
   const { dAppTiers, protocolState, eraLengths } = useDappStaking();
   // Map key is a dApp tier.
   const leaderBoards = ref<Map<number, CombinedDappInfo[]>>(new Map());
-  const leaderboard = computed<Map<number, number>>(
+  const leaderboard = computed<Map<number, DAppTier>>(
     () => store.getters['stakingV3/getLeaderboard']
   );
 
@@ -43,8 +43,8 @@ export function useLeaderboard() {
     ]);
 
     sortedDapps.value.forEach((dapp) => {
-      const tier = leaderboard.value.get(dapp.chain.id);
-      tier !== undefined && leaderBoards.value.get(tier + 1)?.push(dapp);
+      const dappTier = leaderboard.value.get(dapp.chain.id);
+      dappTier !== undefined && leaderBoards.value.get(dappTier.tierId + 1)?.push(dapp);
     });
   };
 
diff --git a/src/staking-v3/logic/repositories/DappStakingRepository.ts b/src/staking-v3/logic/repositories/DappStakingRepository.ts
index b78131635..cbdfbbf4b 100644
--- a/src/staking-v3/logic/repositories/DappStakingRepository.ts
+++ b/src/staking-v3/logic/repositories/DappStakingRepository.ts
@@ -380,11 +380,7 @@ export class DappStakingRepository implements IDappStakingRepository {
     const tiers = tiersWrapped.unwrap();
     const dapps: DAppTier[] = [];
     tiers.dapps.forEach((value, key) =>
-      dapps.push({
-        dappId: key.toNumber(),
-        tierId: value.toNumber() & 0xf,
-        rank: value.toNumber() >> 4,
-      })
+      dapps.push(this.mapDappTier(key.toNumber(), value.toNumber()))
     );
     return {
       period: tiers.period.toNumber(),
@@ -395,7 +391,7 @@ export class DappStakingRepository implements IDappStakingRepository {
   }
 
   //* @inheritdoc
-  public async getLeaderboard(): Promise<Map<number, number>> {
+  public async getLeaderboard(): Promise<Map<number, DAppTier>> {
     const api = await this.api.getApi();
     const tierAssignmentsBytes = await api.rpc.state.call(
       'DappStakingApi_get_dapp_tier_assignment',
@@ -403,8 +399,10 @@ export class DappStakingRepository implements IDappStakingRepository {
     );
     const tierAssignment = api.createType('BTreeMap<u16, u8>', tierAssignmentsBytes);
 
-    const result = new Map<number, number>();
-    tierAssignment.forEach((value, key) => result.set(key.toNumber(), value.toNumber()));
+    const result = new Map<number, DAppTier>();
+    tierAssignment.forEach((value, key) =>
+      result.set(key.toNumber(), this.mapDappTier(key.toNumber(), value.toNumber()))
+    );
 
     return result;
   }
@@ -629,4 +627,12 @@ export class DappStakingRepository implements IDappStakingRepository {
     console.log('Staker info size: ' + result.size);
     return result;
   }
+
+  private mapDappTier(dappId: number, rankTier: number): DAppTier {
+    return {
+      dappId: dappId,
+      tierId: rankTier & 0xf,
+      rank: rankTier >> 4,
+    };
+  }
 }
diff --git a/src/staking-v3/logic/repositories/IDappStakingRepository.ts b/src/staking-v3/logic/repositories/IDappStakingRepository.ts
index 1821d085a..c3cd92063 100644
--- a/src/staking-v3/logic/repositories/IDappStakingRepository.ts
+++ b/src/staking-v3/logic/repositories/IDappStakingRepository.ts
@@ -3,6 +3,7 @@ import {
   AccountLedger,
   Constants,
   ContractStakeAmount,
+  DAppTier,
   DAppTierRewards,
   Dapp,
   DappBase,
@@ -212,7 +213,7 @@ export interface IDappStakingRepository {
   /**
    * Gets dApps tier assignment map.
    */
-  getLeaderboard(): Promise<Map<number, number>>;
+  getLeaderboard(): Promise<Map<number, DAppTier>>;
 
   /**
    * Gets a call to the legacy code to support v2 ledger stakers to unlock their funds.
diff --git a/src/staking-v3/store/getters.ts b/src/staking-v3/store/getters.ts
index 3cd37ab2e..d0e109326 100644
--- a/src/staking-v3/store/getters.ts
+++ b/src/staking-v3/store/getters.ts
@@ -14,6 +14,7 @@ import {
   TiersConfiguration,
   EraLengths,
   DappInfo,
+  DAppTier,
 } from '../logic';
 
 export interface DappStakingGetters {
@@ -30,7 +31,7 @@ export interface DappStakingGetters {
   getDappTiers(state: DappStakingState): DAppTierRewards;
   getTiersConfiguration(state: DappStakingState): TiersConfiguration;
   getEraLengths(state: DappStakingState): EraLengths;
-  getLeaderboard(state: DappStakingState): Map<number, number>;
+  getLeaderboard(state: DappStakingState): Map<number, DAppTier>;
 }
 
 const getters: GetterTree<DappStakingState, StateInterface> & DappStakingGetters = {
diff --git a/src/staking-v3/store/mutations.ts b/src/staking-v3/store/mutations.ts
index 1535a197c..7e36eb6c7 100644
--- a/src/staking-v3/store/mutations.ts
+++ b/src/staking-v3/store/mutations.ts
@@ -15,6 +15,7 @@ import {
   TiersConfiguration,
   EraLengths,
   ProviderDappData,
+  DAppTier,
 } from '../logic';
 
 export interface DappStakingMutations<S = DappStakingState> {
@@ -37,7 +38,7 @@ export interface DappStakingMutations<S = DappStakingState> {
   setDappTiers(state: DappStakingState, dAppTiers: DAppTierRewards): void;
   setTiersConfiguration(state: DappStakingState, tiersConfiguration: TiersConfiguration): void;
   setEraLengths(state: DappStakingState, eraLengths: EraLengths): void;
-  setLeaderboard(state: DappStakingState, leaderboard: Map<number, number>): void;
+  setLeaderboard(state: DappStakingState, leaderboard: Map<number, DAppTier>): void;
 }
 
 const updateDapp = <T>(
diff --git a/src/staking-v3/store/state.ts b/src/staking-v3/store/state.ts
index cd159d494..3d82e9274 100644
--- a/src/staking-v3/store/state.ts
+++ b/src/staking-v3/store/state.ts
@@ -11,6 +11,7 @@ import {
   TiersConfiguration,
   EraLengths,
   DappInfo,
+  DAppTier,
 } from '../logic';
 
 export interface DappStakingState {
@@ -27,7 +28,7 @@ export interface DappStakingState {
   dAppTiers: DAppTierRewards;
   tiersConfiguration: TiersConfiguration;
   eraLengths: EraLengths;
-  leaderboard: Map<number, number>;
+  leaderboard: Map<number, DAppTier>;
 }
 
 function state(): DappStakingState {
@@ -45,7 +46,7 @@ function state(): DappStakingState {
     dAppTiers: initialDappTiersConfiguration,
     tiersConfiguration: initialTiersConfiguration,
     eraLengths: initialEraLengths,
-    leaderboard: new Map<number, number>(),
+    leaderboard: new Map<number, DAppTier>(),
   };
 }
 

From 92912a09e6bc848f492df4f20e6498d72526fb1e Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Wed, 19 Jun 2024 11:14:10 +0200
Subject: [PATCH 5/6] Type bug fix

---
 src/staking-v3/logic/repositories/DappStakingRepository.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/staking-v3/logic/repositories/DappStakingRepository.ts b/src/staking-v3/logic/repositories/DappStakingRepository.ts
index cbdfbbf4b..261bfa195 100644
--- a/src/staking-v3/logic/repositories/DappStakingRepository.ts
+++ b/src/staking-v3/logic/repositories/DappStakingRepository.ts
@@ -386,7 +386,12 @@ export class DappStakingRepository implements IDappStakingRepository {
       period: tiers.period.toNumber(),
       dapps,
       rewards: tiers.rewards.map((reward) => reward.toBigInt()),
-      rankRewards: tiers.rankRewards?.map((reward) => reward.toBigInt()) ?? [0, 0, 0, 0], // for backward compatibility in case when not deployed on all networks
+      rankRewards: tiers.rankRewards?.map((reward) => reward.toBigInt()) ?? [
+        BigInt(0),
+        BigInt(0),
+        BigInt(0),
+        BigInt(0),
+      ], // for backward compatibility in case when not deployed on all networks
     };
   }
 

From edf449545fe1abc37f8f06e7dd55adf1b4082457 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Thu, 20 Jun 2024 08:59:32 +0200
Subject: [PATCH 6/6] voting banner wording fix

---
 src/i18n/en-US/index.ts                      | 2 +-
 src/staking-v3/components/PeriodInfoVote.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index efb2c0d28..f368eb759 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -1050,7 +1050,7 @@ export default {
     percentageLocked: 'Percentage of Supply Locked',
     unclaimedRewards: 'Unclaimed rewards',
     rewardsClaimedOnStake: 'Rewards will be claimed when stake',
-    ifYouStakeNow: 'If you stake now',
+    ifYouStakeNow: 'Basic APR + Bonus (If you stake now)',
     defiDescription: 'Discover the world of decentralized finance solutions on Astar.',
     'unstoppable-grantsDescription':
       'Support projects in the Unstoppable Community Grants program, powered by dApp staking.',
diff --git a/src/staking-v3/components/PeriodInfoVote.vue b/src/staking-v3/components/PeriodInfoVote.vue
index 1a2e494e6..463302c56 100644
--- a/src/staking-v3/components/PeriodInfoVote.vue
+++ b/src/staking-v3/components/PeriodInfoVote.vue
@@ -41,7 +41,7 @@
         </div>
         <div class="reward-info">
           <div class="reward-label">
-            <div>{{ $t('stakingV3.basicAprPlusBonus') }}</div>
+            <div>{{ $t('stakingV3.estimatedRewards') }}</div>
             <div>{{ $t('stakingV3.ifYouStakeNow') }}</div>
           </div>
           <div class="percentage">