Bean UI - Update Price Button with ETH TWA price

projects/sdk/src/constants/abi/Ecosystem/UsdOracle.json

@@ -0,0 +1 @@
+[{"inputs":[],"name":"getEthUsdPrice","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"lookback","type":"uint256"}],"name":"getEthUsdTwa","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getUsdPrice","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]

projects/sdk/src/constants/addresses.ts

@@ -15,6 +15,7 @@ export const addresses = {
   DEPOT: Address.make("0xDEb0f00071497a5cc9b4A6B96068277e57A82Ae2"),
   PIPELINE: Address.make("0xb1bE0000C6B3C62749b5F0c92480146452D15423"),
   ROOT: Address.make("0x77700005BEA4DE0A78b956517f099260C2CA9a26"),
+  USD_ORACLE: Address.make("0x1aa19ed7DfC555E4644c9353Ad383c33024855F7"),
 
   // ----------------------------------------
   // BeaNFT Contracts

projects/sdk/src/lib/contracts.ts

@@ -27,7 +27,9 @@ import {
   BeanstalkPrice__factory,
   BeanstalkPrice,
   Math,
-  Math__factory
+  Math__factory,
+  UsdOracle,
+  UsdOracle__factory,
 } from "src/constants/generated";
 import { BaseContract } from "ethers";
 
@@ -58,6 +60,7 @@ export class Contracts {
   public readonly depot: Depot; // temp
   public readonly root: Root;
   public readonly math: Math;
+  public readonly usdOracle: UsdOracle;
 
   public readonly curve: CurveContracts;
 
@@ -75,6 +78,7 @@ export class Contracts {
     const depotAddress = sdk.addresses.DEPOT.get(sdk.chainId);
     const mathAddress = sdk.addresses.MATH.get(sdk.chainId);
     const rootAddress = sdk.addresses.ROOT.get(sdk.chainId);
+    const usdOracleAddress = sdk.addresses.USD_ORACLE.get(sdk.chainId);
 
     const beancrv3Address = sdk.addresses.BEAN_CRV3.get(sdk.chainId);
     const pool3Address = sdk.addresses.POOL3.get(sdk.chainId);
@@ -93,6 +97,7 @@ export class Contracts {
     this.depot = Depot__factory.connect(depotAddress, sdk.providerOrSigner);
     this.math = Math__factory.connect(mathAddress, sdk.providerOrSigner);
     this.root = Root__factory.connect(rootAddress, sdk.providerOrSigner);
+    this.usdOracle = UsdOracle__factory.connect(usdOracleAddress, sdk.providerOrSigner);
 
     const beanCrv3 = CurveMetaPool__factory.connect(beancrv3Address, sdk.providerOrSigner);
     const pool3 = Curve3Pool__factory.connect(pool3Address, sdk.providerOrSigner);

projects/ui/src/components/Nav/Buttons/PriceButton.tsx

@@ -75,9 +75,13 @@ const PriceButton: FC<ButtonProps> = ({ ...props }) => {
           <div>{beanTokenData.deltaB.gte(0) && '+'}{displayBN(beanTokenData.deltaB, true)}</div>
         </Box>
         <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
-          <div>ETH Price:</div>
+          <div>Instantaneous ETH Price:</div>
           <div>${tokenPrices.eth?.toFixed(2) || 0}</div>
         </Box>
+        <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
+          <div>Time-Weighted ETH Price:</div>
+          <div>${tokenPrices["ETH-TWA"]?.toFixed(2) || 0}</div>
+        </Box>
       </Box>
     </div>
   </>

projects/ui/src/hooks/beanstalk/useDataFeedTokenPrices.ts

@@ -9,7 +9,6 @@ import {
   DAI_CHAINLINK_ADDRESSES,
   USDT_CHAINLINK_ADDRESSES,
   USDC_CHAINLINK_ADDRESSES,
-  ETH_CHAINLINK_ADDRESS,
 } from '../../constants/addresses';
 import { useAggregatorV3Contract } from '~/hooks/ledger/useContract';
 import { AppState } from '../../state/index';
@@ -41,7 +40,7 @@ export default function useDataFeedTokenPrices() {
   const daiPriceFeed = useAggregatorV3Contract(DAI_CHAINLINK_ADDRESSES);
   const usdtPriceFeed = useAggregatorV3Contract(USDT_CHAINLINK_ADDRESSES);
   const usdcPriceFeed = useAggregatorV3Contract(USDC_CHAINLINK_ADDRESSES);
-  const ethPriceFeed = useAggregatorV3Contract(ETH_CHAINLINK_ADDRESS);
+  const ethPriceFeed = sdk.contracts.usdOracle;
   const crv3Pool = sdk.contracts.curve.pools.pool3;
   const getChainToken = useGetChainToken();
   const dispatch = useDispatch();
@@ -60,8 +59,8 @@ export default function useDataFeedTokenPrices() {
       usdtPriceDecimals,
       usdcPriceData,
       usdcPriceDecimals,
-      ethPriceData,
-      ethPriceDecimals,
+      ethPrice,
+      ethPriceTWA,
       crv3Price,
     ] = await Promise.all([
       daiPriceFeed.latestRoundData(),
@@ -70,8 +69,8 @@ export default function useDataFeedTokenPrices() {
       usdtPriceFeed.decimals(),
       usdcPriceFeed.latestRoundData(),
       usdcPriceFeed.decimals(),
-      ethPriceFeed.latestRoundData(),
-      ethPriceFeed.decimals(),
+      ethPriceFeed.getEthUsdPrice(),
+      ethPriceFeed.getEthUsdTwa(3600),
       crv3Pool.get_virtual_price(),
     ]);
 
@@ -102,14 +101,18 @@ export default function useDataFeedTokenPrices() {
         usdcPriceDecimals
       );
     }
-    if (ethPriceData && ethPriceDecimals) {
+    if (ethPrice && ethPriceTWA) {
       priceDataCache[eth.address] = getBNResult(
-        ethPriceData.answer,
-        ethPriceDecimals
+        ethPrice,
+        6
       );
       priceDataCache[weth.address] = getBNResult(
-        ethPriceData.answer,
-        ethPriceDecimals
+        ethPrice,
+        6
+      );
+      priceDataCache["ETH-TWA"] = getBNResult(
+        ethPriceTWA,
+        6
       );
     }
     if (crv3Price) {