From 60740e1e6abb668d5f2e6a71611925e63b3a3826 Mon Sep 17 00:00:00 2001 From: Uncle Fatso Date: Mon, 6 Apr 2026 16:28:49 +0300 Subject: [PATCH] apply latest hoodi deployments Signed-off-by: Uncle Fatso --- package.json | 2 +- src/App.jsx | 8 +----- src/components/Sidebar/NavContent.jsx | 2 +- src/components/TopBar/Wallet/Token.tsx | 7 ++--- src/constants.ts | 5 +++- src/constants/addresses.js | 26 ++++++++++++------- src/containers/Dex/TokenModal.jsx | 3 +-- src/containers/Stake/components/FarmPools.jsx | 3 +-- .../components/TokenInfo.jsx | 26 +++++++------------ 9 files changed, 37 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 5e43c42..4a05b27 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ghost-dao-interface", "private": true, - "version": "0.6.14", + "version": "0.6.15", "type": "module", "scripts": { "dev": "vite", diff --git a/src/App.jsx b/src/App.jsx index e5978c0..0f52ad6 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -22,7 +22,7 @@ import Sidebar from "./components/Sidebar/Sidebar"; import TopBar from "./components/TopBar/TopBar"; import { shouldTriggerSafetyCheck } from "./helpers"; -import { isNetworkAvailable, isNetworkLegacy, isGovernanceAvailable } from "./constants"; +import { isNetworkAvailable, isGovernanceAvailable } from "./constants"; import useTheme from "./hooks/useTheme"; import { useUnstableProvider } from "./hooks/ghost"; import { dark as darkTheme } from "./themes/dark.js"; @@ -34,8 +34,6 @@ const Bonds = lazy(() => import("./containers/Bond/Bonds")); const BondModalContainer = lazy(() => import("./containers/Bond/BondModal")); const StakeContainer = lazy(() => import("./containers/Stake/StakeContainer")); const TreasuryDashboard = lazy(() => import("./containers/TreasuryDashboard/TreasuryDashboard")); -const Faucet = lazy(() => import("./containers/Faucet/Faucet")); -const Wrapper = lazy(() => import("./containers/WethWrapper/WethWrapper")); const Dex = lazy(() => import("./containers/Dex/Dex")); const Bridge = lazy(() => import("./containers/Bridge/Bridge")); const NotFound = lazy(() => import("./containers/NotFound/NotFound")); @@ -219,10 +217,6 @@ function App() { } /> } /> } /> - {isNetworkLegacy(chainId) - ? } /> - : } /> - } } /> } /> {isGovernanceAvailable(chainId, addressChainId) && } />} diff --git a/src/components/Sidebar/NavContent.jsx b/src/components/Sidebar/NavContent.jsx index c879e49..60d487f 100644 --- a/src/components/Sidebar/NavContent.jsx +++ b/src/components/Sidebar/NavContent.jsx @@ -40,7 +40,7 @@ import BondIcon from "../Icon/BondIcon"; import StakeIcon from "../Icon/StakeIcon"; import WrapIcon from "../Icon/WrapIcon"; -import { isNetworkAvailable, isNetworkLegacy, isGovernanceAvailable } from "../../constants"; +import { isNetworkAvailable, isGovernanceAvailable } from "../../constants"; import { AVAILABLE_DEXES } from "../../constants/dexes"; import { GATEKEEPER_ADDRESSES } from "../../constants/addresses"; import { ECOSYSTEM } from "../../constants/ecosystem"; diff --git a/src/components/TopBar/Wallet/Token.tsx b/src/components/TopBar/Wallet/Token.tsx index d427cb0..802eb56 100644 --- a/src/components/TopBar/Wallet/Token.tsx +++ b/src/components/TopBar/Wallet/Token.tsx @@ -15,7 +15,6 @@ import { useQuery } from "react-query"; import { formatCurrency, formatNumber } from "../../../helpers"; import { DecimalBigNumber } from "../../../helpers/DecimalBigNumber" import { tokenNameConverter } from "../../../helpers/tokenConverter"; -import { isNetworkLegacy } from "../../../constants"; import { EMPTY_ADDRESS } from "../../../constants/addresses"; import GhostStyledIcon from "../../Icon/GhostIcon"; @@ -240,10 +239,8 @@ export const useWallet = (chainId, userAddress) => { address: reserveAddress, balance: reserveBalance, price: reservePrice, - icons: isNetworkLegacy(chainId) ? ["GDAI"] : [tokenNameConverter(chainId, reserveSymbol)], - externalUrl: isNetworkLegacy(chainId) - ? "https://ghostchain.io/wp-content/uploads/2025/03/gDAI.svg" - : "https://ghostchain.io/wp-content/uploads/2025/11/6A-Classic-ETC-Token.svg", + icons: [tokenNameConverter(chainId, reserveSymbol)], + externalUrl: "https://ghostchain.io/wp-content/uploads/2025/11/6A-Classic-ETC-Token.svg", refetch: reserveRefetch, }, ftso: { diff --git a/src/constants.ts b/src/constants.ts index b4ce9f2..2fca6d9 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -42,7 +42,10 @@ export const isNetworkAvailable = (chainId, addressChainId) => { export const isNetworkLegacy = (chainId) => { let isLegacy = false; switch (chainId) { - case 560048: + case 11155111: + isLegacy = true + break; + case 63: isLegacy = true break; default: diff --git a/src/constants/addresses.js b/src/constants/addresses.js index 451edc8..17f52dd 100644 --- a/src/constants/addresses.js +++ b/src/constants/addresses.js @@ -4,25 +4,25 @@ export const EMPTY_ADDRESS = "0x0000000000000000000000000000000000000000"; export const STAKING_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xC2C579631Bf6daA93252154080fecfd68c6aa506", - [NetworkId.TESTNET_HOODI]: "0x25F62eDc6C89FF84E957C22336A35d2dfc861a86", + [NetworkId.TESTNET_HOODI]: "0xC2C579631Bf6daA93252154080fecfd68c6aa506", [NetworkId.TESTNET_MORDOR]: "0xC2C579631Bf6daA93252154080fecfd68c6aa506", }; export const BOND_DEPOSITORY_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0x46BF6F7c3e96351eab7542f2B14c9f2ac6d08dF0", - [NetworkId.TESTNET_HOODI]: "0x6Ad50B1E293E68B2fC230c576220a93A9D311571", + [NetworkId.TESTNET_HOODI]: "0x46BF6F7c3e96351eab7542f2B14c9f2ac6d08dF0", [NetworkId.TESTNET_MORDOR]: "0x46BF6F7c3e96351eab7542f2B14c9f2ac6d08dF0", }; export const DAO_TREASURY_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0x05D797f9F34844594C956da58f1785997397f02E", - [NetworkId.TESTNET_HOODI]: "0x1a1b29b18f714fac9dDabEf530dFc4f85b56A6e8", + [NetworkId.TESTNET_HOODI]: "0x05D797f9F34844594C956da58f1785997397f02E", [NetworkId.TESTNET_MORDOR]: "0x05D797f9F34844594C956da58f1785997397f02E", }; export const FTSO_DAI_LP_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xCd1505E5d169525e0241c177aF5929A92E02276D", - [NetworkId.TESTNET_HOODI]: "0xf7B2d44209E70782d93A70F7D8eC50010dF7ae50", + [NetworkId.TESTNET_HOODI]: "0x0000000000000000000000000000000000000000", [NetworkId.TESTNET_MORDOR]: "0x53B13C4722081c405ce25c7A7629fC326A49a469", }; @@ -34,7 +34,7 @@ export const FTSO_STNK_LP_ADDRESSES = { export const RESERVE_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14", - [NetworkId.TESTNET_HOODI]: "0x80c6676c334BCcE60b3CC852085B72143379CE58", + [NetworkId.TESTNET_HOODI]: "0xE69a5c6dd88cA798b93c3C92fc50c51Fd5305eB4", [NetworkId.TESTNET_MORDOR]: "0x6af91B3763b5d020E0985f85555EB50e5852d7AC", }; @@ -46,41 +46,43 @@ export const WETH_ADDRESSES = { export const GHST_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0x1eCee8BfceC44e535B3Ee92Aca70507668781392", - [NetworkId.TESTNET_HOODI]: "0xE98f7426457E6533B206e91B7EcA97aa8A258B46", + [NetworkId.TESTNET_HOODI]: "0x1eCee8BfceC44e535B3Ee92Aca70507668781392", [NetworkId.TESTNET_MORDOR]: "0x1eCee8BfceC44e535B3Ee92Aca70507668781392", }; export const STNK_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xa31cf59baC26Dd8A8b422b999eB1Ba541C941EA7", - [NetworkId.TESTNET_HOODI]: "0xF07e9303A9f16Afd82f4f57Fd6fca68Aa0AB6D7F", + [NetworkId.TESTNET_HOODI]: "0xa31cf59baC26Dd8A8b422b999eB1Ba541C941EA7", [NetworkId.TESTNET_MORDOR]: "0xa31cf59baC26Dd8A8b422b999eB1Ba541C941EA7", }; export const FTSO_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0x7ebd1224D36d64eA09312073e60f352d1383801A", - [NetworkId.TESTNET_HOODI]: "0xb184e423811b644A1924334E63985c259F5D0033", + [NetworkId.TESTNET_HOODI]: "0x7ebd1224D36d64eA09312073e60f352d1383801A", [NetworkId.TESTNET_MORDOR]: "0x7ebd1224D36d64eA09312073e60f352d1383801A", }; export const DISTRIBUTOR_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xfa524772eec78FAeD0db2cF8A831FDDa9F5B0544", - [NetworkId.TESTNET_HOODI]: "0xdF49dC81c457c6f92e26cf6d686C7a8715255842", + [NetworkId.TESTNET_HOODI]: "0xfa524772eec78FAeD0db2cF8A831FDDa9F5B0544", [NetworkId.TESTNET_MORDOR]: "0xfa524772eec78FAeD0db2cF8A831FDDa9F5B0544", }; export const GHOST_GOVERNANCE_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xaf7Ad1b83C47405BB9aa96868bCFbb6D65e4C2a1", + [NetworkId.TESTNET_HOODI]: "0xF950101af53733Ccf9309Ef4CC374B300dd43010", [NetworkId.TESTNET_MORDOR]: "0xF950101af53733Ccf9309Ef4CC374B300dd43010", }; export const BONDING_CALCULATOR_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xfA821181de76D3EAdb404dDe971A6d28289F22b3", - [NetworkId.TESTNET_HOODI]: "0x2635d526Ad24b98082563937f7b996075052c6Fd", + [NetworkId.TESTNET_HOODI]: "0xfA821181de76D3EAdb404dDe971A6d28289F22b3", [NetworkId.TESTNET_MORDOR]: "0xfA821181de76D3EAdb404dDe971A6d28289F22b3", } export const GATEKEEPER_ADDRESSES = { [NetworkId.TESTNET_SEPOLIA]: "0xd735cA07984a16911222c08411A80e24EB38869B", + [NetworkId.TESTNET_HOODI]: "0x4823F1DC785D721eAdD2bD218E1eeD63aF67fBF4", [NetworkId.TESTNET_MORDOR]: "0x4823F1DC785D721eAdD2bD218E1eeD63aF67fBF4", } @@ -116,6 +118,10 @@ export const CEX_TICKERS = { "https://api.binance.com/api/v3/ticker/price?symbol=ETHUSDT", "https://api.coinbase.com/v2/prices/ETH-USDT/spot", ], + [NetworkId.TESTNET_HOODI]: [ + "https://api.binance.com/api/v3/ticker/price?symbol=ETHUSDT", + "https://api.coinbase.com/v2/prices/ETH-USDT/spot", + ], [NetworkId.TESTNET_MORDOR]: [ "https://api.binance.com/api/v3/ticker/price?symbol=ETCUSDT", "https://api.coinbase.com/v2/prices/ETC-USDT/spot", diff --git a/src/containers/Dex/TokenModal.jsx b/src/containers/Dex/TokenModal.jsx index a66d22e..ce452fc 100644 --- a/src/containers/Dex/TokenModal.jsx +++ b/src/containers/Dex/TokenModal.jsx @@ -20,7 +20,6 @@ import TokenStack from "../../components/TokenStack/TokenStack"; import { DecimalBigNumber } from "../../helpers/DecimalBigNumber"; import { formatNumber } from "../../helpers/"; import { useBalance, useTokenSymbol } from "../../hooks/tokens"; -import { isNetworkLegacy } from "../../constants"; import { RESERVE_ADDRESSES, FTSO_ADDRESSES, @@ -72,7 +71,7 @@ const TokenModal = ({ chainId, account, chainSymbol, listOpen, setListOpen, setT }, { name: reserveSymbol, - icons: isNetworkLegacy(chainId) ? ["GDAI"] : [chainSymbol], + icons: [chainSymbol], balance: reserveBalance, address: RESERVE_ADDRESSES[chainId] }, diff --git a/src/containers/Stake/components/FarmPools.jsx b/src/containers/Stake/components/FarmPools.jsx index 8e23e52..36e81d6 100644 --- a/src/containers/Stake/components/FarmPools.jsx +++ b/src/containers/Stake/components/FarmPools.jsx @@ -17,7 +17,6 @@ import TokenStack from "../../../components/TokenStack/TokenStack"; import { DecimalBigNumber } from "../../../helpers/DecimalBigNumber"; import { formatCurrency } from "../../../helpers"; import { tokenNameConverter } from "../../../helpers/tokenConverter"; -import { isNetworkLegacy } from "../../../constants"; import { useLpValuation } from "../../../hooks/treasury"; import { useTotalSupply, useTokenSymbol } from "../../../hooks/tokens"; @@ -36,7 +35,7 @@ const FarmPools = ({ chainId }) => { const pools = [ { - icons: ["FTSO", isNetworkLegacy(chainId) ? "GDAI" : tokenNameConverter(chainId, reserveSymbol)], + icons: ["FTSO", tokenNameConverter(chainId, reserveSymbol)], name: `${ftsoSymbol}-${reserveSymbol}`, dex: "Uniswap V2", url: `/${network}/dex/uniswap`, diff --git a/src/containers/TreasuryDashboard/components/TokenInfo.jsx b/src/containers/TreasuryDashboard/components/TokenInfo.jsx index 9c47fa9..b2d0995 100644 --- a/src/containers/TreasuryDashboard/components/TokenInfo.jsx +++ b/src/containers/TreasuryDashboard/components/TokenInfo.jsx @@ -6,7 +6,6 @@ import Token from "../../../components/Token/Token"; import { SecondaryButton } from "../../../components/Button"; import { formatNumber, formatCurrency } from "../../../helpers"; import { DecimalBigNumber } from "../../../helpers/DecimalBigNumber"; -import { isNetworkLegacy } from "../../../constants" import { useBalance, useTokenSymbol } from "../../../hooks/tokens"; import { @@ -129,17 +128,15 @@ const TokenInfo = ({ chainId, isMobileScreen }) => { price={ghstPrice} description={`${ghstSymbol} is the governance token enabling pure Web3 cross-chain magic. 1 ${ghstSymbol} = 1 ${ftsoSymbol} x Current Index.`} /> - {!isNetworkLegacy(chainId) && ( - - )} + { tokenName={reserveSymbol} balance={reserveBalance} price={reservePrice} - description={isNetworkLegacy(chainId) - ? `${ftsoSymbol} is backed by a treasury reserve of crypto assets, with ${reserveSymbol} being the primary and most liquid asset.` - : `${reserveSymbol} (Wrapped ${nativeSymbol}) is an ERC-20 token that represents ${nativeSymbol} and is pegged 1:1 to the value of ${nativeSymbol}.` - } + description={`${ftsoSymbol} is backed by a treasury reserve of crypto assets, with ${reserveSymbol} being the primary and most liquid asset.`} />