Remove legacy farm (#525)

BeanstalkFarms · Jun 30, 2023 · 42d702a · 42d702a
2 parents d5c6297 + 890a885
commit 42d702a
Show file tree

Hide file tree

Showing 38 changed files with 140 additions and 1,304 deletions.
diff --git a/projects/ui/src/components/Barn/Actions/Buy.tsx b/projects/ui/src/components/Barn/Actions/Buy.tsx
@@ -8,6 +8,7 @@ import {
   ERC20Token,
   NativeToken,
   BeanstalkSDK,
+  FarmFromMode,
   FarmToMode,
 } from '@beanstalk/sdk';
 import { useSelector } from 'react-redux';
@@ -33,7 +34,6 @@ import useFarmerBalances from '~/hooks/farmer/useFarmerBalances';
 import usePreferredToken, {
   PreferredToken,
 } from '~/hooks/farmer/usePreferredToken';
-import { FarmFromMode } from '~/lib/Beanstalk/Farm';
 import {
   displayFullBN,
   getTokenIndex,

diff --git a/projects/ui/src/components/Barn/Actions/Rinse.tsx b/projects/ui/src/components/Barn/Actions/Rinse.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react';
 import { Box, Stack, Typography } from '@mui/material';
 import BigNumber from 'bignumber.js';
 import { Form, Formik, FormikHelpers, FormikProps } from 'formik';
-import { Token, TokenValue } from '@beanstalk/sdk';
+import { Token, TokenValue, FarmToMode } from '@beanstalk/sdk';
 import {
   FormTxnsFormState,
   SmartSubmitButton,
@@ -15,7 +15,7 @@ import TxnAccordion from '~/components/Common/TxnAccordion';
 import FarmModeField from '~/components/Common/Form/FarmModeField';
 import TransactionToast from '~/components/Common/TxnToast';
 import useFarmerFertilizer from '~/hooks/farmer/useFarmerFertilizer';
-import { FarmToMode } from '~/lib/Beanstalk/Farm';
+
 import { displayFullBN } from '~/util';
 import { ZERO_BN } from '~/constants';
 import { ActionType } from '~/util/Actions';

diff --git a/projects/ui/src/components/Chop/Actions/Chop.tsx b/projects/ui/src/components/Chop/Actions/Chop.tsx
@@ -10,6 +10,7 @@ import BigNumber from 'bignumber.js';
 import { Form, Formik, FormikHelpers, FormikProps } from 'formik';
 import React, { useCallback, useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import { FarmToMode } from '@beanstalk/sdk';
 import {
   FormState,
   SmartSubmitButton,
@@ -35,7 +36,6 @@ import useAccount from '~/hooks/ledger/useAccount';
 import usePreferredToken, {
   PreferredToken,
 } from '~/hooks/farmer/usePreferredToken';
-import { FarmToMode } from '~/lib/Beanstalk/Farm';
 import { ActionType } from '~/util/Actions';
 import {
   displayBN,

diff --git a/projects/ui/src/components/Common/Form/FarmModeField.tsx b/projects/ui/src/components/Common/Form/FarmModeField.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Typography, TypographyProps } from '@mui/material';
-import { FarmFromMode, FarmToMode } from '~/lib/Beanstalk/Farm';
+import { FarmFromMode, FarmToMode } from '@beanstalk/sdk';
 import copy from '~/constants/copy';
 import AddressIcon from '../AddressIcon';
 import PillSelectField, { PillSelectFieldProps } from './PillSelectField';

diff --git a/projects/ui/src/components/Common/Form/TokenQuoteProvider.tsx b/projects/ui/src/components/Common/Form/TokenQuoteProvider.tsx
@@ -116,7 +116,6 @@ const TokenQuoteProvider: FC<TokenQuoteProviderProps> = ({
     );
     setFieldValue(`${name}.amountOut`, result?.amountOut); // calculated amountOut
     setFieldValue(`${name}.value`, result?.value); // ether value used
-    setFieldValue(`${name}.steps`, result?.steps); // steps
   }, [name, setFieldValue, result]);
   useEffect(() => {
     console.debug(`[TokenQuoteProvider] update ${name}.quoting =>`, quoting);

diff --git a/projects/ui/src/components/Common/Form/TokenQuoteProviderWithParams.tsx b/projects/ui/src/components/Common/Form/TokenQuoteProviderWithParams.tsx
@@ -123,7 +123,6 @@ export default function TokenQuoteProviderWithParams<T>({
     );
     setFieldValue(`${name}.amountOut`, result?.amountOut); // calculated amountOut
     setFieldValue(`${name}.value`, result?.value); // ether value used
-    setFieldValue(`${name}.steps`, result?.steps); // workflow
   }, [name, setFieldValue, result]);
   useEffect(() => {
     console.debug(`[TokenQuoteProvider] update ${name}.quoting =>`, quoting);

diff --git a/projects/ui/src/components/Common/Form/TxnPreview.tsx b/projects/ui/src/components/Common/Form/TxnPreview.tsx
@@ -2,6 +2,7 @@ import React, { useMemo, useState } from 'react';
 import { Box, Stack, Typography } from '@mui/material';
 import groupBy from 'lodash/groupBy';
 import DoubleArrowIcon from '@mui/icons-material/DoubleArrow';
+import { FarmFromMode, FarmToMode } from '@beanstalk/sdk';
 import TokenIcon from '~/components/Common/TokenIcon';
 import { FERTILIZER_ICONS } from '~/components/Barn/FertilizerImage';
 import siloIcon from '~/img/beanstalk/silo-icon.svg';
@@ -19,7 +20,6 @@ import {
 } from '~/util/Actions';
 import { SupportedChainId } from '~/constants/chains';
 import { BEAN, PODS, SEEDS, SPROUTS, STALK, USDC } from '~/constants/tokens';
-import { FarmFromMode, FarmToMode } from '~/lib/Beanstalk/Farm';
 import AddressIcon from '~/components/Common/AddressIcon';
 import Row from '~/components/Common/Row';
 import { FC } from '~/types';

diff --git a/projects/ui/src/components/Common/Form/index.ts b/projects/ui/src/components/Common/Form/index.ts
@@ -1,11 +1,11 @@
 import BigNumber from 'bignumber.js';
 import {
+  FarmToMode,
   ERC20Token as ERC20TokenNew,
   NativeToken as NativeTokenNew,
 } from '@beanstalk/sdk';
 import { ERC20Token, NativeToken } from '~/classes/Token';
 import { QuoteHandlerResult } from '~/hooks/ledger/useQuote';
-import { FarmToMode } from '~/lib/Beanstalk/Farm';
 import { BalanceFrom } from './BalanceFromRow';
 import { QuoteHandlerResultNew } from '~/hooks/ledger/useQuoteWithParams';
 import { FormTxnBundlerInterface } from '~/lib/Txn';
@@ -59,13 +59,6 @@ export type FormTokenStateNew = {
   quoting?: boolean;
 } & Partial<QuoteHandlerResultNew>;
 
-// /** Some `amountOut` received for inputting `amount` of this token into a function. */
-// amountOut?: BigNumber;
-// /** Amount of ETH used in the transaction; applied to the `value` override. */
-// value?:     ethers.BigNumber;
-// /** The steps needed to convert `amount` -> `amountOut`. */
-// steps?:     ChainableFunctionResult[];
-
 export type FormApprovingState = {
   /** */
   contract: string;

diff --git a/projects/ui/src/components/Farmer/Unripe/PickDialog.tsx b/projects/ui/src/components/Farmer/Unripe/PickDialog.tsx
@@ -12,6 +12,7 @@ import {
 } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { LoadingButton } from '@mui/lab';
+import { FarmFromMode, FarmToMode } from '@beanstalk/sdk';
 import unripeBeanIcon from '~/img/tokens/unripe-bean-logo-circled.svg';
 import brownLPIcon from '~/img/tokens/unripe-lp-logo-circled.svg';
 import { BeanstalkPalette } from '~/components/App/muiTheme';
@@ -39,7 +40,6 @@ import { ZERO_BN } from '~/constants';
 import { displayFullBN, toTokenUnitsBN } from '~/util';
 import { useBeanstalkContract } from '~/hooks/ledger/useContract';
 import useGetChainToken from '~/hooks/chain/useGetChainToken';
-import { FarmFromMode, FarmToMode } from '~/lib/Beanstalk/Farm';
 import useAccount from '~/hooks/ledger/useAccount';
 import { useFetchFarmerSilo } from '~/state/farmer/silo/updater';
 import UnripeTokenRow from './UnripeTokenRow';

diff --git a/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx b/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 import { Form, Formik, FormikHelpers, FormikProps } from 'formik';
 import React, { useCallback, useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { useProvider } from 'wagmi';
+import { ERC20Token, FarmFromMode, NativeToken, Token } from '@beanstalk/sdk';
 import TransactionToast from '~/components/Common/TxnToast';
 import TxnAccordion from '~/components/Common/TxnAccordion';
 import { TokenSelectMode } from '~/components/Common/Form/TokenSelectDialog';
@@ -17,7 +17,6 @@ import {
   TxnSeparator,
   TxnSettings,
 } from '~/components/Common/Form';
-import { ERC20Token, FarmFromMode, NativeToken, Token } from '@beanstalk/sdk';
 import useChainConstant from '~/hooks/chain/useChainConstant';
 import useFarmerBalances from '~/hooks/farmer/useFarmerBalances';
 import useTokenMap from '~/hooks/chain/useTokenMap';
@@ -28,13 +27,14 @@ import { useSigner } from '~/hooks/ledger/useSigner';
 import { useFetchFarmerBalances } from '~/state/farmer/balances/updater';
 import { useFetchFarmerMarket } from '~/state/farmer/market/updater';
 import { ActionType } from '~/util/Actions';
-import Farm from '~/lib/Beanstalk/Farm';
 import { optimizeFromMode } from '~/util/Farm';
 import {
   displayFullBN,
   toStringBaseUnitBN,
   displayTokenAmount,
   displayBN,
+  bnToTokenValue,
+  tokenValueToBN,
 } from '~/util';
 import { AppState } from '~/state';
 import { BEAN, ETH, PODS } from '~/constants/tokens';
@@ -45,16 +45,15 @@ import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import { FC } from '~/types';
 import { useFetchFarmerMarketItems } from '~/hooks/farmer/market/useFarmerMarket2';
 import TokenOutput from '~/components/Common/Form/TokenOutput';
-import useSdk from '~/hooks/sdk';
-import { bnToTokenValue } from '~/util';
+import useSdk, { getNewToOldToken } from '~/hooks/sdk';
+
 import { BuyPlotsFarmStep } from '~/lib/Txn/FarmSteps/market/BuyPlotsFarmStep';
 import TokenQuoteProviderWithParams from '~/components/Common/Form/TokenQuoteProviderWithParams';
 import TokenSelectDialogNew from '~/components/Common/Form/TokenSelectDialogNew';
 import usePreferredToken from '~/hooks/farmer/usePreferredToken';
 import useAccount from '~/hooks/ledger/useAccount';
 import { QuoteHandlerWithParams } from '~/hooks/ledger/useQuoteWithParams';
-import { getNewToOldToken } from '~/hooks/sdk';
-import { tokenValueToBN } from '~/util';
+
 import FormTxnProvider from '~/components/Common/Form/FormTxnProvider';
 import useFormTxnContext from '~/hooks/sdk/useFormTxnContext';
 
@@ -221,7 +220,7 @@ const CreateOrderV2Form: FC<
                 tokenOut={Bean}
                 balance={
                   state.token.address === ''
-                    ? balances['eth']
+                    ? balances.eth
                     : balances[state.token.address] || ZERO_BN
                 }
                 state={state}
@@ -334,12 +333,8 @@ const CreateOrderProvider: FC<{}> = () => {
 
   /// Ledger
   const { data: signer } = useSigner();
-  const provider = useProvider();
   const beanstalk = useBeanstalkContract(signer);
 
-  /// Farm
-  const farm = useMemo(() => new Farm(provider), [provider]);
-
   /// Beanstalk
   const beanstalkField = useSelector<AppState, AppState['_beanstalk']['field']>(
     (state) => state._beanstalk.field
@@ -372,7 +367,7 @@ const CreateOrderProvider: FC<{}> = () => {
         slippage: 0.1,
       },
     }),
-    [Eth]
+    [baseToken]
   );
 
   /// Handlers
@@ -392,7 +387,7 @@ const CreateOrderProvider: FC<{}> = () => {
         tokenValue: amountOut,
       };
     },
-    [Weth, farm]
+    [account, sdk]
   );
 
   const onSubmit = useCallback(
@@ -503,7 +498,10 @@ const CreateOrderProvider: FC<{}> = () => {
       fetchFarmerMarketItems,
       beanstalk,
       balances,
-      Eth,
+      handleQuote,
+      sdk,
+      account,
+      txnBundler,
     ]
   );