diff --git a/projects/ui/src/components/Balances/Actions/ClaimSiloRewards.tsx b/projects/ui/src/components/Balances/Actions/ClaimSiloRewards.tsx
index 5e905df3ef..439f44a6a9 100644
--- a/projects/ui/src/components/Balances/Actions/ClaimSiloRewards.tsx
+++ b/projects/ui/src/components/Balances/Actions/ClaimSiloRewards.tsx
@@ -25,7 +25,7 @@ import useToggle from '~/hooks/display/useToggle';
import useGetChainToken from '~/hooks/chain/useGetChainToken';
import useFarmerSiloBalances from '~/hooks/farmer/useFarmerSiloBalances';
import RewardsForm, { ClaimRewardsFormParams } from '../../Silo/RewardsForm';
-import { ClaimRewardsAction } from '~/lib/Beanstalk/Farm';
+import { ClaimRewardsAction } from '~/util';
import { UNRIPE_BEAN, UNRIPE_BEAN_CRV3 } from '~/constants/tokens';
import DescriptionButton from '../../Common/DescriptionButton';
import GasTag from '../../Common/GasTag';
@@ -343,6 +343,9 @@ const RewardsContent: React.FC<{}> = () => {
);
};
+/**
+ * FIXME: only used on the Balances page, but duplicates a ton of code
+ */
const ClaimSiloRewards: React.FC<{}> = () => (
diff --git a/projects/ui/src/components/Balances/Actions/index.tsx b/projects/ui/src/components/Balances/Actions/index.tsx
index 9d57f7792b..7b7ebe5497 100644
--- a/projects/ui/src/components/Balances/Actions/index.tsx
+++ b/projects/ui/src/components/Balances/Actions/index.tsx
@@ -1,6 +1,5 @@
import { Stack } from '@mui/material';
import React from 'react';
-import ClaimSiloRewards from './ClaimSiloRewards';
import QuickHarvest from './QuickHarvest';
import QuickRinse from './QuickRinse';
import useBanner from '~/hooks/app/useBanner';
@@ -21,7 +20,7 @@ const BalancesActions: React.FC<{}> = () => {
>
{displayValue}
- ) : (
+ ) : price?.gt(0) ? (
<>
$
{displayValue}
+ ) : (
+ ?
)}
);
diff --git a/projects/ui/src/components/Common/Table/cells.tsx b/projects/ui/src/components/Common/Table/cells.tsx
index 4afadfeddc..787be9a134 100644
--- a/projects/ui/src/components/Common/Table/cells.tsx
+++ b/projects/ui/src/components/Common/Table/cells.tsx
@@ -24,17 +24,18 @@ const COLUMNS = {
///
/// Generics
///
- season: {
- field: 'season',
+ depositId: (header: string) => ({
+ // The field is always `stem`, we just change the header for legacy seasons
+ field: 'stem',
flex: 0.8,
- headerName: 'Season',
+ headerName: header,
align: 'left',
headerAlign: 'left',
valueFormatter: (params: GridValueFormatterParams) =>
params.value.toString(),
renderCell: basicCell,
sortable: false,
- } as GridColumns[number],
+ }),
///
/// Silo
diff --git a/projects/ui/src/components/Nav/SettingsDialog.tsx b/projects/ui/src/components/Nav/SettingsDialog.tsx
index 4b16a74787..1bd929f051 100644
--- a/projects/ui/src/components/Nav/SettingsDialog.tsx
+++ b/projects/ui/src/components/Nav/SettingsDialog.tsx
@@ -98,14 +98,27 @@ const SettingsDialog: FC<{ open: boolean; onClose?: () => void }> = ({
curr,
crate.amount,
crate.bdv,
- crate.season,
- crate.stalk,
+ crate.stem,
+ crate.stalk.total,
+ crate.stalk.base,
+ crate.stalk.grown,
crate.seeds,
])
);
return prev;
},
- [['Token', 'Amount', 'BDV', 'Season', 'Stalk', 'Seeds']] as any[]
+ [
+ [
+ 'Token',
+ 'Amount',
+ 'BDV',
+ 'Season',
+ 'Total Stalk',
+ 'Base Stalk',
+ 'Grown Stalk',
+ 'Seeds',
+ ],
+ ] as any[]
);
window.open(
encodeURI(
diff --git a/projects/ui/src/components/Silo/Actions/Convert.tsx b/projects/ui/src/components/Silo/Actions/Convert.tsx
index 8a38f39a78..c65f9651dc 100644
--- a/projects/ui/src/components/Silo/Actions/Convert.tsx
+++ b/projects/ui/src/components/Silo/Actions/Convert.tsx
@@ -353,14 +353,6 @@ const ConvertForm: FC<
) : null}
-
-
- Due to an issue with the existing Silo implementation, some
- Stalk may be lost during this Convert. An upcoming BIP known as
- Silo V3 fixes this issue.
-
-
-
{/* Add-on transactions */}
diff --git a/projects/ui/src/components/Silo/Actions/Deposits.tsx b/projects/ui/src/components/Silo/Actions/Deposits.tsx
index 9cc061844b..b688362341 100644
--- a/projects/ui/src/components/Silo/Actions/Deposits.tsx
+++ b/projects/ui/src/components/Silo/Actions/Deposits.tsx
@@ -1,13 +1,12 @@
import React, { useMemo } from 'react';
-import BigNumber from 'bignumber.js';
import { useAccount as useWagmiAccount } from 'wagmi';
import { Stack, Tooltip, Typography } from '@mui/material';
import { GridColumns } from '@mui/x-data-grid';
+import { ethers } from 'ethers';
import { Token } from '~/classes';
import { FarmerSiloBalance } from '~/state/farmer/silo';
import type { LegacyDepositCrate } from '~/state/farmer/silo';
import { displayBN, displayFullBN } from '~/util';
-import useSeason from '~/hooks/beanstalk/useSeason';
import { BEAN, STALK } from '~/constants/tokens';
import { ZERO_BN } from '~/constants';
import useSiloTokenToFiat from '~/hooks/beanstalk/useSiloTokenToFiat';
@@ -16,27 +15,23 @@ import COLUMNS from '~/components/Common/Table/cells';
import Fiat from '~/components/Common/Fiat';
import TableCard, { TableCardProps } from '../../Common/TableCard';
import StatHorizontal from '~/components/Common/StatHorizontal';
-
-/**
- * Prep data to loading to a CratesCard.
- */
import { FC } from '~/types';
const Deposits: FC<
{
token: Token;
siloBalance: FarmerSiloBalance | undefined;
+ useLegacySeason?: boolean;
} & Partial
-> = ({ token, siloBalance, ...props }) => {
+> = ({ token, siloBalance, useLegacySeason, ...props }) => {
const Bean = useChainConstant(BEAN);
const getUSD = useSiloTokenToFiat();
- const currentSeason = useSeason();
const account = useWagmiAccount();
- const rows: (LegacyDepositCrate & { id: BigNumber })[] = useMemo(
+ const rows: (LegacyDepositCrate & { id: ethers.BigNumber })[] = useMemo(
() =>
siloBalance?.deposited.crates.map((deposit) => ({
- id: deposit.season,
+ id: deposit.stem,
...deposit,
})) || [],
[siloBalance?.deposited.crates]
@@ -45,7 +40,7 @@ const Deposits: FC<
const columns = useMemo(
() =>
[
- COLUMNS.season,
+ COLUMNS.depositId(useLegacySeason ? 'Season' : 'Stem'),
{
field: 'amount',
flex: 1,
@@ -97,44 +92,40 @@ const Deposits: FC<
headerName: 'Stalk',
align: 'right',
headerAlign: 'right',
- valueFormatter: (params) => displayBN(params.value),
- renderCell: (params) => {
- const grownStalk = ZERO_BN; // FIXME
- const totalStalk = params.value.plus(grownStalk);
- return (
-
-
- {displayFullBN(params.row.stalk, 2, 2)}
-
-
- {displayFullBN(grownStalk, 2, 2)}
-
-
- }
- >
-
-
- {displayFullBN(
- totalStalk,
- STALK.displayDecimals,
- STALK.displayDecimals
- )}
-
-
- {displayBN(totalStalk)}
-
-
-
- );
- },
+ valueFormatter: (params) => displayBN(params.value.total),
+ renderCell: (params) => (
+
+
+ {displayFullBN(params.row.stalk.base, 2, 2)}
+
+
+ {displayFullBN(params.row.stalk.grown, 2, 2)}
+
+
+ }
+ >
+
+
+ {displayFullBN(
+ params.row.stalk.total,
+ STALK.displayDecimals,
+ STALK.displayDecimals
+ )}
+
+
+ {displayBN(params.row.stalk.total)}
+
+
+
+ ),
sortable: false,
},
COLUMNS.seeds,
] as GridColumns,
- [token.displayDecimals, Bean]
+ [useLegacySeason, token.displayDecimals, Bean]
);
const amount = siloBalance?.deposited.amount;
diff --git a/projects/ui/src/components/Silo/Actions/Migrate.tsx b/projects/ui/src/components/Silo/Actions/Migrate.tsx
index b300c9b7a9..a680a7980b 100644
--- a/projects/ui/src/components/Silo/Actions/Migrate.tsx
+++ b/projects/ui/src/components/Silo/Actions/Migrate.tsx
@@ -65,15 +65,21 @@ export const Migrate: FC<{}> = () => {
console.log(`Migrating...`, params);
try {
- await sdk.contracts.beanstalk.mowAndMigrate(
- account,
- params.tokens,
- params.seasons,
- params.amounts,
- params.stalkDiff,
- params.seedsDiff,
- params.proof
- );
+ if (params.tokens.length === 0) {
+ await sdk.contracts.beanstalk.mowAndMigrateNoDeposits(account);
+ } else {
+ await sdk.contracts.beanstalk.mowAndMigrate(
+ account,
+ params.tokens,
+ params.seasons,
+ params.amounts,
+ params.stalkDiff,
+ params.seedsDiff,
+ params.proof
+ );
+ }
+
+ window.location.reload();
} catch (e) {
console.error(e);
} finally {
@@ -150,6 +156,7 @@ export const Migrate: FC<{}> = () => {
maxRows={100}
onlyTable
hideFooter
+ useLegacySeason
/>
@@ -166,9 +173,36 @@ export const Migrate: FC<{}> = () => {
>
Migrate
+ {migrating && (
+
+ The page will refresh when migration is complete.
+
+ )}
+
+
+
+
+
+
+ What happens to my Grown Stalk?
+
+
+ All of your Grown Stalk will be claimed and applied to your Stalk
+ balance during the migration.
+
+
+
+
+ I had withdrawn a deposit but didn't claim it, will I lose it
+ when migrating?
+
+
+ No. After migrating, you can find your withdrawn deposits on the
+ Claim tab.
+
+
-
@@ -83,7 +84,11 @@ const SiloActions: FC<{
{/* Tables */}
-
);
diff --git a/projects/ui/src/components/Silo/MigrateTab.module.scss b/projects/ui/src/components/Silo/MigrateTab.module.scss
index 0cd8918edf..01a308c648 100644
--- a/projects/ui/src/components/Silo/MigrateTab.module.scss
+++ b/projects/ui/src/components/Silo/MigrateTab.module.scss
@@ -1,55 +1,6 @@
-// @keyframes colorPulse {
-// 0% {
-// color: lighten(green, 70%);
-// }
-// 40% {
-// color: green;
-// }
-// 50% {
-// color: darken(green, 5%);
-// }
-// 100% {
-// color: darken(green, 20%);
-// }
-// }
-
-// .wrapper {
-// background: black;
-// color: darken(green, 20%);
-// font-size: 3em;
-// font-family: monospace;
-// display: flex;
-// height: 100vh;
-// overflow: hidden;
-// text-align: center;
-// width: 100vw;
-// }
-
-// .column {
-// & > * {
-// display: block;
-// animation: 3s infinite colorPulse;
-// padding: 0 0.125em;
-// }
-// }
-
-// @for $colNum from 1 through 80 {
-// $duration: random(100) / 23 + 1;
-// $delay: $duration / 50;
-
-// @for $i from 1 through 50 {
-// .col-#{$colNum} :nth-child(#{$i}) {
-// animation-duration: #{$duration}s;
-// animation-delay: #{$i * $delay}s;
-// }
-// }
-// }
-
-$nodeStreak: #46B95544;
-$computationalFogTop: #46B955;
-$computationalFogBot: #46B955;
-$nanoVelocity: 4s;
-$visualDistortionZapper: 340px;
+$nodeStreak: #46B95522;
+$nanoVelocity: 6s;
+$visualDistortionZapper: 330px;
.wrap {
width: 100%;
@@ -66,20 +17,13 @@ $visualDistortionZapper: 340px;
position: absolute;
bottom: -30%;
left: -50%;
- background-image: -webkit-linear-gradient($nodeStreak 1px, transparent 1px), -webkit-linear-gradient(left, $nodeStreak 1px, transparent 1px);
+ background-image: -webkit-linear-gradient($nodeStreak 2px, transparent 2px), -webkit-linear-gradient(left, $nodeStreak 2px, transparent 2px);
background-size: 100px 100px, 100px 100px;
background-position: -1px -1px,-1px -1px;
- transform: rotateX(85deg);
+ transform: rotateX(60deg);
animation: planeMoveTop $nanoVelocity infinite linear;
}
-.bottomPlane {
- @extend .topPlane;
- transform: rotateX(-85deg);
- top: -30%;
- animation: planeMoveBot $nanoVelocity infinite linear;
-}
-
@keyframes planeMoveTop {
from {
background-position: 0px 0px,0px 0px;
@@ -89,15 +33,6 @@ $visualDistortionZapper: 340px;
}
}
-@keyframes planeMoveBot {
- from {
- background-position: 0px 0px, 0px 0px;
- }
- to {
- background-position: 0px -100px, 0px 0px;
- }
-}
-
@media (max-height: 350px) {
.wrap {
perspective: $visualDistortionZapper - 150;
diff --git a/projects/ui/src/components/Silo/MigrateTab.tsx b/projects/ui/src/components/Silo/MigrateTab.tsx
index f6a126bef9..5d6e4d5b10 100644
--- a/projects/ui/src/components/Silo/MigrateTab.tsx
+++ b/projects/ui/src/components/Silo/MigrateTab.tsx
@@ -7,7 +7,7 @@ import {
Stack,
Typography,
} from '@mui/material';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
import BeanProgressIcon from '~/components/Common/BeanProgressIcon';
import Row from '~/components/Common/Row';
import Centered from '~/components/Common/ZeroState/Centered';
@@ -17,7 +17,7 @@ import { DISCORD_LINK } from '~/constants';
import useMigrationNeeded from '~/hooks/farmer/useMigrationNeeded';
import { FC } from '~/types';
-// import styles from "./MigrateTab.module.scss"
+import styles from './MigrateTab.module.scss';
const bip36 = (
(migrationNeeded ? 1 : 9);
+ const [step, setStep] = useState(
+ // migrationNeeded ? 1 : 9
+ 8
+ );
const nextStep = () => setStep(step + 1);
- useEffect(() => {
- if (migrationNeeded === true) {
- setStep(1);
- } else if (migrationNeeded === false) {
- setStep(9);
- }
- }, [migrationNeeded]);
+ // useEffect(() => {
+ // if (migrationNeeded === true) {
+ // setStep(1);
+ // } else if (migrationNeeded === false) {
+ // setStep(9);
+ // }
+ // }, [migrationNeeded]);
if (migrationNeeded === undefined) {
return (
@@ -54,203 +57,208 @@ export const MigrateTab: FC<{}> = () => {
}
return (
-
- {/*
+
+ */}
- {step < 9 ? (
-
- {step === 1 && (
-
-
- Migrate to Silo V3
-
-
- {[
- 'Instant withdrawals',
- 'Dynamic rewards for deposits',
- 'ERC-1155 tokens',
- ].map((feature, i) => (
-
-
- Get started
-
-
- )}
- {step === 2 && (
-
-
- To use the Silo, you need to migrate.
-
-
- Migrating allows you to use the latest Silo features.
- You'll need to pay a one-time transaction fee to perform
- the migration.
-
-
- Next →
-
-
- )}
- {step === 3 && (
-
-
- After you migrate, you'll get access to instant
- withdrawals.
-
-
- No more waiting for a Season to claim your assets — withdrawals
- happen instantly, and you don't have to run a second
- transaction to claim.
-
-
- Next →
-
-
- )}
- {step === 4 && (
-
-
- When you receive new Earned Beans, there's a short delay
- before you can claim them.
-
-
- This only applies to the Beans you received during the last
- Sunrise, and helps prevent certain attacks on Beanstalk. See{' '}
- {bip36} for details.
-
-
- Next →
-
-
- )}
- {step === 5 && (
-
-
- The amount of Stalk you earn each Season might change over time.
-
-
- Seeds are dynamic and can be adjusted over time through
- governance or automated mechanisms to help maintain peg and
- incentivize liquidity.
-
-
- Next →
-
-
- )}
- {step === 6 && (
-
-
- Unripe Deposits no longer earn Grown Stalk each Season.
-
-
- {bip36} reduced the Seeds per BDV of Unripe BEAN and Unripe
- BEAN:3CRV to 0 to help Beanstalk incentivize peg maintenance
- through conversions.
-
- }
- sx={{ textAlign: 'left' }}
- >
- For Unripe holders: you won't lose any
- Stalk. All the Stalk earned up until BIP-36 will remain attached
- to your Deposits.
-
-
- Next →
-
-
- )}
- {step === 7 && (
-
-
- Deposits are now compatible with the ERC-1155 standard.
-
-
- This means they'll show up as tokens in popular wallets
- like MetaMask, and can be used on platforms like OpenSea. After
- you migrate, you'll be able to see your Deposits in your
- wallet.
-
- }
- sx={{ textAlign: 'left' }}
- >
- Heads up! Sending the Deposit to another
- address via your wallet means you'll send the Stalk and
- Seeds too, just like a Deposit transfer.
-
-
- Next →
-
-
- )}
- {step === 8 && (
-
-
- If you've still got questions, there's a community to
- help.
-
-
- Check out the{' '}
-
-
+
+ {step < 9 ? (
+
+ {step === 1 && (
+
+
+ Migrate to Silo V3
+
+
+ {[
+ 'Instant withdrawals',
+ 'Dynamic rewards for deposits',
+ 'ERC-1155 tokens',
+ ].map((feature, i) => (
+
+
+ Get started
+
+
+ )}
+ {step === 2 && (
+
+
+ To use the Silo, you need to migrate.
+
+
+ Migrating allows you to use the latest Silo features.
+ You'll need to pay a one-time transaction fee to perform
+ the migration.
+
+
+ Next →
+
+
+ )}
+ {step === 3 && (
+
+
+ After you migrate, you'll get access to instant
+ withdrawals.
+
+
+ No more waiting for a Season to claim your assets —
+ withdrawals happen instantly, and you don't have to run a
+ second transaction to claim.
+
+
+ Next →
+
+
+ )}
+ {step === 4 && (
+
+
+ When you receive new Earned Beans, there's a short delay
+ before you can claim them.
+
+
+ This only applies to the Beans you received during the last
+ Sunrise, and helps prevent certain attacks on Beanstalk. See{' '}
+ {bip36} for details.
+
+
+ Next →
+
+
+ )}
+ {step === 5 && (
+
+
+ The amount of Stalk you earn each Season might change over
+ time.
+ {/* The number of Seeds earned for Depositing can change over time. */}
+
+
+ Seeds are now dynamic and can be adjusted over time through
+ governance or automated mechanisms to help maintain peg and
+ incentivize liquidity.
+
- Preview migration →
+ Next →
+
+ )}
+ {step === 6 && (
+
+
+ Unripe Deposits no longer earn Grown Stalk each Season.
+
+
+ {bip36} reduced the Seeds per BDV of Unripe BEAN and Unripe
+ BEAN:3CRV to 0 to help Beanstalk incentivize peg maintenance
+ through conversions.
+
+ }
+ sx={{ textAlign: 'left', background: 'white' }}
+ >
+ For Unripe holders: you won't lose any
+ Stalk. All the Stalk earned up until BIP-36 will remain
+ attached to your Deposits.
+
+
+ Next →
+
+
+ )}
+ {step === 7 && (
+
+
+ Deposits are now compatible with the ERC-1155 standard.
+
+
+ This means they'll show up as tokens in popular wallets
+ like MetaMask, and can be used on platforms like OpenSea.
+ After you migrate, you'll be able to see your Deposits in
+ your wallet.
+
+ }
+ sx={{ textAlign: 'left', background: 'white' }}
+ >
+ Heads up! Sending the Deposit to another
+ address via your wallet means you'll send the Stalk and
+ Seeds too, just like a Deposit transfer.
+
+
+ Next →
+
+
+ )}
+ {step === 8 && (
+
+
+ If you've still got questions, there's a community
+ to help.
+
+
+ Check out the{' '}
+
+
+
+ Preview migration →
+
+ setStep(2)}
+ >
+ Start over
+
+
+
+ )}
+
+ ) : null}
+ {step === 9 &&
+ (migrationNeeded ? (
+
+
+ ) : (
+
+
+
+ You're migrated!
+
setStep(2)}
>
- Start over
+ Replay onboarding
-
- )}
-
- ) : null}
- {step === 9 &&
- (migrationNeeded ? (
-
-
-
- You're migrated!
-
- setStep(2)}
- >
- Replay onboarding
-
-
-
- ))}
+
+ ))}
+
);
};
diff --git a/projects/ui/src/components/Silo/Overview.tsx b/projects/ui/src/components/Silo/Overview.tsx
index b8cfc37263..cd2629aa23 100644
--- a/projects/ui/src/components/Silo/Overview.tsx
+++ b/projects/ui/src/components/Silo/Overview.tsx
@@ -129,7 +129,9 @@ const Overview: FC<{
- {displayUSD(breakdown.states.deposited.value)}
+ {breakdown.states.deposited.value.gt(0)
+ ? displayUSD(breakdown.states.deposited.value)
+ : '?'}
}
/>
diff --git a/projects/ui/src/components/Silo/RewardItem.tsx b/projects/ui/src/components/Silo/RewardItem.tsx
index f1fdc76252..d036450fe0 100644
--- a/projects/ui/src/components/Silo/RewardItem.tsx
+++ b/projects/ui/src/components/Silo/RewardItem.tsx
@@ -18,6 +18,7 @@ export type RewardItemProps = {
// eslint-disable-next-line
compact?: boolean;
titleColor?: string;
+ annotation?: any;
};
const RewardItem: FC = ({
@@ -27,6 +28,7 @@ const RewardItem: FC = ({
icon,
isClaimable,
titleColor,
+ annotation,
}) => {
const Amount = () => (
@@ -36,6 +38,7 @@ const RewardItem: FC = ({
{amount.lt(0) ? '-' : displayFullBN(amount, 2)}
)}
+ {annotation}
);
diff --git a/projects/ui/src/components/Silo/RewardsBar.tsx b/projects/ui/src/components/Silo/RewardsBar.tsx
index 3c16a25c3f..0590784d1c 100644
--- a/projects/ui/src/components/Silo/RewardsBar.tsx
+++ b/projects/ui/src/components/Silo/RewardsBar.tsx
@@ -12,6 +12,8 @@ import { hoverMap } from '../../constants/silo';
import Row from '~/components/Common/Row';
import { FC } from '~/types';
+import useFarmerSiloVesting from '~/hooks/farmer/useFarmerSiloVesting';
+import { displayBN } from '~/util';
export type RewardsBarProps = {
beans: FarmerSiloRewards['beans'];
@@ -50,6 +52,8 @@ const RewardsBar: FC = ({
const selectedActionIncludes = (c: ClaimRewardsAction) =>
action && hoverMap[action].includes(c);
+ const vesting = useFarmerSiloVesting();
+
return (
= ({
= ({
(action === ClaimRewardsAction.PLANT_AND_MOW ||
action === ClaimRewardsAction.CLAIM_ALL)
}
+ annotation={vesting.isVesting === true ? '*' : null}
/>
= ({ handleClose, open, ...rewardsBarProps }) => (
-
+
Claim Rewards
{(props) =>
Silo V3 is here.
diff --git a/projects/ui/src/hooks/farmer/useFarmerStalkByToken.ts b/projects/ui/src/hooks/farmer/useFarmerStalkByToken.ts
index 4bd10e5556..de3de7e635 100644
--- a/projects/ui/src/hooks/farmer/useFarmerStalkByToken.ts
+++ b/projects/ui/src/hooks/farmer/useFarmerStalkByToken.ts
@@ -3,7 +3,6 @@ import { useMemo } from 'react';
import { TokenMap, ZERO_BN } from '~/constants';
import useSeason from '~/hooks/beanstalk/useSeason';
import useFarmerSiloBalances from '~/hooks/farmer/useFarmerSiloBalances';
-import { STALK_PER_SEED_PER_SEASON } from '~/util';
type BaseToGrownStalk = {
base: BigNumber;
@@ -24,24 +23,22 @@ export default function useFarmerStalkByToken() {
prev[tokenAddress] =
tokenBalances.deposited.crates.reduce(
(acc, crate) => {
- const elapsedSeasons = season.minus(crate.season);
- const seasonsSinceUpdate = season.minus(
- tokenBalances.lastUpdate
- );
+ // const seasonsSinceUpdate = season.minus(tokenBalances.lastUpdate);
+
// add base stalk added from deposits
- acc.base = acc.base.plus(crate.stalk);
+ acc.base = acc.base.plus(crate.stalk.base);
// add grown stalk from deposits
- acc.grown = acc.grown.plus(
- crate.seeds
- .times(elapsedSeasons)
- .times(STALK_PER_SEED_PER_SEASON)
- );
+ acc.grown = acc.grown.plus(crate.stalk.grown);
// total seeds
acc.seeds = acc.seeds.plus(crate.seeds);
+
+ // FIXME
+ acc.unclaimed = ZERO_BN;
+
// grown stalk since last silo update (unclaimed stalks)
- acc.unclaimed = acc.seeds
- .times(seasonsSinceUpdate)
- .times(STALK_PER_SEED_PER_SEASON);
+ // acc.unclaimed = acc.seeds
+ // .times(seasonsSinceUpdate)
+ // .times(STALK_PER_SEED_PER_SEASON);
return acc;
},
{
diff --git a/projects/ui/src/hooks/farmer/useFarmerStalkSources.ts b/projects/ui/src/hooks/farmer/useFarmerStalkSources.ts
deleted file mode 100644
index d8c539084b..0000000000
--- a/projects/ui/src/hooks/farmer/useFarmerStalkSources.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ZERO_BN } from '~/constants';
-import useSeason from '~/hooks/beanstalk/useSeason';
-import useFarmerSiloBalances from '~/hooks/farmer/useFarmerSiloBalances';
-
-/**
- * @note unused as of 10/21/2022.
- */
-export default function useFarmerStalkSources() {
- const balances = useFarmerSiloBalances();
- const season = useSeason();
-
- return Object.keys(balances).reduce(
- (prev, curr) => {
- const crates = balances[curr].deposited.crates;
- if (!season) return prev;
- crates.forEach((crate) => {
- const elapsedSeasons = season.minus(crate.season);
- prev.base = prev.base.plus(crate.stalk);
- prev.grown = prev.grown.plus(
- crate.seeds.times(elapsedSeasons).times(0.0001) // FIXME: make this a constant or helper function
- );
- });
- return prev;
- },
- {
- base: ZERO_BN,
- grown: ZERO_BN,
- }
- );
-}
diff --git a/projects/ui/src/hooks/farmer/useRevitalized.ts b/projects/ui/src/hooks/farmer/useRevitalized.ts
index 3bf269a9dd..5b9eeac722 100644
--- a/projects/ui/src/hooks/farmer/useRevitalized.ts
+++ b/projects/ui/src/hooks/farmer/useRevitalized.ts
@@ -1,91 +1,153 @@
import { useMemo } from 'react';
import { useSelector } from 'react-redux';
-import { MaxBN } from '~/util';
-import {
- BEAN_TO_STALK,
- BEAN_TO_SEEDS,
- ZERO_BN,
- LP_TO_SEEDS,
-} from '~/constants';
-import { UNRIPE_BEAN, UNRIPE_BEAN_CRV3 } from '~/constants/tokens';
+import { Token, TokenValue } from '@beanstalk/sdk';
+import { MaxBN, transform } from '~/util';
+import { BEAN_TO_STALK, ZERO_BN } from '~/constants';
import { AppState } from '~/state';
import useFarmerSiloBalances from './useFarmerSiloBalances';
-import useGetChainToken from '../chain/useGetChainToken';
-import useSeason from '~/hooks/beanstalk/useSeason';
+import useSdk from '~/hooks/sdk';
/**
- * Calculate the Farmer's current number of revitalized Stalk and Seeds.
+ * Calculates the amount of new Stalk & Seeds the Farmer will receive if they
+ * "enroot" their deposits.
+ *
+ * How Revitalized Stalk and Seeds work
+ * ------------------------------------
+ *
+ * Pretend I have an Unripe BEAN Deposit in Season 1: { season: 1, amount: 100, bdv: 25 }
+ * It's now Season 10, and Beanstalk values 1 Unripe Bean at 0.4 BDV.
+ *
+ * Beanstalk will now give me more stalk & seeds for the same `amount` in my deposit.
+ * Enrooting is the process of "updating" that BDV value to claim these stalk and seeds.
+ *
+ *
+ * How to calculate revitalized stalk and seeds
+ * --------------------------------------------
+ *
+ * In the above example, "enrooting" the deposit would shift it between these states:
+ *
+ * { season: 1, amount: 100, bdv: 25 } -> { season: 1, amount: 100, bdv: 40 }
+ *
+ * (Note that the `season` did not change, only the BDV)
+ *
+ * In this case, the Deposit has received Stalk from two new sources:
+ * - The addition of 15 BDV grants 15 STALK, since 1 BDV = 1 STALK.
+ * - Since that 15 BDV is deposited in Season 1, and it's now Season 10, it has
+ * "retroactively" grown stalk for 9 seasons. The act of enrooting also "mows"
+ * that grown stalk.
+ *
+ * The Deposit has also received Seeds from the 15 BDV, since 1 BDV = 2 SEEDS.
+ *
+ * Note that after Silo V3, "season" is replaced semantically by "stem", and the
+ * number of Seeds per BDV is now variable, however the Base Stalk per BDV is not.
*/
export default function useRevitalized() {
- /// Helpers
- const getChainToken = useGetChainToken();
-
- /// Balances
const balances = useFarmerSiloBalances();
const beanstalkSilo = useSelector(
(state) => state._beanstalk.silo
);
- const currentSeason = useSeason();
+ const sdk = useSdk();
return useMemo(() => {
- const urBean = getChainToken(UNRIPE_BEAN);
- const urBeanCrv3 = getChainToken(UNRIPE_BEAN_CRV3);
- const expectedBDV = (addr: string) =>
- (balances[addr]?.deposited.amount || ZERO_BN).times(
- beanstalkSilo.balances[addr]?.bdvPerToken || ZERO_BN
+ let revitalizedStalk = ZERO_BN;
+ let revitalizedSeeds = ZERO_BN;
+
+ // The amount of BDV this Deposit should have based on the formula:
+ // amount * bdvPerToken
+ // The latter value flucatuates over time as more Fertilizer is purchased.
+ const getExpectedBDV = (token: Token) =>
+ (balances[token.address]?.deposited.amount || ZERO_BN).times(
+ beanstalkSilo.balances[token.address]?.bdvPerToken || ZERO_BN
);
- const actualBDV = (addr: string) =>
- balances[addr]?.deposited.bdv || ZERO_BN;
- const expectedGrownBDV = (addr: string) =>
- balances[addr]?.deposited.crates.reduce(
- (ss, c) =>
- ss.plus(
- currentSeason
- .minus(c.season)
- .times(c.amount.times(beanstalkSilo.balances[addr]?.bdvPerToken))
- ),
- ZERO_BN
- ) || ZERO_BN;
- const actualGrownBDV = (addr: string) =>
- balances[addr]?.deposited.crates.reduce(
- (ss, c) => ss.plus(currentSeason.minus(c.season).times(c.bdv)),
+
+ // The on-chain `bdv` value stored with the deposit.
+ const getActualBDV = (token: Token) =>
+ balances[token.address]?.deposited.bdv || ZERO_BN;
+
+ const getGrownStalk = (token: Token, expected: boolean) =>
+ balances[token.address]
+ ? transform(
+ balances[token.address].deposited.crates.reduce(
+ (acc, crate) =>
+ acc.add(
+ token.getStalk(
+ sdk.tokens.BEAN.fromHuman(
+ expected
+ ? // Get the amount of BDV this Deposit should have...
+ // amount * current bdvPerToken
+ crate.amount
+ .times(
+ beanstalkSilo.balances[token.address]
+ ?.bdvPerToken || ZERO_BN
+ )
+ .toString()
+ : // Get the amount of BDV this Deposit actually has...
+ crate.bdv.toString()
+ )
+ )
+ ),
+ TokenValue.ZERO
+ ),
+ 'bnjs',
+ sdk.tokens.STALK
+ )
+ : ZERO_BN;
+
+ sdk.tokens.unripeTokens.forEach((token) => {
+ const expectedBDV = getExpectedBDV(token);
+ const actualBDV = getActualBDV(token);
+
+ const expectedGrownStalk = getGrownStalk(token, true);
+ const actualGrownStalk = getGrownStalk(token, false);
+
+ const deltaBDV = MaxBN(expectedBDV.minus(actualBDV), ZERO_BN);
+ const deltaGrownStalk = MaxBN(
+ expectedGrownStalk.minus(actualGrownStalk),
ZERO_BN
- ) || ZERO_BN;
+ );
- // flooring at 0 prevents edge case where bdv < haircut during testing
- const delta1 = MaxBN(
- expectedBDV(urBean.address).minus(actualBDV(urBean.address)),
- ZERO_BN
- );
- const delta2 = MaxBN(
- expectedBDV(urBeanCrv3.address).minus(actualBDV(urBeanCrv3.address)),
- ZERO_BN
- );
+ const newRevitalizedSeeds = transform(
+ // how many seeds are associated with the BDV we're adding
+ // formula: bdv * seedsPerBDV
+ token.getSeeds(
+ // how many BDV are we adding
+ sdk.tokens.BEAN.fromHuman(deltaBDV.toString())
+ ),
+ 'bnjs'
+ );
- const deltaGrown1 = MaxBN(
- expectedGrownBDV(urBean.address).minus(actualGrownBDV(urBean.address)),
- ZERO_BN
- );
- const deltaGrown2 = MaxBN(
- expectedGrownBDV(urBeanCrv3.address).minus(
- actualGrownBDV(urBeanCrv3.address)
- ),
- ZERO_BN
- );
+ const newRevitalizedStalk =
+ // stalk that comes with the base bdv
+ // hack: simplify and skip transformation since 1 BEAN = 1 BDV = 1 STALK
+ deltaBDV
+ .times(BEAN_TO_STALK)
+ // stalk that comes with the fact that we have new bdv which has been deposited for longer
+ .plus(deltaGrownStalk);
- const seeds = delta1.times(BEAN_TO_SEEDS).plus(delta2.times(LP_TO_SEEDS));
- const stalk = delta1
- .plus(delta2)
- .times(BEAN_TO_STALK)
- .plus(deltaGrown1.times(BEAN_TO_SEEDS).div('10000'))
- .plus(deltaGrown2.times(LP_TO_SEEDS).div('10000'));
+ // console.log("Revitalized for", token.name, {
+ // expectedBDV: expectedBDV.toString(),
+ // actualBDV: actualBDV.toString(),
+ // expectedGrownStalk: expectedGrownStalk.toString(),
+ // actualGrownStalk: actualGrownStalk.toString(),
+ // deltaBDV: deltaBDV.toString(),
+ // deltaGrownStalk: deltaGrownStalk.toString(),
+ // newRevitalizedSeeds: newRevitalizedSeeds.toString(),
+ // newRevitalizedStalk: newRevitalizedStalk.toString(),
+ // })
- // console.debug('[useRevitalized] delta1 = ', `${delta1}`);
- // console.debug('[useRevitalized] delta2 = ', `${delta2}`);
+ revitalizedStalk = revitalizedStalk.plus(newRevitalizedStalk);
+ revitalizedSeeds = revitalizedSeeds.plus(newRevitalizedSeeds);
+ });
return {
- revitalizedStalk: stalk,
- revitalizedSeeds: seeds,
+ revitalizedStalk,
+ revitalizedSeeds,
};
- }, [balances, beanstalkSilo, currentSeason, getChainToken]);
+ }, [
+ balances,
+ beanstalkSilo.balances,
+ sdk.tokens.BEAN,
+ sdk.tokens.STALK,
+ sdk.tokens.unripeTokens,
+ ]);
}
diff --git a/projects/ui/src/lib/Txn/FarmSteps/silo/EnrootFarmStep.ts b/projects/ui/src/lib/Txn/FarmSteps/silo/EnrootFarmStep.ts
index 8766f2651a..cff87c6f33 100644
--- a/projects/ui/src/lib/Txn/FarmSteps/silo/EnrootFarmStep.ts
+++ b/projects/ui/src/lib/Txn/FarmSteps/silo/EnrootFarmStep.ts
@@ -95,6 +95,7 @@ export class EnrootFarmStep extends FarmStep implements EstimatesGas {
[EnrootType.DEPOSITS]: [],
};
+ // REFACTOR: Duplicative of logic in `selectCratesForEnroot`
[...this._sdk.tokens.unripeTokens].forEach((urToken) => {
const crates = this._crates[urToken.address];
if (crates?.length === 1) {
@@ -102,7 +103,7 @@ export class EnrootFarmStep extends FarmStep implements EstimatesGas {
'enrootDeposit',
[
urToken.address,
- crates[0].season.toString(),
+ crates[0].stem.toString(),
urToken.fromHuman(crates[0].amount.toString()).toBlockchain(),
]
);
@@ -112,7 +113,7 @@ export class EnrootFarmStep extends FarmStep implements EstimatesGas {
'enrootDeposits',
[
urToken.address,
- crates.map((crate) => crate.season.toString()),
+ crates.map((crate) => crate.stem.toString()),
crates.map((crate) =>
urToken.fromHuman(crate.amount.toString()).toBlockchain()
),
diff --git a/projects/ui/src/state/farmer/silo/actions.ts b/projects/ui/src/state/farmer/silo/actions.ts
index 59ae08f997..358d152ac2 100644
--- a/projects/ui/src/state/farmer/silo/actions.ts
+++ b/projects/ui/src/state/farmer/silo/actions.ts
@@ -12,10 +12,10 @@ export const updateFarmerMigrationStatus = createAction(
'farmer/silo/migration'
);
-export const updateFarmerSiloRewards =
+export const updateLegacyFarmerSiloRewards =
createAction('farmer/silo/update');
-export const updateFarmerSiloBalances =
+export const updateLegacyFarmerSiloBalances =
createAction(
'farmer/silo/updateFarmerSiloBalances'
);
diff --git a/projects/ui/src/state/farmer/silo/reducer.ts b/projects/ui/src/state/farmer/silo/reducer.ts
index 994fbec4cd..bcce995c6f 100644
--- a/projects/ui/src/state/farmer/silo/reducer.ts
+++ b/projects/ui/src/state/farmer/silo/reducer.ts
@@ -4,8 +4,8 @@ import { FarmerSilo } from '.';
import {
resetFarmerSilo,
updateFarmerMigrationStatus,
- updateFarmerSiloBalances,
- updateFarmerSiloRewards,
+ updateLegacyFarmerSiloBalances,
+ updateLegacyFarmerSiloRewards,
} from './actions';
const NEG1 = new BigNumber(-1);
@@ -38,7 +38,7 @@ export default createReducer(initialFarmerSilo, (builder) =>
.addCase(updateFarmerMigrationStatus, (state, { payload }) => {
state.migrationNeeded = payload;
})
- .addCase(updateFarmerSiloBalances, (state, { payload }) => {
+ .addCase(updateLegacyFarmerSiloBalances, (state, { payload }) => {
const addresses = Object.keys(payload);
addresses.forEach((address) => {
const a = address.toLowerCase();
@@ -48,7 +48,7 @@ export default createReducer(initialFarmerSilo, (builder) =>
};
});
})
- .addCase(updateFarmerSiloRewards, (state, { payload }) => {
+ .addCase(updateLegacyFarmerSiloRewards, (state, { payload }) => {
state.beans = payload.beans;
state.stalk = payload.stalk;
state.seeds = payload.seeds;
diff --git a/projects/ui/src/state/farmer/silo/updater.ts b/projects/ui/src/state/farmer/silo/updater.ts
index 8d5d418f5c..1c57426fb1 100644
--- a/projects/ui/src/state/farmer/silo/updater.ts
+++ b/projects/ui/src/state/farmer/silo/updater.ts
@@ -1,30 +1,23 @@
import { useCallback, useEffect } from 'react';
import { useDispatch } from 'react-redux';
import axios from 'axios';
-import BigNumberJS from 'bignumber.js';
-import { DataSource } from '@beanstalk/sdk';
-import { BEAN_TO_SEEDS, BEAN_TO_STALK, ZERO_BN } from '~/constants';
-import { BEAN } from '~/constants/tokens';
+import { DataSource, TokenValue } from '@beanstalk/sdk';
+import { ethers } from 'ethers';
+import { ZERO_BN } from '~/constants';
import { useBeanstalkContract } from '~/hooks/ledger/useContract';
import useChainId from '~/hooks/chain/useChainId';
-import {
- bigNumberResult,
- tokenResult,
- tokenValueToBN,
- transform,
-} from '~/util';
+import { bigNumberResult, transform } from '~/util';
import useAccount from '~/hooks/ledger/useAccount';
-import useWhitelist from '~/hooks/beanstalk/useWhitelist';
-import useSeason from '~/hooks/beanstalk/useSeason';
import {
resetFarmerSilo,
- updateFarmerSiloBalances,
+ updateLegacyFarmerSiloBalances,
UpdateFarmerSiloBalancesPayload,
updateFarmerMigrationStatus,
- updateFarmerSiloRewards,
+ updateLegacyFarmerSiloRewards,
} from './actions';
import useSdk from '~/hooks/sdk';
import { LegacyDepositCrate } from '~/state/farmer/silo';
+import useSeason from '~/hooks/beanstalk/useSeason';
type SiloV3StaticData = {
deposits: {
@@ -60,29 +53,14 @@ export const useFetchFarmerSilo = () => {
/// Data
const account = useAccount();
- const whitelist = useWhitelist();
const season = useSeason();
- /// Events
- // const getEvents = useCallback(
- // async (_account, fromBlock, toBlock) =>
- // sdk.events.get('silo', [
- // _account,
- // {
- // token: undefined, // get all tokens
- // fromBlock, // let cache system choose where to start
- // toBlock, // let cache system choose where to end
- // },
- // ]),
- // [sdk.events]
- // );
- // const [fetchSiloEvents] = useEvents('silo', getEvents);
-
///
const initialized = !!(
- (beanstalk && account && sdk.contracts.beanstalk)
- // season?.gt(0)
- // fetchSiloEvents &&
+ beanstalk &&
+ account &&
+ sdk.contracts.beanstalk &&
+ season?.gt(0)
);
/// Handlers
@@ -90,106 +68,106 @@ export const useFetchFarmerSilo = () => {
if (initialized) {
console.debug('[farmer/silo/useFarmerSilo] FETCH');
+ // FIXME: multicall this section
+ // FIXME: translate?
const [
- stalkBalance,
+ activeStalkBalance,
grownStalkBalance,
- seedBalance,
rootBalance,
earnedBeanBalance,
migrationNeeded,
// lastUpdate,
// allEvents = [],
] = await Promise.all([
- // FIXME: multicall this section
- // FIXME: translate?
- sdk.silo.getStalk(account).then(tokenValueToBN), // returns `stalk + earnedStalk`
- sdk.silo.getGrownStalk(account).then(tokenValueToBN),
- sdk.silo.getSeeds(account).then(tokenValueToBN),
- beanstalk.balanceOfRoots(account).then(bigNumberResult),
- beanstalk.balanceOfEarnedBeans(account).then(tokenResult(BEAN)),
+ // `getStalk()` returns `stalk + earnedStalk` but NOT grown stalk
+ sdk.silo.getStalk(account),
+ sdk.silo.getGrownStalk(account),
+ sdk.contracts.beanstalk.balanceOfRoots(account).then(bigNumberResult),
+ sdk.silo.getEarnedBeans(account),
+
+ // FIXME: this only needs to get fetched once and then can probably be cached
+ // in LocalStorage or at least moved to a separate updater to prevent it from
+ // getting called every time the farmer refreshes their Silo
sdk.contracts.beanstalk.migrationNeeded(account),
// beanstalk.lastUpdate(account).then(bigNumberResult),
- ] as const);
- /// stalk + earnedStalk (bundled together at the contract level)
- const activeStalkBalance = stalkBalance;
- /// earnedStalk (this is already included in activeStalk)
- const earnedStalkBalance = earnedBeanBalance.times(BEAN_TO_STALK);
- /// earnedSeed (aka plantable seeds)
- const earnedSeedBalance = earnedBeanBalance.times(BEAN_TO_SEEDS);
+ // sdk.contracts.beanstalk.depositedB
+ ] as const);
dispatch(updateFarmerMigrationStatus(migrationNeeded));
- // total: active & inactive
- // active: owned, actively earning other silo assets
- // earned: active but not yet deposited into a Season
- // grown: inactive
- dispatch(
- updateFarmerSiloRewards({
- beans: {
- earned: earnedBeanBalance,
- },
- stalk: {
- active: activeStalkBalance,
- earned: earnedStalkBalance,
- grown: grownStalkBalance,
- total: activeStalkBalance.plus(grownStalkBalance),
- },
- seeds: {
- active: seedBalance,
- earned: earnedSeedBalance,
- total: seedBalance.plus(earnedSeedBalance),
- },
- roots: {
- total: rootBalance,
- },
- })
- );
+ // Transform the flatfile data into the legacy UI data structure
+ const payload: UpdateFarmerSiloBalancesPayload = {};
+
+ let activeSeedBalance: TokenValue = TokenValue.ZERO;
if (migrationNeeded) {
- const balances = await fetchMigrationData(account);
+ // After the migration block is locked in, no deposits can change in
+ // Silo V2, so we use a flatfile with silo data for each account to
+ // prevent the needed to support two different historical event schemas.
+ const [balances, _activeSeedBalance] = await Promise.all([
+ fetchMigrationData(account),
+ sdk.silo.getSeeds(account),
+ ]);
- const temp: UpdateFarmerSiloBalancesPayload = {};
+ // Pre-migration, # of seeds is calc'd from the contract getter
+ activeSeedBalance = _activeSeedBalance;
+
+ // const currentSeason = TokenValue.fromBlockchain(season.toString(), 0);
Object.entries(balances.deposits).forEach(
([addr, depositsBySeason]) => {
+ // All of the tokens addresses in the flatfile
+ // should exist in the SDK already
const token = sdk.tokens.findByAddress(addr);
if (!token) return;
- temp[token.address] = {
+
+ payload[token.address] = {
deposited: {
+ // Note that deposits in the flatfile are keyed by season
+ // instead of stem
...Object.keys(depositsBySeason).reduce(
(dep, depositSeason) => {
const crate = depositsBySeason[depositSeason];
+ // For simplicity we operate here with TokenValues using the SDK
const bdvTV = sdk.tokens.BEAN.fromBlockchain(crate.bdv);
const amountTV = token.fromBlockchain(crate.amount);
+ const baseStalkTV = token.getStalk(bdvTV);
const seedsTV = token.getSeeds(bdvTV);
- const stalkTV = token.getStalk(bdvTV);
+ // Legacy grown stalk calculation
+ const grownStalkTV = sdk.silo.calculateGrownStalkSeeds(
+ season.toString(),
+ depositSeason.toString(),
+ seedsTV
+ );
+
+ // Legacy BigNumberJS values
const bdv = transform(bdvTV, 'bnjs');
const amount = transform(amountTV, 'bnjs');
+ // Update totals
dep.amount = dep.amount.plus(amount);
dep.bdv = dep.bdv.plus(bdv);
- // const currentSeason = season.gt(0) ? season.toString() : '12793'; // FIXME
- // const grownStalk = sdk.silo.calculateGrownStalkSeeds(
- // currentSeason,
- // depositSeason,
- // seedsTV
- // );
- // console.log({
- // currentSeason,
- // depositSeason,
- // seedsTV: seedsTV.toBlockchain(),
- // grownStalk
- // })
-
+ // Create deposit crate
dep.crates.push({
- season: new BigNumberJS(depositSeason),
+ stem: ethers.BigNumber.from(depositSeason),
amount: amount,
bdv: bdv,
- // FIXME: this is base stalk
- stalk: transform(stalkTV, 'bnjs', sdk.tokens.STALK),
+ stalk: {
+ base: transform(baseStalkTV, 'bnjs', sdk.tokens.STALK),
+ grown: transform(
+ grownStalkTV,
+ 'bnjs',
+ sdk.tokens.STALK
+ ),
+ total: transform(
+ grownStalkTV.add(baseStalkTV),
+ 'bnjs',
+ sdk.tokens.STALK
+ ),
+ },
seeds: transform(seedsTV, 'bnjs'),
});
return dep;
@@ -204,34 +182,82 @@ export const useFetchFarmerSilo = () => {
};
}
);
-
- dispatch(updateFarmerSiloBalances(temp));
} else {
const balances = await sdk.silo.getBalances(account, {
source: DataSource.LEDGER,
});
- const temp: UpdateFarmerSiloBalancesPayload = {};
balances.forEach((balance, token) => {
- temp[token.address] = {
+ // Post-migration, # of active seeds is calc'd from BDV
+ activeSeedBalance = activeSeedBalance.add(
+ token.getSeeds(balance.bdv)
+ );
+
+ payload[token.address] = {
deposited: {
amount: transform(balance.amount, 'bnjs', token),
bdv: transform(balance.bdv, 'bnjs', sdk.tokens.BEAN),
crates: balance.deposits.map((crate) => ({
- season: transform(crate.stem, 'bnjs'), // FIXME
+ stem: transform(crate.stem, 'bnjs'), // FIXME
amount: transform(crate.amount, 'bnjs', token),
bdv: transform(crate.bdv, 'bnjs', sdk.tokens.BEAN),
- stalk: transform(crate.stalk.total, 'bnjs', sdk.tokens.STALK), // FIXME: base or total?
+ stalk: {
+ base: transform(crate.stalk.base, 'bnjs', sdk.tokens.STALK),
+ grown: transform(crate.stalk.grown, 'bnjs', sdk.tokens.STALK),
+ total: transform(crate.stalk.total, 'bnjs', sdk.tokens.STALK),
+ },
seeds: transform(crate.seeds, 'bnjs'),
})),
},
};
});
-
- dispatch(updateFarmerSiloBalances(temp));
}
+
+ /// earnedStalk (this is already included in activeStalk)
+ /// earnedSeed (aka plantable seeds)
+ /// these work because 1 BEAN = 1 BDV.
+ const earnedStalkBalance = sdk.tokens.BEAN.getStalk(earnedBeanBalance);
+ const earnedSeedBalance = sdk.tokens.BEAN.getSeeds(earnedBeanBalance);
+ const totalStalkBalance = activeStalkBalance.add(grownStalkBalance);
+ const totalSeedbalance = activeSeedBalance.add(earnedSeedBalance);
+
+ // total: active & inactive
+ // active: owned, actively earning other silo assets
+ // earned: active but not yet deposited into a Season
+ // grown: inactive
+ const rewards = {
+ beans: {
+ earned: transform(earnedBeanBalance, 'bnjs', sdk.tokens.BEAN),
+ },
+ stalk: {
+ active: transform(activeStalkBalance, 'bnjs', sdk.tokens.STALK),
+ earned: transform(earnedStalkBalance, 'bnjs', sdk.tokens.STALK),
+ grown: transform(grownStalkBalance, 'bnjs', sdk.tokens.STALK),
+ total: transform(totalStalkBalance, 'bnjs', sdk.tokens.STALK),
+ },
+ seeds: {
+ active: transform(activeSeedBalance, 'bnjs', sdk.tokens.SEEDS),
+ earned: transform(earnedSeedBalance, 'bnjs', sdk.tokens.SEEDS),
+ total: transform(totalSeedbalance, 'bnjs', sdk.tokens.SEEDS),
+ },
+ roots: {
+ total: rootBalance,
+ },
+ };
+
+ // console.log("Silo Rewards", rewards, {
+ // totalStalkBalance: totalStalkBalance.toHuman(),
+ // grownStalkBalance: grownStalkBalance.toHuman(),
+ // earnedBeanBalance: earnedBeanBalance.toHuman(),
+ // })
+
+ dispatch(updateLegacyFarmerSiloRewards(rewards));
+
+ // HEADS UP: this has to be called after updateLegacyFarmerSiloRewards
+ // to prevent some rendering errors. Refactor later.
+ dispatch(updateLegacyFarmerSiloBalances(payload));
}
- }, [initialized, sdk, account, beanstalk, dispatch]);
+ }, [initialized, sdk, account, dispatch, season]);
const clear = useCallback(
(_account?: string) => {
diff --git a/projects/ui/src/util/Crates.ts b/projects/ui/src/util/Crates.ts
index e9de5f723d..ce00ff288e 100644
--- a/projects/ui/src/util/Crates.ts
+++ b/projects/ui/src/util/Crates.ts
@@ -36,7 +36,7 @@ export const selectCratesForEnroot = (
crates,
encoded: beanstalk.interface.encodeFunctionData('enrootDeposit', [
addr,
- crates[0].season.toString(), // season
+ crates[0].stem.toString(),
unripeTokens[addr].stringify(crates[0].amount), // amount
]),
};
@@ -45,8 +45,7 @@ export const selectCratesForEnroot = (
crates,
encoded: beanstalk.interface.encodeFunctionData('enrootDeposits', [
addr,
- // fixme: not sure why TS doesn't pick up the type of `crates` here
- crates.map((crate) => crate.season.toString()), // seasons
+ crates.map((crate) => crate.stem.toString()),
crates.map((crate) => unripeTokens[addr].stringify(crate.amount)), // amounts
]),
};