feat(ui): apply diamond architecture to staking page

packages/dapp/components/lib/hooks/contracts/use-named-contracts.tsx

@@ -1,16 +1,7 @@
 import useWeb3, { PossibleProviders } from "../use-web-3";
 
-import Deployed_Contracts from "@ubiquity/contracts/deployments.json";
 import NAMED_ACCOUNTS from "../../../config/named-accounts.json";
-import { getCurveFactoryContract, getDebtCouponManagerContract, getERC20Contract, getIJarContract, getYieldProxyContract } from "@/components/utils/contracts";
-
-const getDebtCouponManagerAddress = () => {
-  const contractDeployments: Record<string, any> = Deployed_Contracts;
-  const record = contractDeployments["1"] ?? {};
-  const contract = record?.contracts ? record?.contracts["DebtCouponManager"] : undefined;
-  return contract ? contract.address : undefined;
-};
-export const DEBT_COUPON_MANAGER_ADDRESS = getDebtCouponManagerAddress();
+import { getCurveFactoryContract, getERC20Contract, getIJarContract, getYieldProxyContract } from "@/components/utils/contracts";
 
 export type NamedContracts = ReturnType<typeof connectedContracts> | null;
 export function connectedContracts(provider: NonNullable<PossibleProviders>) {
@@ -20,7 +11,6 @@ export function connectedContracts(provider: NonNullable<PossibleProviders>) {
     usdc: getERC20Contract(NAMED_ACCOUNTS.USDC, provider),
     dai: getERC20Contract(NAMED_ACCOUNTS.DAI, provider),
     usdt: getERC20Contract(NAMED_ACCOUNTS.USDT, provider),
-    debtCouponManager: getDebtCouponManagerContract(DEBT_COUPON_MANAGER_ADDRESS, provider),
     jarUsdc: getIJarContract(NAMED_ACCOUNTS.jarUSDCAddr, provider),
   };
 }

packages/dapp/components/lib/hooks/contracts/use-protocol-contracts.ts

@@ -52,6 +52,7 @@ import UbiquityPoolFacetArtifact from "@ubiquity/contracts/out/UbiquityPoolFacet
  * Contracts on hold (i.e. obsolete) until we find a better utility for them:
  * - https://github.com/ubiquity/ubiquity-dollar/tree/development/packages/contracts/src/ubiquistick
  */
