Darwinia staking

packages/apps-config/src/endpoints/testing.ts

@@ -4,7 +4,7 @@
 import type { EndpointOption } from './types';
 
 import { chains3dpassPNG, chainsAcalaSVG, chainsAlephSVG, chainsBrainstormPNG, chainsCreditcoinTestPNG, chainsDebioSVG, chainsEquilibriumSVG, chainsFerrumPNG, chainsKintsugiPNG, chainsLogionPNG, chainsMyriadPNG, chainsShidenPNG, chainsSkyekiwiPNG, chainsTanglePNG, chainsVaraSVG } from '../ui/logos/chains';
-import { nodesAjunaPNG, nodesArcticPNG, nodesAresGladiosSVG, nodesAutomataPNG, nodesBifrostSVG, nodesBitcountryPNG, nodesCessPNG, nodesCloverSVG, nodesCrustMaxwellSVG, nodesDatahighwayPNG, nodesDockPNG, nodesDolphinSVG, nodesDotmogSVG, nodesEdgewareWhitePNG, nodesEncointerBlueSVG, nodesFantourPNG, nodesGalitalLogoPNG, nodesGamepowerSVG, nodesGeekSVG, nodesInterlaySVG, nodesIpsePNG, nodesJazPNG, nodesJupiterSVG, nodesKhalaSVG, nodesKiltPNG, nodesKlugPNG, nodesKylinPNG, nodesLaminarCircleSVG, nodesLitentryPNG, nodesMantaPNG, nodesMathSVG, nodesMinixPNG, nodesMoonbaseAlphaPNG, nodesMybankPNG, nodesNftmartPNG, nodesNodleSVG, nodesOpalLogoPNG, nodesOpportunityPNG, nodesPangolinSVG, nodesPangoroSVG, nodesPhalaSVG, nodesPhoenixPNG, nodesPichiuPNG, nodesPolkadexSVG, nodesPolkafoundrySVG, nodesPolymeshSVG, nodesPontemSVG, nodesPrismPNG, nodesRealisPNG, nodesRiochainSVG, nodesSherpaxPNG, nodesSoonsocialPNG, nodesSoraSubstrateSVG, nodesSubdaoPNG, nodesSubgameSVG, nodesSubspacePNG, nodesTernoaSVG, nodesThebifrostPNG, nodesUniartsPNG, nodesUniqueSVG, nodesUnitnetworkPNG, nodesWeb3gamesSVG, nodesZCloakSVG, nodesZeitgeistPNG } from '../ui/logos/nodes';
+import { nodesAjunaPNG, nodesArcticPNG, nodesAresGladiosSVG, nodesAutomataPNG, nodesBifrostSVG, nodesBitcountryPNG, nodesCessPNG, nodesCloverSVG, nodesCrustMaxwellSVG, nodesDatahighwayPNG, nodesDockPNG, nodesDolphinSVG, nodesDotmogSVG, nodesEdgewareWhitePNG, nodesEncointerBlueSVG, nodesFantourPNG, nodesGalitalLogoPNG, nodesGamepowerSVG, nodesGeekSVG, nodesInterlaySVG, nodesIpsePNG, nodesJazPNG, nodesJupiterSVG, nodesKhalaSVG, nodesKiltPNG, nodesKlugPNG, nodesKylinPNG, nodesLaminarCircleSVG, nodesLitentryPNG, nodesMantaPNG, nodesMathSVG, nodesMinixPNG, nodesMoonbaseAlphaPNG, nodesMybankPNG, nodesNftmartPNG, nodesNodleSVG, nodesOpalLogoPNG, nodesOpportunityPNG, nodesPangoroSVG, nodesPhalaSVG, nodesPhoenixPNG, nodesPichiuPNG, nodesPolkadexSVG, nodesPolkafoundrySVG, nodesPolymeshSVG, nodesPontemSVG, nodesPrismPNG, nodesRealisPNG, nodesRiochainSVG, nodesSherpaxPNG, nodesSoonsocialPNG, nodesSoraSubstrateSVG, nodesSubdaoPNG, nodesSubgameSVG, nodesSubspacePNG, nodesTernoaSVG, nodesThebifrostPNG, nodesUniartsPNG, nodesUniqueSVG, nodesUnitnetworkPNG, nodesWeb3gamesSVG, nodesZCloakSVG, nodesZeitgeistPNG } from '../ui/logos/nodes';
 
 export * from './testingRelayRococo';
 export * from './testingRelayWestend';
