[DDW-323] Updates maximum delegation amount calculation

input-output-hk · Dec 3, 2020 · fa37d16 · fa37d16
1 parent 9420f00
commit fa37d16
Show file tree

Hide file tree

Showing 20 changed files with 103 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@ Changelog
 - Fixed empty disk space calculation for some Linux distributions ([PR 2258](https://github.com/input-output-hk/daedalus/pull/2258))
 - Fixed the overlap of the "X" button in the stake pools search box ([PR 2251](https://github.com/input-output-hk/daedalus/pull/2251))
 
+### Chores
+
+- Improved maximum delegation stake amount calculation ([PR 2262](https://github.com/input-output-hk/daedalus/pull/2262))
+- Updated `cardano-wallet` to version `2020-11-26` ([PR 2262](https://github.com/input-output-hk/daedalus/pull/2262))
+
 ## 2.5.0
 
 ### Features

diff --git a/nix/sources.json b/nix/sources.json
@@ -29,12 +29,12 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "7767f33b7fde5cadf35e7974c531a49cd2680aa5",
-        "sha256": "1y4sfykqkdijv2rx4758nc1b2f262cn89qfsv48xrv4irwi7x5mr",
+        "rev": "5276dfdb433778643c4c82772c06f4d9fc3b28a7",
+        "sha256": "1262mangwrc2ykr9qwbcj57h2z2ib2sn0haipm2md4246f7b97v7",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/7767f33b7fde5cadf35e7974c531a49cd2680aa5.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/5276dfdb433778643c4c82772c06f4d9fc3b28a7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "v2020-04-28"
+        "version": "v2020-11-26"
     },
     "gitignore": {
         "branch": "master",

diff --git a/source/renderer/app/components/sidebar/Sidebar.js b/source/renderer/app/components/sidebar/Sidebar.js
@@ -7,7 +7,7 @@ import styles from './Sidebar.scss';
 import SidebarCategory from './SidebarCategory';
 import SidebarCategoryNetworkInfo from './SidebarCategoryNetworkInfo';
 import SidebarWalletsMenu from './wallets/SidebarWalletsMenu';
-import { CATEGORIES_BY_NAME } from '../../config/sidebarConfig.js';
+import { CATEGORIES_BY_NAME } from '../../config/sidebarConfig';
 import { ROUTES } from '../../routes-config';
 import type {
   SidebarHardwareWalletType,

diff --git a/source/renderer/app/components/staking/epochs/StakingEpochs.js b/source/renderer/app/components/staking/epochs/StakingEpochs.js
@@ -8,7 +8,7 @@ import BorderedBox from '../../widgets/BorderedBox';
 import LoadingSpinner from '../../widgets/LoadingSpinner';
 import StakingEpochsCurrentEpochData from './StakingEpochsCurrentEpochData';
 import StakingEpochsPreviousEpochData from './StakingEpochsPreviousEpochData';
-import { SELECTED_EPOCH_OPTIONS, humanizeDurationToShort } from './helpers.js';
+import { SELECTED_EPOCH_OPTIONS, humanizeDurationToShort } from './helpers';
 import type { EpochData } from '../../../api/staking/types';
 import styles from './StakingEpochs.scss';
 

diff --git a/source/renderer/app/components/staking/epochs/StakingEpochsCurrentEpochData.js b/source/renderer/app/components/staking/epochs/StakingEpochsCurrentEpochData.js
@@ -10,7 +10,7 @@ import {
   noDataExisting,
   hasDataExisting,
   sortData,
-} from './helpers.js';
+} from './helpers';
 import type { EpochData } from '../../../api/staking/types';
 import styles from './StakingEpochs.scss';
 

diff --git a/source/renderer/app/components/staking/epochs/StakingEpochsPreviousEpochData.js b/source/renderer/app/components/staking/epochs/StakingEpochsPreviousEpochData.js
@@ -10,7 +10,7 @@ import {
   noDataExisting,
   hasDataExisting,
   sortData,
-} from './helpers.js';
+} from './helpers';
 import type { EpochData } from '../../../api/staking/types';
 import styles from './StakingEpochs.scss';
 import globalMessages from '../../../i18n/global-messages';

diff --git a/source/renderer/app/components/staking/stake-pools/StakePools.js b/source/renderer/app/components/staking/stake-pools/StakePools.js
@@ -58,6 +58,7 @@ type Props = {
   isRanking: boolean,
   stakePoolsDelegatingList: Array<StakePool>,
   getStakePoolById: Function,
+  maxDelegationFunds: number,
 };
 
 type State = {
@@ -132,6 +133,7 @@ export default class StakePools extends Component<Props, State> {
       isRanking,
       stakePoolsDelegatingList,
       getStakePoolById,
+      maxDelegationFunds,
     } = this.props;
     const {
       search,
@@ -196,6 +198,8 @@ export default class StakePools extends Component<Props, State> {
               isRanking={isRanking}
               numberOfStakePools={stakePoolsList.length}
               getStakePoolById={getStakePoolById}
+              maxDelegationFunds={maxDelegationFunds}
+              maxDelegationFundsLog={Math.log(maxDelegationFunds)}
             />
             <StakePoolsSearch
               search={search}

diff --git a/source/renderer/app/components/staking/stake-pools/StakePoolsRanking.js b/source/renderer/app/components/staking/stake-pools/StakePoolsRanking.js
@@ -21,11 +21,9 @@ import {
   RANKING_SLIDER_RATIO,
   MIN_DELEGATION_FUNDS_LOG,
   MIN_DELEGATION_FUNDS,
-  MAX_DELEGATION_FUNDS_LOG,
-  MAX_DELEGATION_FUNDS,
   INITIAL_DELEGATION_FUNDS_LOG,
   INITIAL_DELEGATION_FUNDS,
-  OUT_OF_RANGE_MAX_DELEGATION_FUNDS,
+  CIRCULATING_SUPPLY,
   ALL_WALLETS_SELECTION_ID,
   IS_RANKING_DATA_AVAILABLE,
 } from '../../../config/stakingConfig';
@@ -127,6 +125,8 @@ type Props = {
   isRanking: boolean,
   numberOfStakePools: number,
   getStakePoolById: Function,
+  maxDelegationFunds: number,
+  maxDelegationFundsLog: number,
 };
 
 type State = {
@@ -179,6 +179,7 @@ export default class StakePoolsRanking extends Component<Props, State> {
       updateDelegatingStake,
       rankStakePools,
       selectedDelegationWalletId,
+      maxDelegationFunds,
     } = this.props;
     const selectedWallet = wallets.find(
       (wallet) => wallet.id === selectedWalletId
@@ -197,7 +198,7 @@ export default class StakePoolsRanking extends Component<Props, State> {
     if (selectedWalletId === ALL_WALLETS_SELECTION_ID) {
       amountValue = Math.min(
         getAllAmounts(wallets).toNumber(),
-        MAX_DELEGATION_FUNDS
+        maxDelegationFunds
       );
     } else if (selectedWallet) {
       amountValue = selectedWallet.amount.toNumber();
@@ -219,18 +220,21 @@ export default class StakePoolsRanking extends Component<Props, State> {
   };
 
   onSliderChange = (sliderValue: number) => {
-    const { updateDelegatingStake } = this.props;
+    const {
+      updateDelegatingStake,
+      maxDelegationFunds,
+      maxDelegationFundsLog,
+    } = this.props;
     let amountValue = null;
     if (
       sliderValue ===
       Math.round(MIN_DELEGATION_FUNDS_LOG * RANKING_SLIDER_RATIO)
     ) {
       amountValue = MIN_DELEGATION_FUNDS;
     } else if (
-      sliderValue ===
-      Math.round(MAX_DELEGATION_FUNDS_LOG * RANKING_SLIDER_RATIO)
+      sliderValue === Math.round(maxDelegationFundsLog * RANKING_SLIDER_RATIO)
     ) {
-      amountValue = MAX_DELEGATION_FUNDS;
+      amountValue = maxDelegationFunds;
     } else {
       amountValue = generateThousands(
         Math.exp(sliderValue / RANKING_SLIDER_RATIO)
@@ -296,6 +300,8 @@ export default class StakePoolsRanking extends Component<Props, State> {
       numberOfStakePools,
       getStakePoolById,
       rankStakePools,
+      maxDelegationFunds,
+      maxDelegationFundsLog,
     } = this.props;
     const { sliderValue, displayValue } = this.state;
     const learnMoreButtonClasses = classnames(['flat', styles.actionLearnMore]);
@@ -381,10 +387,8 @@ export default class StakePoolsRanking extends Component<Props, State> {
                   MIN_DELEGATION_FUNDS_LOG * RANKING_SLIDER_RATIO
                 )}
                 minDisplayValue={MIN_DELEGATION_FUNDS}
-                max={Math.round(
-                  MAX_DELEGATION_FUNDS_LOG * RANKING_SLIDER_RATIO
-                )}
-                maxDisplayValue={MAX_DELEGATION_FUNDS}
+                max={Math.round(maxDelegationFundsLog * RANKING_SLIDER_RATIO)}
+                maxDisplayValue={maxDelegationFunds}
                 value={sliderValue}
                 displayValue={displayValue}
                 showRawValue
@@ -401,7 +405,7 @@ export default class StakePoolsRanking extends Component<Props, State> {
                 <PopOver
                   content={intl.formatMessage(messages.rankingExtraTooltip)}
                 >
-                  {shortNumber(OUT_OF_RANGE_MAX_DELEGATION_FUNDS)}
+                  {shortNumber(CIRCULATING_SUPPLY)}
                 </PopOver>
               </div>
               <div className={styles.outOfSliderRangeEnd} />

diff --git a/source/renderer/app/components/wallet/settings/WalletRecoveryPhraseVerificationWidget.js b/source/renderer/app/components/wallet/settings/WalletRecoveryPhraseVerificationWidget.js
@@ -18,7 +18,7 @@ import {
   RECOVERY_PHRASE_VERIFICATION_TIMES as times,
 } from '../../../config/walletRecoveryPhraseVerificationConfig';
 import { getStatusFromWalletData } from '../../../utils/walletRecoveryPhraseVerificationUtils';
-import { LOCALES } from '../../../../../common/types/locales.types.js';
+import { LOCALES } from '../../../../../common/types/locales.types';
 
 export const messages = defineMessages({
   title: {

diff --git a/source/renderer/app/components/wallet/transactions/Transaction.js b/source/renderer/app/components/wallet/transactions/Transaction.js
@@ -9,7 +9,7 @@ import { Link } from 'react-polymorph/lib/components/Link';
 import { LinkSkin } from 'react-polymorph/lib/skins/simple/LinkSkin';
 import CancelTransactionButton from './CancelTransactionButton';
 import styles from './Transaction.scss';
-import TransactionTypeIcon from './TransactionTypeIcon.js';
+import TransactionTypeIcon from './TransactionTypeIcon';
 import adaSymbol from '../../../assets/images/ada-symbol.inline.svg';
 import arrow from '../../../assets/images/collapse-arrow.inline.svg';
 import {

diff --git a/source/renderer/app/config/stakingConfig.js b/source/renderer/app/config/stakingConfig.js
@@ -2,13 +2,12 @@
 import type { RedeemItnRewardsStep } from '../types/stakingTypes';
 
 export const RANKING_SLIDER_RATIO = 60;
-export const MIN_DELEGATION_FUNDS_LOG = Math.log(10);
 export const MIN_DELEGATION_FUNDS = 10;
-export const INITIAL_DELEGATION_FUNDS_LOG = Math.log(1000);
+export const MIN_DELEGATION_FUNDS_LOG = Math.log(MIN_DELEGATION_FUNDS);
 export const INITIAL_DELEGATION_FUNDS = 1000;
-export const MAX_DELEGATION_FUNDS_LOG = Math.log(220000000);
-export const MAX_DELEGATION_FUNDS = 220000000;
-export const OUT_OF_RANGE_MAX_DELEGATION_FUNDS = 33000000000;
+export const INITIAL_DELEGATION_FUNDS_LOG = Math.log(INITIAL_DELEGATION_FUNDS);
+export const INITIAL_DESIRED_POOLS_NUMBER = 150;
+export const CIRCULATING_SUPPLY = 31112484646;
 export const ALL_WALLETS_SELECTION_ID = '0';
 
 // Dimensions

diff --git a/source/renderer/app/containers/settings/categories/GeneralSettingsPage.js b/source/renderer/app/containers/settings/categories/GeneralSettingsPage.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import { observer, inject } from 'mobx-react';
 import GeneralSettings from '../../../components/settings/categories/GeneralSettings';
-import { rebuildApplicationMenu } from '../../../ipc/rebuild-application-menu.js';
+import { rebuildApplicationMenu } from '../../../ipc/rebuild-application-menu';
 import type { InjectedProps } from '../../../types/injectedPropsType';
 
 @inject('stores', 'actions')

diff --git a/source/renderer/app/containers/staking/StakePoolsListPage.js b/source/renderer/app/containers/staking/StakePoolsListPage.js
@@ -57,6 +57,7 @@ export default class StakePoolsListPage extends Component<Props> {
       fetchingStakePoolsFailed,
       recentStakePools,
       getStakePoolById,
+      maxDelegationFunds,
     } = staking;
     const { all } = wallets;
     const isLoading =
@@ -81,6 +82,7 @@ export default class StakePoolsListPage extends Component<Props> {
           isLoading={isLoading}
           isRanking={isRanking}
           getStakePoolById={getStakePoolById}
+          maxDelegationFunds={maxDelegationFunds}
         />
         {isRanking && <StakePoolsRankingLoader />}
         {uiDialogs.isOpen(DelegationSetupWizardDialog) ? (