+export type ProtocolContracts = ReturnType<typeof useProtocolContracts> | null;
 const useProtocolContracts = () => {
   // get current web3 provider
   const { provider } = useWeb3();

packages/dapp/components/lib/hooks/use-balances.tsx

@@ -1,10 +1,12 @@
 import { erc1155BalanceOf } from "@/lib/utils";
-import { BigNumber, Contract } from "ethers";
+import { BigNumber } from "ethers";
 import { createContext, useContext, useEffect, useState } from "react";
-import useManagerManaged from "./contracts/use-manager-managed";
 import useNamedContracts from "./contracts/use-named-contracts";
 import useWalletAddress from "./use-wallet-address";
 import { ChildrenShim } from "./children-shim-d";
+import useProtocolContracts from "@/components/lib/hooks/contracts/use-protocol-contracts";
+import { getERC20Contract, getIMetaPoolContract } from "@/components/utils/contracts";
+import useWeb3 from "@/components/lib/hooks/use-web-3";
 
 export interface Balances {
   uad: BigNumber;
@@ -26,24 +28,34 @@ export const BalancesContext = createContext<[Balances | null, RefreshBalances]>
 export const BalancesContextProvider: React.FC<ChildrenShim> = ({ children }) => {
   const [balances, setBalances] = useState<Balances | null>(null);
   const [walletAddress] = useWalletAddress();
-  const managedContracts = useManagerManaged();
   const namedContracts = useNamedContracts();
+  const protocolContracts = useProtocolContracts();
+  const { provider } = useWeb3();
 
   async function refreshBalances() {
-    if (walletAddress && managedContracts && namedContracts) {
+    if (!walletAddress || !namedContracts || !protocolContracts || !provider) {
+      return;
+    }
+
+    if(protocolContracts.managerFacet && protocolContracts.dollarToken && protocolContracts.creditToken && protocolContracts.governanceToken && protocolContracts.creditNft && protocolContracts.stakingShare) {
+      const _3crvToken = await protocolContracts.managerFacet.curve3PoolTokenAddress();
+      const dollar3poolMarket = await protocolContracts.managerFacet.stableSwapMetaPoolAddress();
+      const _3crvTokenContract = getERC20Contract(_3crvToken, provider);
+      const dollarMetapool = getIMetaPoolContract(dollar3poolMarket, provider);
+
       const [uad, _3crv, uad3crv, ucr, ubq, ucrNft, stakingShares, usdc, dai, usdt] = await Promise.all([
-        managedContracts.dollarToken.balanceOf(walletAddress),
-        managedContracts._3crvToken.balanceOf(walletAddress),
-        managedContracts.dollarMetapool.balanceOf(walletAddress),
-        managedContracts.creditToken.balanceOf(walletAddress),
-        managedContracts.governanceToken.balanceOf(walletAddress),
-        erc1155BalanceOf(walletAddress, managedContracts.creditNft),
-        erc1155BalanceOf(walletAddress, managedContracts.stakingToken),
+        protocolContracts.dollarToken.balanceOf(walletAddress),
+        _3crvTokenContract.balanceOf(walletAddress),
+        dollarMetapool.balanceOf(walletAddress),
+        protocolContracts.creditToken.balanceOf(walletAddress),
+        protocolContracts.governanceToken.balanceOf(walletAddress),
+        erc1155BalanceOf(walletAddress, protocolContracts.creditNft),
+        erc1155BalanceOf(walletAddress, protocolContracts.stakingShare),
         namedContracts.usdc.balanceOf(walletAddress),
         namedContracts.dai.balanceOf(walletAddress),
         namedContracts.usdt.balanceOf(walletAddress),
       ]);
-
+  
       setBalances({
         uad,
         _3crv,
@@ -61,7 +73,7 @@ export const BalancesContextProvider: React.FC<ChildrenShim> = ({ children }) =>
 
   useEffect(() => {
     refreshBalances();
-  }, [walletAddress, managedContracts]);
+  }, [walletAddress, protocolContracts]);
 
   return <BalancesContext.Provider value={[balances, refreshBalances]}>{children}</BalancesContext.Provider>;
 };

packages/dapp/components/lib/with-loaded-context.tsx

@@ -1,13 +1,10 @@
 import { ethers } from "ethers";
-import useDeployedContracts, { DeployedContracts } from "./hooks/contracts/use-deployed-contracts";
-import { ManagedContracts } from "./hooks/contracts/use-manager-managed";
+import useProtocolContracts, { ProtocolContracts } from "./hooks/contracts/use-protocol-contracts";
 import useNamedContracts, { NamedContracts } from "./hooks/contracts/use-named-contracts";
 import useWeb3, { PossibleProviders } from "./hooks/use-web-3";
 
-import useManagerManaged from "@/components/lib/hooks/contracts/use-manager-managed";
 export type LoadedContext = {
-  managedContracts: NonNullable<ManagedContracts>;
-  deployedContracts: NonNullable<DeployedContracts>;
+  protocolContracts: NonNullable<ProtocolContracts>;
   namedContracts: NonNullable<NamedContracts>;
   web3Provider: NonNullable<PossibleProviders>;
   walletAddress: string;
@@ -17,19 +14,17 @@ export type LoadedContext = {
 export default function withLoadedContext<T>(El: (params: LoadedContext & T) => JSX.Element, ElNull?: () => JSX.Element) {
   return (otherParams: T) => {
     const { walletAddress, signer, provider } = useWeb3();
-    const managedContracts = useManagerManaged();
-    const deployedContracts = useDeployedContracts();
     const namedContracts = useNamedContracts();
+    const protocolContracts = useProtocolContracts();
 
-    if (provider && walletAddress && signer && managedContracts && deployedContracts && namedContracts) {
+    if (provider && walletAddress && signer && protocolContracts && namedContracts) {
       return (
         <El
           web3Provider={provider}
           walletAddress={walletAddress}
           signer={signer}
           namedContracts={namedContracts}
-          managedContracts={managedContracts}
-          deployedContracts={deployedContracts}
+          protocolContracts={protocolContracts}
           {...otherParams}
         />
       );

packages/dapp/components/redeem/debt-coupon.tsx

@@ -33,7 +33,7 @@ const uDEBT = "uDEBT";
 const uAR = "uAR";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const DebtCouponContainer = ({ managedContracts, deployedContracts, web3Provider, walletAddress, signer }: LoadedContext) => {
+export const DebtCouponContainer = ({ protocolContracts, web3Provider, walletAddress, signer }: LoadedContext) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [balances, refreshBalances] = useBalances();
   const [, doTransaction] = useTransactionLogger();

packages/dapp/components/staking/bonding-shares-explorer.tsx

@@ -4,6 +4,7 @@ import { memo, useCallback, useState } from "react";
 import { formatEther } from "@/lib/format";
 import { performTransaction, useAsyncInit } from "@/lib/utils";
 import withLoadedContext, { LoadedContext } from "@/lib/with-loaded-context";
+import { getIMetaPoolContract } from "@/components/utils/contracts";
 
 import DepositShare from "./deposit-share";
 import useBalances from "../lib/hooks/use-balances";
@@ -44,22 +45,28 @@ type Actions = {
 const USD_TO_LP = 0.7460387929;
 const LP_TO_USD = 1 / USD_TO_LP;
 
-export const BondingSharesExplorerContainer = ({ managedContracts, web3Provider, walletAddress, signer }: LoadedContext) => {
+export const BondingSharesExplorerContainer = ({ protocolContracts, web3Provider, walletAddress, signer }: LoadedContext) => {
+  if (!protocolContracts.chefFacet || !protocolContracts.stakingFacet || !protocolContracts.stakingShare || !protocolContracts.managerFacet) {
+    return <></>;
+  }
   const [model, setModel] = useState<Model | null>(null);
   const [, doTransaction] = useTransactionLogger();
   const [, refreshBalances] = useBalances();
   // cspell: disable-next-line
-  const { staking: bonding, masterChef, stakingToken: bondingToken, dollarMetapool: metaPool } = managedContracts;
+  const { stakingFacet: bonding, chefFacet, stakingShare: bondingToken, managerFacet } = protocolContracts;
 
   useAsyncInit(fetchSharesInformation);
   async function fetchSharesInformation(processedShareId?: ShareData["id"]) {
     console.time("BondingShareExplorerContainer contract loading");
     const currentBlock = await web3Provider.getBlockNumber();
     // cspell: disable-next-line
     const blockCountInAWeek = +(await bonding.blockCountInAWeek()).toString();
-    const totalShares = await masterChef.totalShares();
+    const totalShares = await chefFacet.totalShares();
     // cspell: disable-next-line
     const bondingShareIds = await bondingToken.holderTokens(walletAddress);
+
+    const dollar3poolMarket = await managerFacet.stableSwapMetaPoolAddress();
+    const metaPool = getIMetaPoolContract(dollar3poolMarket, web3Provider);
     const walletLpBalance = await metaPool.balanceOf(walletAddress);
 
     const shares: ShareData[] = [];
@@ -69,10 +76,10 @@ export const BondingSharesExplorerContainer = ({ managedContracts, web3Provider,
         // cspell: disable-next-line
         const [ugov, bond, bondingShareInfo, tokenBalance] = await Promise.all([
           // cspell: disable-next-line
-          masterChef.pendingGovernance(id),
+          chefFacet.pendingGovernance(id),
           // cspell: disable-next-line
           bondingToken.getStake(id),
-          masterChef.getStakingShareInfo(id),
+          chefFacet.getStakingShareInfo(id),
           // cspell: disable-next-line
           bondingToken.balanceOf(walletAddress, id),
         ]);
@@ -149,7 +156,7 @@ export const BondingSharesExplorerContainer = ({ managedContracts, web3Provider,
         setModel((prevModel) => (prevModel ? { ...prevModel, processing: [...prevModel.processing, id] } : null));
         doTransaction("Claiming Ubiquity Governance tokens...", async () => {
           try {
-            await performTransaction(masterChef.connect(signer).getRewards(BigNumber.from(id)));
+            await performTransaction(chefFacet.connect(signer).getRewards(BigNumber.from(id)));
           } catch (error) {
             console.log(`Claiming Ubiquity Governance token rewards from ${id} failed:`, error);
             // throws exception to update the transaction log
@@ -168,6 +175,9 @@ export const BondingSharesExplorerContainer = ({ managedContracts, web3Provider,
         if (!model || model.processing.length) return;
         console.log(`Staking ${amount} for ${weeks} weeks`);
         doTransaction("Staking...", async () => {});
+
+        const dollar3poolMarket = await managerFacet.stableSwapMetaPoolAddress();
+        const metaPool = getIMetaPoolContract(dollar3poolMarket, web3Provider);
         // cspell: disable-next-line
         const allowance = await metaPool.allowance(walletAddress, bonding.address);
         console.log("allowance", ethers.utils.formatEther(allowance));

packages/dapp/components/staking/deposit-share.tsx

@@ -1,11 +1,13 @@
 import { BigNumber, ethers } from "ethers";
 import { useEffect, useState } from "react";
 
-import { ManagedContracts } from "@/lib/hooks/contracts/use-manager-managed";
+import { ProtocolContracts } from "@/components/lib/hooks/contracts/use-protocol-contracts";
+import { getSushiSwapPoolContract, getUniswapV2PairContract } from "@/components/utils/contracts";
 import { constrainNumber } from "@/lib/utils";
 import withLoadedContext, { LoadedContext } from "@/lib/with-loaded-context";
 import Button from "../ui/button";
 import PositiveNumberInput from "../ui/positive-number-input";
+import useWeb3 from "@/lib/hooks/use-web-3";
 
 const toEtherNum = (n: BigNumber) => +n.toString() / 1e18;
 const toNum = (n: BigNumber) => +n.toString();
@@ -15,32 +17,43 @@ const MAX_WEEKS = 208;
 
 // cspell: disable-next-line
 type PrefetchedConstants = { totalShares: number; usdPerWeek: number; bondingDiscountMultiplier: BigNumber };
-async function prefetchConstants(contracts: NonNullable<ManagedContracts>): Promise<PrefetchedConstants> {
-  const reserves = await contracts.governanceMarket.getReserves();
+async function prefetchConstants(contracts: NonNullable<ProtocolContracts>): Promise<PrefetchedConstants> {
+  const { provider } = useWeb3();
+
+  if (!contracts.managerFacet || !contracts.chefFacet || !contracts.stakingFacet || !provider) {
+    return { totalShares: 0, usdPerWeek: 0, bondingDiscountMultiplier: new BigNumber(0, "0x") };
+  }
+  const sushiSwapPool = await contracts.managerFacet.sushiSwapPoolAddress();
+  const sushiSwapPoolContract = getSushiSwapPoolContract(sushiSwapPool, provider);
+  const governanceMarket = getUniswapV2PairContract(await sushiSwapPoolContract.pair(), provider);
+  const reserves = await governanceMarket.getReserves();
 
   const ubqPrice = +reserves[0].toString() / +reserves[1].toString();
-  const ubqPerBlock = await contracts.masterChef.governancePerBlock();
-  const ubqMultiplier = await contracts.masterChef.governanceMultiplier();
+  const ubqPerBlock = await contracts.chefFacet.governancePerBlock();
+  const ubqMultiplier = await contracts.chefFacet.governanceMultiplier();
   const actualUbqPerBlock = toEtherNum(ubqPerBlock.mul(ubqMultiplier).div(`${1e18}`));
-  const blockCountInAWeek = toNum(await contracts.staking.blockCountInAWeek());
+  const blockCountInAWeek = toNum(await contracts.stakingFacet.blockCountInAWeek());
   const ubqPerWeek = actualUbqPerBlock * blockCountInAWeek;
-  const totalShares = toEtherNum(await contracts.masterChef.totalShares());
+  const totalShares = toEtherNum(await contracts.chefFacet.totalShares());
   const usdPerWeek = ubqPerWeek * ubqPrice;
   // cspell: disable-next-line
-  const bondingDiscountMultiplier = await contracts.staking.stakingDiscountMultiplier();
+  const bondingDiscountMultiplier = await contracts.stakingFacet.stakingDiscountMultiplier();
   // cspell: disable-next-line
   return { totalShares, usdPerWeek, bondingDiscountMultiplier };
 }
 
-async function calculateApyForWeeks(contracts: NonNullable<ManagedContracts>, prefetch: PrefetchedConstants, weeksNum: number): Promise<number> {
+async function calculateApyForWeeks(contracts: NonNullable<ProtocolContracts>, prefetch: PrefetchedConstants, weeksNum: number): Promise<number> {
+  if (!contracts.stakingFormulasFacet) {
+    return 0;
+  }
   // cspell: disable-next-line
   const { totalShares, usdPerWeek, bondingDiscountMultiplier } = prefetch;
   const DAYS_IN_A_YEAR = 365.2422;
   const usdAsLp = 0.7460387929; // TODO: Get this number from the Curve contract
   const bigNumberOneUsdAsLp = ethers.utils.parseEther(usdAsLp.toString());
   const weeks = BigNumber.from(weeksNum.toString());
   // cspell: disable-next-line
-  const shares = toEtherNum(await contracts.ubiquityFormulas.durationMultiply(bigNumberOneUsdAsLp, weeks, bondingDiscountMultiplier));
+  const shares = toEtherNum(await contracts.stakingFormulasFacet.durationMultiply(bigNumberOneUsdAsLp, weeks, bondingDiscountMultiplier));
   const rewardsPerWeek = (shares / totalShares) * usdPerWeek;
   const yearlyYield = (rewardsPerWeek / 7) * DAYS_IN_A_YEAR * 100;
   return Math.round(yearlyYield * 100) / 100;
@@ -52,7 +65,7 @@ type DepositShareProps = {
   maxLp: BigNumber;
 } & LoadedContext;
 
-const DepositShare = ({ onStake, disabled, maxLp, managedContracts: contracts }: DepositShareProps) => {
+const DepositShare = ({ onStake, disabled, maxLp, protocolContracts: contracts }: DepositShareProps) => {
   const [amount, setAmount] = useState("");
   const [weeks, setWeeks] = useState("");
   const [currentApy, setCurrentApy] = useState<number | null>(null);