@@ -593,17 +593,6 @@ export const testChains: EndpointOption[] = [
       logo: nodesOpportunityPNG
     }
   },
-  {
-    info: 'pangolin',
-    providers: {
-      'Darwinia Network': 'wss://pangolin-rpc.darwinia.network'
-    },
-    text: 'Pangolin',
-    ui: {
-      color: '#4B30DD',
-      logo: nodesPangolinSVG
-    }
-  },
   {
     info: 'pangoro',
     providers: {

packages/apps-config/src/endpoints/testingRelayRococo.ts

@@ -360,9 +360,9 @@ export const testParasRococo: EndpointOption[] = [
     info: 'rococoPangolin',
     paraId: 2105,
     providers: {
-      // 'Darwinia Network': 'wss://pangolin-parachain-rpc.darwinia.network' // https://github.com/polkadot-js/apps/issues/9005
+      'Darwinia Network': 'wss://pangolin-rpc.darwinia.network'
     },
-    text: 'Pangolin',
+    text: 'Pangolin 2',
     ui: {
       color: '#4B30DD',
       logo: nodesPangolinSVG

packages/apps-routing/src/staking.ts

@@ -1,6 +1,7 @@
 // Copyright 2017-2023 @polkadot/apps-routing authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { ExposureT as DarwiniaStakingStructsExposure } from '@darwinia/types/interfaces/darwiniaInject';
 import type { TFunction } from 'i18next';
 import type { ApiPromise } from '@polkadot/api';
 import type { PalletStakingExposure } from '@polkadot/types/lookup';
@@ -14,6 +15,21 @@ import { assert, BN_ONE } from '@polkadot/util';
 function needsApiCheck (api: ApiPromise): boolean {
   try {
     // we need a known Exposure type
+    const storageType = unwrapStorageType(api.registry, api.query.staking.erasStakers.creator.meta.type);
+
+    if (storageType.toString() === 'DarwiniaStakingStructsExposure') {
+      const { others: [{ ktonBalance, power, ringBalance, who }], ownRingBalance, ownKtonBalance, ownPower, totalPower } = api.registry.createType<DarwiniaStakingStructsExposure>(
+        storageType,
+        { others: [{ ktonBalance: BN_ONE, power: BN_ONE, ringBalance: BN_ONE, who: TEST_ADDR }], ownKtonBalance: BN_ONE, ownPower: BN_ONE, ownRingBalance: BN_ONE, totalPower: BN_ONE }
+      );
+
+      assert(ownRingBalance.eq(BN_ONE) && ownKtonBalance.eq(BN_ONE) && ownPower.eq(BN_ONE) &&
+        totalPower.eq(BN_ONE) && who.eq(TEST_ADDR) && ringBalance.eq(BN_ONE) &&
+        ktonBalance.eq(BN_ONE) && power.eq(BN_ONE), 'Exposure type may have been changed');
+
+      return true;
+    }
+
     const { others: [{ value, who }], own, total } = api.registry.createType<PalletStakingExposure>(
       unwrapStorageType(api.registry, api.query.staking.erasStakers.creator.meta.type),
       { others: [{ value: BN_ONE, who: ZERO_ACCOUNT }], own: BN_ONE, total: BN_ONE }

packages/apps/public/locales/en/app-staking.json

@@ -281,6 +281,7 @@
   "points": "points",
   "pool id": "pool id",
   "pools": "pools",
+  "power": "power",
   "prev": "prev",
   "rebag from account": "rebag from account",
   "rebonded amount": "rebonded amount",

packages/apps/public/locales/en/react-query.json

@@ -1,4 +1,5 @@
 {
   "Unknown": "Unknown",
-  "everything": "everything"
+  "everything": "everything",
+  "power": "power"
 }

packages/apps/public/locales/zh/translation.json

@@ -1168,6 +1168,7 @@
   "points": "得分",
   "poll on token decimals": "投票代币小数点",
   "pot": "池",
+  "power": "power",
   "preimage hash": "预像哈希",
   "preimage {{hash}}": "预像{{hash}}",
   "prev": "上一步",

packages/page-staking/src/Actions/Account/BondExtra.tsx

@@ -7,6 +7,7 @@ import type { AmountValidateState } from '../types';
 import React, { useMemo, useState } from 'react';
 
 import { ApiPromise } from '@polkadot/api';
+import { rpcNetwork } from '@polkadot/react-api/util/getEnvironment';
 import { InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components';
 import { useApi, useCall } from '@polkadot/react-hooks';
 import { BalanceFree } from '@polkadot/react-query';
@@ -22,11 +23,17 @@ interface Props {
   stashId: string;
 }
 
-function calcBalance (api: ApiPromise, stakingInfo?: DeriveStakingAccount, stashBalance?: DeriveBalancesAll): BN | null {
+function calcBalance (api: ApiPromise, stakingInfo?: DeriveStakingAccount, stashBalance?: DeriveBalancesAll, isDarwinia?: boolean): BN | null {
   if (stakingInfo && stakingInfo.stakingLedger && stashBalance) {
     const sumUnlocking = (stakingInfo.unlocking || []).reduce((acc, { value }) => acc.iadd(value), new BN(0));
     const redeemable = stakingInfo.redeemable || BN_ZERO;
-    const available = stashBalance.freeBalance.sub(stakingInfo.stakingLedger.active?.unwrap() || BN_ZERO).sub(sumUnlocking).sub(redeemable);
+    let available;
+
+    if (isDarwinia) {
+      available = stashBalance.freeBalance.sub(stashBalance.lockedBalance);
+    } else {
+      available = stashBalance.freeBalance.sub(stakingInfo.stakingLedger.active?.unwrap() || BN_ZERO).sub(sumUnlocking).sub(redeemable);
+    }
 
     return available.gt(api.consts.balances.existentialDeposit)
       ? available.sub(api.consts.balances.existentialDeposit)
@@ -46,12 +53,25 @@ function BondExtra ({ controllerId, onClose, stakingInfo, stashId }: Props): Rea
     () => stakingInfo && stakingInfo.stakingLedger?.active?.unwrap(),
     [stakingInfo]
   );
+  const isDarwinia = rpcNetwork.isDarwinia();
 
   const startBalance = useMemo(
-    () => calcBalance(api, stakingInfo, stashBalance),
-    [api, stakingInfo, stashBalance]
+    () => calcBalance(api, stakingInfo, stashBalance, isDarwinia),
+    [api, isDarwinia, stakingInfo, stashBalance]
   );
 
+  const getDarwiniaQueryParams = () => {
+    /* Default promise months to zero since the user has no option to change the number of
+    * months that he wants to freeze his tokens like the way it is for the Darwinia Apps website */
+    const promiseMonths = 0;
+
+    if (!maxAdditional) {
+      return [{ ringbalance: '0' }, promiseMonths];
+    }
+
+    return [{ ringbalance: maxAdditional?.toString() }, promiseMonths];
+  };
+
   return (
     <Modal
       header= {t<string>('Bond more funds')}
@@ -98,7 +118,7 @@ function BondExtra ({ controllerId, onClose, stakingInfo, stashId }: Props): Rea
           isDisabled={!maxAdditional?.gt(BN_ZERO) || !!amountError?.error}
           label={t<string>('Bond more')}
           onStart={onClose}
-          params={[maxAdditional]}
+          params={isDarwinia ? getDarwiniaQueryParams() : [maxAdditional]}
           tx={api.tx.staking.bondExtra}
         />
       </Modal.Actions>

packages/page-staking/src/Actions/Account/Rebond.tsx

@@ -5,8 +5,10 @@ import type { DeriveStakingAccount } from '@polkadot/api-derive/types';
 
 import React, { useMemo, useState } from 'react';
 
+import { rpcNetwork } from '@polkadot/react-api/util/getEnvironment';
 import { InputBalance, Modal, TxButton } from '@polkadot/react-components';
-import { useApi } from '@polkadot/react-hooks';
+import { DarwiniaStakingStructsStakingLedger } from '@polkadot/react-components/types';
+import { useApi, useBestNumber } from '@polkadot/react-hooks';
 import { BN, BN_ZERO } from '@polkadot/util';
 
 import { useTranslation } from '../../translate';
@@ -24,14 +26,39 @@ function Rebond ({ controllerId, onClose, stakingInfo, stashId }: Props): React.
   const { t } = useTranslation();
   const { api } = useApi();
   const [maxAdditional, setMaxAdditional] = useState<BN | undefined>();
+  const currentBlock = useBestNumber();
+  const isDarwinia = rpcNetwork.isDarwinia();
 
   const startBalance = useMemo(
-    () => stakingInfo && stakingInfo.unlocking
-      ? stakingInfo.unlocking.reduce((total, { value }) => total.iadd(value), new BN(0))
-      : BN_ZERO,
-    [stakingInfo]
+    () => {
+      if (isDarwinia) {
+        if (!stakingInfo || !stakingInfo.stakingLedger || !currentBlock) {
+          return BN_ZERO;
+        }
+
+        const darwiniaStakingLedger = stakingInfo.stakingLedger as unknown as DarwiniaStakingStructsStakingLedger;
+        const unbondings = darwiniaStakingLedger.ringStakingLock.unbondings.filter((item) => item.until.gt(currentBlock));
+
+        return unbondings.reduce((accumulator, item) => accumulator.add(item.amount), BN_ZERO);
+      }
+
+      return stakingInfo && stakingInfo.unlocking
+        ? stakingInfo.unlocking.reduce((total, { value }) => total.iadd(value), new BN(0))
+        : BN_ZERO;
+    },
+    [currentBlock, isDarwinia, stakingInfo]
   );
 
+  const getDarwiniaQueryParams = () => {
+    const ktonBalance = BN_ZERO;
+
+    if (!maxAdditional) {
+      return [BN_ZERO, ktonBalance];
+    }
+
+    return [maxAdditional, ktonBalance];
+  };
+
   return (
     <Modal
       header= {t<string>('Bond more funds')}
@@ -62,7 +89,7 @@ function Rebond ({ controllerId, onClose, stakingInfo, stashId }: Props): React.
           isDisabled={!maxAdditional || maxAdditional.isZero() || !startBalance || maxAdditional.gt(startBalance)}
           label={t<string>('Rebond')}
           onStart={onClose}
-          params={[maxAdditional]}
+          params={isDarwinia ? getDarwiniaQueryParams() : [maxAdditional]}
           tx={api.tx.staking.rebond}
         />
       </Modal.Actions>

packages/page-staking/src/Actions/index.tsx

@@ -9,7 +9,9 @@ import type { SortedTargets } from '../types';
 
 import React, { useMemo, useRef, useState } from 'react';
 
+import { rpcNetwork } from '@polkadot/react-api/util/getEnvironment';
 import { Button, ToggleGroup } from '@polkadot/react-components';
+import { DarwiniaStakingStructsStakingLedger } from '@polkadot/react-components/types';
 import { useApi, useAvailableSlashes } from '@polkadot/react-hooks';
 import { FormatBalance } from '@polkadot/react-query';
 import { BN, BN_ZERO } from '@polkadot/util';
@@ -53,7 +55,7 @@ function sortStashes (a: StakerState, b: StakerState): number {
   return assignValue(a) - assignValue(b);
 }
 
-function extractState (ownStashes?: StakerState[]): State {
+function extractState (ownStashes?: StakerState[], isDarwinia?: boolean): State {
   if (!ownStashes) {
     return {};
   }
@@ -64,9 +66,23 @@ function extractState (ownStashes?: StakerState[]): State {
   const bondedTotal = new BN(0);
 
   ownStashes.forEach(({ isStashNominating, isStashValidating, stakingLedger }): void => {
-    const value = stakingLedger && stakingLedger.total
-      ? stakingLedger.total.unwrap()
-      : BN_ZERO;
+    let value;
+
+    if (isDarwinia && stakingLedger) {
+      const darwiniaStakingLedger = stakingLedger as unknown as DarwiniaStakingStructsStakingLedger;
+      /* calculate total bonded RING */
+      const allStakingRing = (darwiniaStakingLedger.active || darwiniaStakingLedger.activeRing || BN_ZERO).toBn();
+      const lockedRing = (darwiniaStakingLedger.activeDepositRing?.unwrap() || BN_ZERO);
+      const bondedRing = allStakingRing.sub(lockedRing);
+
+      const unbondingAndUnbonded = darwiniaStakingLedger.ringStakingLock.unbondings.reduce((accumulator, item) => accumulator.add(item.amount), new BN(0));
+
+      value = unbondingAndUnbonded.add(bondedRing);
+    } else {
+      value = stakingLedger && stakingLedger.total
+        ? stakingLedger.total.unwrap()
+        : BN_ZERO;
+    }
 
     bondedTotal.iadd(value);
 
@@ -121,6 +137,7 @@ function Actions ({ className = '', isInElection, minCommission, ownPools, ownSt
   const allSlashes = useAvailableSlashes();
   const [accTypeIndex, setAccTypeIndex] = useState(0);
   const [stashTypeIndex, setStashTypeIndex] = useState(0);
+  const isDarwinia = rpcNetwork.isDarwinia();
 
   const accTypes = useRef([
     { text: t<string>('Stashed'), value: 'stash' },
@@ -135,8 +152,8 @@ function Actions ({ className = '', isInElection, minCommission, ownPools, ownSt
   ]);
 
   const state = useMemo(
-    () => extractState(ownStashes),
-    [ownStashes]
+    () => extractState(ownStashes, isDarwinia),
+    [isDarwinia, ownStashes]
   );
 
   const [filtered, footer] = useMemo(
@@ -170,16 +187,22 @@ function Actions ({ className = '', isInElection, minCommission, ownPools, ownSt
               options={stashTypes.current}
               value={stashTypeIndex}
             />
-            <NewNominator
-              isInElection={isInElection}
-              targets={targets}
-            />
-            <NewValidator
-              isInElection={isInElection}
-              minCommission={minCommission}
-              targets={targets}
-            />
-            <NewStash />
+            {
+              !isDarwinia && (
+                <>
+                  <NewNominator
+                    isInElection={isInElection}
+                    targets={targets}
+                  />
+                  <NewValidator
+                    isInElection={isInElection}
+                    minCommission={minCommission}
+                    targets={targets}
+                  />
+                  <NewStash />
+                </>
+              )
+            }
           </>
         )}
       </Button.Group>

packages/page-staking/src/Actions/useUnbondDuration.ts

@@ -2,22 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { DeriveSessionInfo } from '@polkadot/api-derive/types';
-import type { BN } from '@polkadot/util';
 
 import { useMemo } from 'react';
 
+import { rpcNetwork } from '@polkadot/react-api/util/getEnvironment';
 import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks';
-import { BN_ONE } from '@polkadot/util';
+import { BN, BN_ONE } from '@polkadot/util';
 
 function useUnbondDurationImpl (): BN | undefined {
   const { api } = useApi();
   const sessionInfo = useCall<DeriveSessionInfo>(api.derive.session.info);
+  const isDarwinia = rpcNetwork.isDarwinia();
 
   return useMemo(
     () => (sessionInfo && sessionInfo.sessionLength.gt(BN_ONE))
-      ? sessionInfo.eraLength.mul(api.consts.staking.bondingDuration)
+      ? (() => {
+        if (isDarwinia) {
+          return new BN(api.consts.staking.bondingDurationInBlockNumber.toString());
+        }
+
+        return sessionInfo.eraLength.mul(api.consts.staking.bondingDuration);
+      })()
       : undefined,
-    [api, sessionInfo]
+    [api, sessionInfo, isDarwinia]
   );
 }
 

packages/page-staking/src/Query/util.ts

@@ -18,3 +18,18 @@ export function balanceToNumber (amount: BN | ToBN = BN_ZERO, divisor: BN): numb
 
   return value.mul(BN_THOUSAND).div(divisor).toNumber() / 1000;
 }
+
+export const formatDarwiniaPower = (power: BN| undefined, unit?: string): string => {
+  if (!power) {
+    return '';
+  }
+
+  console.log();
+
+  const powerUnit = unit || '';
+  const firstLetter = powerUnit.substring(0, 1).toUpperCase();
+  const capitalizedUnit = `${firstLetter}${powerUnit.substring(1, powerUnit.length)}`;
+  const formattedPower = power.toNumber().toLocaleString("en-US",{maximumFractionDigits: 0})
+
+  return `${formattedPower} ${capitalizedUnit}`;
+};

packages/page-staking/src/types.ts

@@ -5,6 +5,8 @@ import type { Inflation } from '@polkadot/react-hooks/types';
 import type { AccountId, Balance, BlockNumber, EraIndex, Exposure, Hash, SessionIndex, ValidatorPrefs, ValidatorPrefsTo196 } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
 
+import { Exposure as DarwiniaExposure } from '@darwinia/types';
+
 export type Nominators = Record<string, string[]>;
 
 export type AccountFilter = 'all' | 'controller' | 'session' | 'stash' | 'unbonded';
@@ -51,7 +53,7 @@ export interface ValidatorInfo extends ValidatorInfoRank {
   bondShare: number;
   bondTotal: BN;
   commissionPer: number;
-  exposure: Exposure;
+  exposure: Exposure | DarwiniaExposure;
   isActive: boolean;
   isBlocking: boolean;
   isElected: boolean;