Merge branch 'master' into feat/sk/seasonal-pools

BeanstalkFarms · Oct 16, 2024 · 1650199 · 1650199
2 parents f918f17 + 2439d35
commit 1650199
Show file tree

Hide file tree

Showing 22 changed files with 207 additions and 72 deletions.
diff --git a/projects/dex-ui/src/wells/wellLoader.ts b/projects/dex-ui/src/wells/wellLoader.ts
@@ -31,21 +31,27 @@ const WELL_BLACKLIST: Record<number, WellAddresses> = {
     "0x0adf75da6980fee8f848d52a7af1f8d6f34a8169".toLowerCase(), // BEAN:WETH duplicate,
     "0xc22dd977c50812f754c14319de84493cc18b6cf0".toLowerCase(), // BEAN:WETH duplicate
     "0x15d7a96c3dbf6b267fae741d15c3a72f331418fe".toLowerCase(), // BEAN:WETH duplicate
+    "0xd902f7bd849da907202d177fafc1bd39f6bbadc4".toLowerCase(), // BEAN:WETH duplicate
     "0xb968de36ce9c61371a82a78b715af660c2209d11".toLowerCase(), // BEAN:wstETH duplicate
     "0x430837acc8cfe4726453b09b8d782730654899e0".toLowerCase(), // BEAN:wstETH duplicate
     "0x4731431430e7febd8df6a4aa7d28867927e827a6".toLowerCase(), // BEAN:wstETH duplicate
+    "0xc49b38dff421622628258683444f4977078cb96b".toLowerCase(), // BEAN:wstETH duplicate
     "0x8d74ff8e729b4e78898488775b619c05d1ecb5e5".toLowerCase(), // BEAN:weETH duplicate
     "0x65709d322f9c762f9435a326c653e7393807c0bc".toLowerCase(), // BEAN:weETH duplicate
     "0x8dc6400022ac4304b3236f4d073053056ac24086".toLowerCase(), // BEAN:weETH duplicate
+    "0x45f6af24e6eb8371571dde1464a458770cbbbb65".toLowerCase(), // BEAN:weETH duplicate
     "0x370062BE2d6Fc8d02948fEA75fAfe471F74854CF".toLowerCase(), // BEAN:WBTC duplicate
     "0xee950139d7730706695a4613198ecac26e69e12d".toLowerCase(), // BEAN:WBTC duplicate
     "0xb147ff6e2fd05ad3db185028beb3cce4dcb12b72".toLowerCase(), // BEAN:WBTC duplicate
+    "0xd4baa4197aa17c7f27a2465073de33690d77ec7e".toLowerCase(), // BEAN:WBTC duplicate
     "0x157219b5D112F2D8aaFD3c7F3bA5D4c73343cc96".toLowerCase(), // BEAN:USDC duplicate
     "0xdc29769db1caa5cab41835ef9a42becde80de028".toLowerCase(), // BEAN:USDC duplicate
     "0xde1a4b24aa46286739c1879612c5e5445382d93d".toLowerCase(), // BEAN:USDC duplicate
+    "0xeaddd2848e962817fd565ea269a7fedb0588b3f4".toLowerCase(), // BEAN:USDC duplicate
     "0xF3e4FC5c53D5500989e68F81d070094525caC240".toLowerCase(), // BEAN:USDT duplicate
     "0xacfb4644b708043ad6eff1cc323fda374fe6d3ce".toLowerCase(), // BEAN:USDT duplicate
-    "0x704e68281325242a60515616228c668e4865694c".toLowerCase() //  BEAN:USDT duplicate
+    "0x704e68281325242a60515616228c668e4865694c".toLowerCase(), // BEAN:USDT duplicate
+    "0xde8317a2a31a1684e2e4becedec17700718630d8".toLowerCase() //  BEAN:USDT duplicate
   ]
 };
 

diff --git a/projects/ui/src/components/Common/Form/TokenInputField.tsx b/projects/ui/src/components/Common/Form/TokenInputField.tsx
@@ -217,7 +217,7 @@ const TokenInput: FC<TokenInputProps & FieldProps> = ({
         balance: balance?.toString(),
       });
       if (!amount) return undefined; // if no amount, exit
-      if (min?.gt(amount)) return min; // clamp @ min
+      if (amount.gt(0) && min?.gt(amount)) return min; // clamp @ min
       if (!allowNegative && amount?.lt(ZERO_BN)) return ZERO_BN; // clamp negative
       if (max?.lt(amount)) return max; // clamp @ max
       return amount; // no max; always return amount
