package.json

@@ -1,7 +1,7 @@
 {
   "name": "ghost-dao-interface",
   "private": true,
-  "version": "0.0.32",
+  "version": "0.0.30",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/components/TopBar/Wallet/Token.tsx

@@ -20,7 +20,6 @@ import { PrimaryButton, SecondaryButton } from "../../Button";
 
 import { useBalance } from "../../../hooks/tokens";
 import { useDaiPrice, useFtsoPrice, useStnkPrice, useGhstPrice } from "../../../hooks/prices";
-import { useLpValuation } from "../../../hooks/treasury";
 import { useAccount } from "wagmi";
 
 const addTokenToWallet = async (token, userAddress) => {
@@ -176,7 +175,7 @@ export const useWallet = (chainId, userAddress) => {
     const ftsoPrice = useFtsoPrice(chainId);
     const stnkPrice = useStnkPrice(chainId);
     const ghstPrice = useGhstPrice(chainId);
-    const lpDaiFtsoPrice = useLpValuation(chainId, "GDAI_FTSO", 1000000000000000000n);
+    // TODO: add lp price
 
     const tokens = {
         dai: {
@@ -216,7 +215,7 @@ export const useWallet = (chainId, userAddress) => {
             symbol: "UNI-V2",
             address: lpDaiFtsoBalanceAddress,
             balance: lpDaiFtsoBalance,
-            price: lpDaiFtsoPrice,
+            price: ftsoPrice,
             icons: ["GDAI", "FTSO"],
             externalUrl: "https://ghostchain.io/wp-content/uploads/2025/03/uni-v2.svg",
         }

src/constants/addresses.js

@@ -48,10 +48,6 @@ export const GHOST_GOVERNANCE_ADDRESSES = {
     [NetworkId.TESTNET_SEPOLIA]: "0xD40E6442Ee01c234CD8AaF335122CfbB2aec8548",
 };
 
-export const BONDING_CALCULATOR_ADDRESSES = {
-    [NetworkId.TESTNET_SEPOLIA]:  "0x29a6bb5De7a1049632E107544CaEF05e518451e7",
-}
-
 export const UNISWAP_V2_ROUTER = {
     [NetworkId.TESTNET_SEPOLIA]: "0xee567fe1712faf6149d80da1e6934e354124cfe3",
 };

src/containers/Stake/components/FarmPools.jsx

@@ -23,13 +23,16 @@ import { useTotalSupply } from "../../../hooks/tokens";
 import {
     DAI_ADDRESSES,
     FTSO_ADDRESSES,
+    STNK_ADDRESSES,
+    GHST_ADDRESSES,
+    FTSO_DAI_LP_ADDRESSES,
 } from "../../../constants/addresses";
 
 const FarmPools = ({ chainId }) => {
     const isSmallScreen = useMediaQuery("(max-width: 775px)");
 
-    const { totalSupply: daiFtsoUniTotalSupply } = useTotalSupply(chainId, "GDAI_FTSO");
-    const daiFtsoUniValuation = useLpValuation(chainId, "GDAI_FTSO", daiFtsoUniTotalSupply._value);
+    const { totalSupply: daiFtsoUniTotalSupply } = useTotalSupply(chainId, FTSO_DAI_LP_ADDRESSES[chainId]);
+    const daiFtsoUniValuation = useLpValuation(chainId, FTSO_DAI_LP_ADDRESSES[chainId], daiFtsoUniTotalSupply._value);
 
     const pools = [
         {

src/hooks/bonds/index.jsx

@@ -4,14 +4,9 @@ import toast from "react-hot-toast";
 
 import { config } from "../../config";
 
-import {
-    BOND_DEPOSITORY_ADDRESSES,
-    DAO_TREASURY_ADDRESSES,
-    BONDING_CALCULATOR_ADDRESSES,
-} from "../../constants/addresses";
+import { BOND_DEPOSITORY_ADDRESSES, DAO_TREASURY_ADDRESSES } from "../../constants/addresses";
 import { abi as BondAbi } from "../../abi/GhostBondDepository.json";
 import { abi as TreasuryAbi } from "../../abi/GhostTreasury.json";
-import { abi as BondingCalculatorAbi } from "../../abi/GhostBondingCalculator.json";
 
 import { useFtsoPrice } from "../prices";
 import { getTokenAddress, getTokenIcons, getTokenName, getBondNameDisplayName, getTokenPurchaseLink } from "../helpers";
@@ -90,20 +85,6 @@ export const useLiveBonds = (chainId) => {
         })
     });
 
-    const { data: markdowns } = useReadContracts({
-        contracts: markets?.map((_, index) => {
-            const quoteTokenAddress = markets?.at(index).result?.at(1) ? markets.at(index).result.at(1) : "";
-            return {
-                abi: BondingCalculatorAbi,
-                address: BONDING_CALCULATOR_ADDRESSES[chainId],
-                functionName: "markdown",
-                args: [quoteTokenAddress],
-                scopeKey: `markdown-${quoteTokenAddress}-${chainId}`,
-                chainId: chainId,
-            }
-        })
-    });
-
     const liveBonds = liveIndexesRaw ? liveIndexesRaw.map((bondIndex, index) => {
         const id = Number(bondIndex);
 
@@ -116,12 +97,9 @@ export const useLiveBonds = (chainId) => {
         const quoteTokenPerUsd = quotePrices?.at(index).result
             ? new DecimalBigNumber(quotePrices.at(index).result * (10n ** 9n), quoteTokenDecimals)
             : new DecimalBigNumber(0n, quoteTokenDecimals);
-        const markdown = markdowns?.at(index).result
-            ? new DecimalBigNumber(markdowns.at(index).result, quoteTokenDecimals)
-            : new DecimalBigNumber(1n, 0);
 
         const quoteTokenPerBaseToken = new DecimalBigNumber(marketPrice, 9);
-        const priceInUsd = quoteTokenPerUsd.mul(quoteTokenPerBaseToken).mul(markdown);
+        const priceInUsd = quoteTokenPerUsd.mul(quoteTokenPerBaseToken);
         const discount = baseTokenPerUsd._value > 0n
             ? baseTokenPerUsd.sub(priceInUsd).div(baseTokenPerUsd)
             : new DecimalBigNumber("0", baseTokenPerUsd._decimals);

src/hooks/helpers.js

@@ -65,7 +65,7 @@ export const getTokenAddress = (chainId, name) => {
         case "GHST":
             address = GHST_ADDRESSES[chainId];
             break;
-        case "GDAI_FTSO":
+        case "DAI_FTSO":
             address = FTSO_DAI_LP_ADDRESSES[chainId];
             break;
     }

src/hooks/prices/index.js

@@ -2,6 +2,7 @@ import { useReadContract } from "wagmi";
 
 import { useCurrentIndex } from "../staking";
 import { useUniswapV2PairReserves } from "../uniswapv2";
+import { useLpValuation } from "../treasury";
 import { DecimalBigNumber } from "../../helpers/DecimalBigNumber";
 import { FTSO_DAI_LP_ADDRESSES, DAI_ADDRESSES } from "../../constants/addresses";
 

src/hooks/treasury/index.js

@@ -4,7 +4,6 @@ import { DAO_TREASURY_ADDRESSES } from "../../constants/addresses";
 import { abi as TreasuryAbi } from "../../abi/GhostTreasury.json";
 
 import { DecimalBigNumber } from "../../helpers/DecimalBigNumber";
-import { getTokenAddress } from "../helpers";
 
 export const useTotalReserves = (chainId) => {
     const { data: totalReservesRaw } = useReadContract({
@@ -22,14 +21,13 @@ export const useTotalReserves = (chainId) => {
 };
 
 export const useLpValuation = (chainId, pairAddress, pairSupply) => {
-    const convertedPairAddress = getTokenAddress(chainId, pairAddress);
     const { data: valuationRaw } = useReadContract({
         abi: TreasuryAbi,
         address: DAO_TREASURY_ADDRESSES[chainId],
         functionName: "tokenValue",
         scopeKey: `tokenValue-${pairAddress}-${pairSupply.toString()}-${chainId}`,
         args: [
-            convertedPairAddress,
+            pairAddress,
             pairSupply,
         ],
         chainId,