@@ -239,7 +239,6 @@ const TokenInput: FC<TokenInputProps & FieldProps> = ({
       ///
       /// FIXME: throws an error if e.target.value === '.'
       const newValue = e.target.value ? new BigNumber(e.target.value) : null;
-
       /// Always update the display amount right away.
       setDisplayAmount(newValue?.toString() || '');
 

diff --git a/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx b/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx
@@ -18,7 +18,7 @@ import {
   StyledDialogContent,
   StyledDialogTitle,
 } from '~/components/Common/Dialog';
-import { displayBN } from '~/util';
+import { displayBN, getTokenIndex } from '~/util';
 import { ZERO_BN } from '~/constants';
 import { FarmerBalances } from '~/state/farmer/balances';
 import { FarmerSilo } from '~/state/farmer/silo';
@@ -116,17 +116,18 @@ const TokenSelectDialog: TokenSelectDialogC = React.memo(
     );
 
     const getBalance = useCallback(
-      (addr: string) => {
+      (token: TokenInstance) => {
         if (!_balances) return ZERO_BN;
         if (balancesType === 'farm')
           return (
-            (_balances as TokenBalanceMode['farm'])?.[addr]?.[
+            (_balances as TokenBalanceMode['farm'])?.[getTokenIndex(token)]?.[
               balanceFromInternal
             ] || ZERO_BN
           );
         return (
-          (_balances as TokenBalanceMode['silo-deposits'])?.[addr]?.deposited
-            ?.amount || ZERO_BN
+          (_balances as TokenBalanceMode['silo-deposits'])?.[
+            getTokenIndex(token)
+          ]?.deposited?.amount || ZERO_BN
         );
       },
       [_balances, balancesType, balanceFromInternal]
@@ -245,7 +246,7 @@ const TokenSelectDialog: TokenSelectDialogC = React.memo(
           <List sx={{ p: 0 }}>
             {filteredTokenList
               ? filteredTokenList.map((_token) => {
-                  const tokenBalance = getBalance(_token.address);
+                  const tokenBalance = getBalance(_token);
                   return (
                     <ListItem
                       key={_token.address}

diff --git a/projects/ui/src/components/Common/MigrationMessage.tsx b/projects/ui/src/components/Common/MigrationMessage.tsx
@@ -8,7 +8,7 @@ export default function MigrationMessage({ message }: { message?: string }) {
   return (
     <Box sx={{ textAlign: 'center' }}>
       <Typography variant="h1">
-        {message || isArbitrum ? "We're migrating!" : "We're on Arbitrum!"}
+        {message || isArbitrum ? "We're migrating!" : "We're on Arbitrum One!"}
       </Typography>
       <Typography variant="body1" textAlign="center" sx={{ display: 'inline-flex', gap: 0.5 }}>
         Please check

diff --git a/projects/ui/src/components/Field/Actions/Sow.tsx b/projects/ui/src/components/Field/Actions/Sow.tsx
@@ -68,6 +68,7 @@ import FormTxnProvider from '~/components/Common/Form/FormTxnProvider';
 import useFormTxnContext from '~/hooks/sdk/useFormTxnContext';
 import { ClaimAndDoX, SowFarmStep } from '~/lib/Txn';
 import useTemperature from '~/hooks/beanstalk/useTemperature';
+import { useMinTokensIn } from '~/hooks/beanstalk/useMinTokensIn';
 
 type SowFormValues = FormStateWithSwapQuote & {
   settings: SlippageSettingsFragment & {
@@ -182,6 +183,8 @@ const SowForm: FC<
   );
   const maxAmountUsed = maxAmountIn ? totalBeansAmount.div(maxAmountIn) : null;
 
+  const minTokenIn = useMinTokensIn(tokenIn, sdk.tokens.BEAN);
+
   const txnActions = useFarmerFormTxnsActions({
     showGraphicOnClaim: Bean.equals(tokenIn),
     claimBeansState: values.claimableBeans,
@@ -298,6 +301,7 @@ const SowForm: FC<
             maxAmountIn || ZERO_BN,
             tokenInBalance?.[values.balanceFrom] || ZERO_BN
           )}
+          min={minTokenIn}
           balance={tokenInBalance || undefined}
           state={values.tokens[0]}
           showTokenSelect={showTokenSelect}

diff --git a/projects/ui/src/components/Field/Chart/MorningTemperature.tsx b/projects/ui/src/components/Field/Chart/MorningTemperature.tsx
@@ -321,7 +321,7 @@ const MorningTemperature: React.FC<{
         titleTooltip={
           <Box>
             The interest rate for Sowing Beans. Beanstalk logarithmically
-            increases the Temperature for the first 25 blocks of each Season up
+            increases the Temperature for the first 5 minutes of each Season up
             to the Max Temperature.
           </Box>
         }

diff --git a/projects/ui/src/components/Nav/Buttons/PriceButton.tsx b/projects/ui/src/components/Nav/Buttons/PriceButton.tsx
@@ -37,7 +37,6 @@ import { useTokens } from '~/hooks/beanstalk/useTokens';
 import { Token } from '@beanstalk/sdk';
 import BigNumber from 'bignumber.js';
 import useChainId from '~/hooks/chain/useChainId';
-import { IS_DEV } from '~/util';
 import FolderMenu from '../FolderMenu';
 
 type TokenPriceEntry = {
@@ -290,7 +289,7 @@ const PriceButton: FC<ButtonProps> = ({ ...props }) => {
           poolState={beanPools[pool.address]}
           useTWA={showTWA}
           ButtonProps={{
-            href: `${IS_DEV ? 'http://localhost:2424/#/wells' : BASIN_WELL_LINK}/${chainId}/${pool.address}`,
+            href: `${BASIN_WELL_LINK}${chainId}/${pool.address}`,
             target: '_blank',
             rel: 'noreferrer',
           }}

diff --git a/projects/ui/src/components/Nav/routes.ts b/projects/ui/src/components/Nav/routes.ts
@@ -11,6 +11,7 @@ import disclosuresIcon from '~/img/beanstalk/interface/nav/disclosures.svg';
 import analyticsIcon from '~/img/beanstalk/interface/nav/stats.svg';
 import basinIcon from '~/img/beanstalk/interface/nav/basin.svg';
 import pipelineIcon from '~/img/beanstalk/interface/nav/pipeline.svg';
+import migrationIcon from '~/img/beanstalk/interface/nav/migration.svg';
 
 export type RouteData = {
   /** Nav item title */
@@ -83,12 +84,12 @@ const ROUTES: { [key in RouteKeys]: RouteData[] } = {
       icon: governanceIcon,
       small: true,
     },
-    // {
-    //   path: '/preview',
-    //   title: 'Migration Preview',
-    //   icon: migrationIcon,
-    //   small: true,
-    // },
+    {
+      path: '/l2claim',
+      title: 'Claim Balances on L2',
+      icon: migrationIcon,
+      small: true,
+    },
     {
       path: 'docs',
       href: 'https://docs.bean.money/almanac',

diff --git a/projects/ui/src/components/Silo/Token/TokenAbout.tsx b/projects/ui/src/components/Silo/Token/TokenAbout.tsx
@@ -5,7 +5,7 @@ import BigNumber from 'bignumber.js';
 import { Link } from 'react-router-dom';
 import Row from '~/components/Common/Row';
 import { useAppSelector } from '~/state';
-import { BASIN_WELL_LINK, ZERO_BN } from '~/constants';
+import { BASE_ARBISCAN_ADDR_LINK, BASIN_WELL_LINK, ZERO_BN } from '~/constants';
 import { InfoOutlined } from '@mui/icons-material';
 import usePools from '~/hooks/beanstalk/usePools';
 import useSdk from '~/hooks/sdk';
@@ -42,7 +42,7 @@ const TokenAbout = ({ token }: { token: Token }) => {
       <Row justifyContent="space-between">
         <Typography variant="subtitle1">Token address</Typography>
         <Typography
-          to={`https://etherscan.io/address/${token.address}`}
+          to={`${BASE_ARBISCAN_ADDR_LINK}${token.address}`}
           rel="noopener noreferrer"
           target="_blank"
           component={Link}

diff --git a/projects/ui/src/components/Silo/Token/TokenDepositRewards.tsx b/projects/ui/src/components/Silo/Token/TokenDepositRewards.tsx
@@ -5,10 +5,12 @@ import BigNumber from 'bignumber.js';
 import { InfoOutlined } from '@mui/icons-material';
 import { BeanstalkPalette, FontWeight } from '~/components/App/muiTheme';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import { useNavigate } from 'react-router-dom';
 
 const TokenDepositRewards = ({ token }: { token: Token }) => {
   const seedReward = new BigNumber(token.rewards?.seeds?.toHuman() || '0');
   const stalkReward = new BigNumber(token.rewards?.stalk?.toHuman() || '0');
+  const navigate = useNavigate();
 
   return (
     <Stack gap={2}>
@@ -26,6 +28,7 @@ const TokenDepositRewards = ({ token }: { token: Token }) => {
           color="secondary"
           size="small"
           endIcon={<OpenInNewIcon sx={{ height: '16px', width: 'auto' }} />}
+          onClick={() => navigate('/analytics')}
         >
           <Typography fontWeight="inherit">
             View rewards
@@ -90,6 +93,7 @@ const TokenDepositRewards = ({ token }: { token: Token }) => {
           color="secondary"
           size="small"
           endIcon={<OpenInNewIcon sx={{ height: '16px', width: 'auto' }} />}
+          onClick={() => navigate('/analytics')}
         >
           View Bean Supply
         </Button>

diff --git a/projects/ui/src/components/Silo/Token/TokenDepositsOverview.tsx b/projects/ui/src/components/Silo/Token/TokenDepositsOverview.tsx
@@ -63,9 +63,10 @@ const TokenDepositsOverview = ({ token }: Props) => {
             <Typography
               component="span"
               fontWeight="inherit"
+              ml={0.3}
               display={{ xs: 'none', md: 'inline' }}
             >
-              {' Deposits'}
+              Deposits
             </Typography>
           </Button>
           {!isBEAN && (
@@ -87,9 +88,10 @@ const TokenDepositsOverview = ({ token }: Props) => {
               <Typography
                 fontWeight="inherit"
                 component="span"
+                ml={0.3}
                 display={{ xs: 'none', md: 'inline' }}
               >
-                {' Deposits'}
+                Deposits
               </Typography>
             </Button>
           )}

diff --git a/projects/ui/src/components/Swap/Actions/Swap.tsx b/projects/ui/src/components/Swap/Actions/Swap.tsx
@@ -20,6 +20,7 @@ import {
   NativeToken,
   BeanSwapNodeQuote,
   BeanSwapOperation,
+  BeanstalkSDK,
 } from '@beanstalk/sdk';
 import {
   FormApprovingState,
@@ -35,14 +36,13 @@ import {
 import { TokenSelectMode } from '~/components/Common/Form/TokenSelectDialog';
 import TokenInputField from '~/components/Common/Form/TokenInputField';
 import FarmModeField from '~/components/Common/Form/FarmModeField';
-import { Beanstalk } from '~/generated/index';
 import { ZERO_BN } from '~/constants';
 import { useBeanstalkContract } from '~/hooks/ledger/useContract';
 import useFarmerBalances from '~/hooks/farmer/useFarmerBalances';
 import { useSigner } from '~/hooks/ledger/useSigner';
 
 import useAccount from '~/hooks/ledger/useAccount';
-import { MinBN, tokenIshEqual } from '~/util';
+import { getTokenIndex, MinBN, tokenIshEqual } from '~/util';
 import { IconSize } from '~/components/App/muiTheme';
 import TransactionToast from '~/components/Common/TxnToast';
 import { useFetchFarmerBalances } from '~/state/farmer/balances/updater';
@@ -62,6 +62,7 @@ import useQuoteWithParams, {
   QuoteHandlerResultNew,
   QuoteHandlerWithParams,
 } from '~/hooks/ledger/useQuoteWithParams';
+import { useMinTokensIn } from '~/hooks/beanstalk/useMinTokensIn';
 
 /// ---------------------------------------------------------------
 
@@ -113,7 +114,7 @@ const Quoting = (
 const SwapForm: FC<
   FormikProps<SwapFormValues> & {
     balances: ReturnType<typeof useFarmerBalances>;
-    beanstalk: Beanstalk;
+    beanstalk: BeanstalkSDK['contracts']['beanstalk'];
     tokenList: (ERC20Token | NativeToken)[];
     defaultValues: SwapFormValues;
   }
@@ -161,15 +162,17 @@ const SwapForm: FC<
     [balances]
   );
 
+  const minTokenIn = useMinTokensIn(tokenIn, tokenOut);
+
   const [balanceIn, balanceInInput, balanceInMax] = useMemo(() => {
-    const _balanceIn = balances[tokenIn.address];
+    const _balanceIn = balances[getTokenIndex(tokenIn)];
     if (tokensMatch) {
       const _balanceInMax =
         _balanceIn[modeIn === FarmFromMode.INTERNAL ? 'internal' : 'external'];
       return [_balanceIn, _balanceInMax, _balanceInMax] as const;
     }
     return [_balanceIn, _balanceIn, _balanceIn?.total || ZERO_BN] as const;
-  }, [balances, modeIn, tokenIn.address, tokensMatch]);
+  }, [balances, modeIn, tokenIn, tokensMatch]);
 
   const [getAmountsBySource] = useGetBalancesUsedBySource({
     tokens: values.tokensIn,
@@ -197,12 +200,14 @@ const SwapForm: FC<
           ? FarmFromMode.INTERNAL
           : FarmFromMode.EXTERNAL
       );
+    } else if (tokenIn.equals(sdk.tokens.ETH)) {
+      setFromOptions([BalanceFrom.EXTERNAL]);
     } else {
       setFromOptions([BalanceFrom.TOTAL]);
       setBalanceFromIn(BalanceFrom.TOTAL);
       setFieldValue('modeIn', FarmFromMode.INTERNAL_EXTERNAL);
     }
-  }, [tokensMatch, modeIn, modeOut, setFieldValue]);
+  }, [tokensMatch, modeIn, modeOut, tokenIn, sdk, setFieldValue]);
 
   const noBalance = !balanceInMax?.gt(0);
   const expectedFromMode = balanceIn
@@ -237,6 +242,7 @@ const SwapForm: FC<
         inputToken.fromHuman(_amountIn.toString()),
         slippage
       );
+
       if (!quoteData) {
         throw new Error('No route found.');
       }
@@ -399,8 +405,21 @@ const SwapForm: FC<
       /// Flip destinations.
       setFieldValue('modeIn', modeOut);
       setFieldValue('modeOut', modeIn);
+    } else {
+      setFieldValue('tokensIn.0', { ...values.tokenOut });
+      setFieldValue('tokenOut', {
+        ...values.tokensIn[0],
+        amount: undefined,
+      });
     }
-  }, [modeIn, modeOut, setFieldValue, tokensMatch]);
+  }, [
+    modeIn,
+    modeOut,
+    setFieldValue,
+    tokensMatch,
+    values.tokenOut,
+    values.tokensIn,
+  ]);
 
   // if tokenIn && tokenOut are equal and no balances are found, reverse positions.
   // This prevents setting of internal balance of given token when there is none
@@ -420,8 +439,8 @@ const SwapForm: FC<
     (_tokens: Set<TokenInstance>) => {
       if (tokenSelect === 'tokenOut') {
         const newTokenOut = Array.from(_tokens)[0];
-        setFieldValue('tokenOut.token', newTokenOut);
         if (tokenIn === newTokenOut) handleTokensEqual();
+        setFieldValue('tokenOut.token', newTokenOut);
       } else if (tokenSelect === 'tokensIn') {
         const newTokenIn = Array.from(_tokens)[0];
         setFieldValue('tokensIn.0.token', newTokenIn);
@@ -512,6 +531,7 @@ const SwapForm: FC<
                   ]
                 : undefined
             }
+            min={minTokenIn}
             balance={balanceInInput}
             quote={quotingOut ? Quoting : undefined}
             onChange={handleChangeAmountIn}
@@ -811,13 +831,12 @@ function getBeanSwapOperation(
       'Output token does not match quote. Please refresh the quote.'
     );
   }
-  if (!quote.sellAmount.eq(amountIn.toNumber())) {
+  if (!amountIn.eq(quote.sellAmount.toHuman())) {
     throw new Error(
       "Input amount doesn't match quote. Please refresh the quote."
     );
   }
-  const formFmountOutTV = tokenOut.fromHuman(amountOut.toString());
-  if (!quote.buyAmount.eq(formFmountOutTV)) {
+  if (!amountOut.eq(quote.buyAmount.toHuman())) {
     throw new Error(
       "Output amount doesn't match quote. Please refresh the quote."
     );

diff --git a/projects/ui/src/constants/chaininfo.ts b/projects/ui/src/constants/chaininfo.ts
@@ -63,7 +63,7 @@ export const CHAIN_INFO: ChainInfoMap = {
     explorer: 'https://arbiscan.io',
     explorerName: 'Arbiscan',
     explorerLogoUrl: arbitrumIcon,
-    label: 'Arbitrum',
+    label: 'Arbitrum One',
     logoUrl: ethereumLogoUrl,
     nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
     statusPage: 'https://status.arbitrum.io/',