diff --git a/packages/eco-data-server/src/apis/treasury/polkadot/ambassadorTreasuryOnAssetHub.js b/packages/eco-data-server/src/apis/treasury/polkadot/ambassadorTreasuryOnAssetHub.js deleted file mode 100644 index bdd37f2d1..000000000 --- a/packages/eco-data-server/src/apis/treasury/polkadot/ambassadorTreasuryOnAssetHub.js +++ /dev/null @@ -1,28 +0,0 @@ -const { multiApiQuery } = require("./common"); -const { USDT_ASSET_ID } = require("./consts"); - -const AssetHubAmbassadorTreasuryAccount = - "13wa8ddUNUhXnGeTrjYH8hYXF2jNdCJvgcADJakNvtNdGozX"; - -async function getAssetHubAsset(api, assetId) { - const account = await api.query.assets.account( - assetId, - AssetHubAmbassadorTreasuryAccount, - ); - return account.toJSON(); -} - -async function getAmbassadorTreasuryOnAssetHubFromApi(api) { - return getAssetHubAsset(api, USDT_ASSET_ID); -} - -async function getAmbassadorTreasuryOnAssetHub() { - return await multiApiQuery("polkadotAssetHub", (api) => - getAmbassadorTreasuryOnAssetHubFromApi(api), - ); -} - -module.exports = { - getAmbassadorTreasuryOnAssetHub, - getAmbassadorTreasuryOnAssetHubFromApi, -}; diff --git a/packages/eco-data-server/src/apis/treasury/polkadot/index.js b/packages/eco-data-server/src/apis/treasury/polkadot/index.js index d37681b62..5bf7aa9bb 100644 --- a/packages/eco-data-server/src/apis/treasury/polkadot/index.js +++ b/packages/eco-data-server/src/apis/treasury/polkadot/index.js @@ -17,10 +17,6 @@ const { loansPendulumDotBalance, loansHydrationDotBalance, } = require("./loans"); -const { - getAmbassadorTreasuryOnAssetHub, -} = require("./ambassadorTreasuryOnAssetHub"); - function calcTotalBalance({ dotTreasuryBalanceOnRelayChain, usdtTreasuryBalanceOnRelayChain, @@ -28,7 +24,6 @@ function calcTotalBalance({ bountyTreasuryOnRelay, fellowshipTreasuryDotOnAssetHub, fellowshipSalaryUsdtBalance, - ambassadorTreasuryUsdtBalance, dotTreasuryBalanceOnAssetHub, usdtTreasuryBalanceOnAssetHub, usdcTreasuryBalanceOnAssetHub, @@ -81,7 +76,6 @@ function calcTotalBalance({ const usdt = new BigNumber(fellowshipSalaryUsdtBalance?.balance || 0) .plus(usdtTreasuryBalanceOnAssetHub?.balance || 0) .plus(usdtTreasuryBalanceOnRelayChain?.balance || 0) - .plus(ambassadorTreasuryUsdtBalance?.balance || 0) .plus(getTotal(hydrationAccount1Usdt)) .plus(getTotal(hydrationAccount2Usdt)) .plus(getTotal(hydrationAccount4Usdt)) @@ -118,8 +112,6 @@ async function getPolkadotTreasuryData() { const fellowshipSalaryUsdtBalance = await getFellowshipSalaryUsdtOnAssetHub(); - const ambassadorTreasuryUsdtBalance = await getAmbassadorTreasuryOnAssetHub(); - const { dotTreasuryBalanceOnAssetHub, usdtTreasuryBalanceOnAssetHub, @@ -141,7 +133,6 @@ async function getPolkadotTreasuryData() { bountyTreasuryOnRelay, fellowshipTreasuryDotOnAssetHub, fellowshipSalaryUsdtBalance, - ambassadorTreasuryUsdtBalance, dotTreasuryBalanceOnAssetHub, usdtTreasuryBalanceOnAssetHub, usdcTreasuryBalanceOnAssetHub, diff --git a/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/getTreasuryBalance.js b/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/getTreasuryBalance.js index e629ad343..475b473fd 100644 --- a/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/getTreasuryBalance.js +++ b/packages/eco-data-server/src/scripts/polkadotTreasuryHistory/getTreasuryBalance.js @@ -12,9 +12,6 @@ const { const { getFellowshipSalaryUsdtOnAssetHubFromApi, } = require("../../apis/treasury/polkadot/fellowshipSalaryOnAssetHub"); -const { - getAmbassadorTreasuryOnAssetHubFromApi, -} = require("../../apis/treasury/polkadot/ambassadorTreasuryOnAssetHub"); const { getTreasuryOnAssetHubFromApi, } = require("../../apis/treasury/polkadot/treasuryOnAssetHub"); @@ -75,9 +72,6 @@ async function getPolkadotAssetHubTreasuries(api, daysAgo) { const fellowshipSalaryUsdtBalance = await getFellowshipSalaryUsdtOnAssetHubFromApi(blockApi); - const ambassadorTreasuryUsdtBalance = - await getAmbassadorTreasuryOnAssetHubFromApi(blockApi); - const { dotTreasuryBalanceOnAssetHub, usdtTreasuryBalanceOnAssetHub, @@ -89,7 +83,6 @@ async function getPolkadotAssetHubTreasuries(api, daysAgo) { return { fellowshipTreasuryDotOnAssetHub, fellowshipSalaryUsdtBalance, - ambassadorTreasuryUsdtBalance, dotTreasuryBalanceOnAssetHub, usdtTreasuryBalanceOnAssetHub, usdcTreasuryBalanceOnAssetHub, diff --git a/site/src/constants/statemint.js b/site/src/constants/statemint.js index 1e2d44089..79cb45f5b 100644 --- a/site/src/constants/statemint.js +++ b/site/src/constants/statemint.js @@ -4,9 +4,6 @@ export const STATEMINT_FELLOWSHIP_SALARY_ACCOUNT = export const STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT = "16VcQSRcMFy6ZHVjBvosKmo7FKqTb8ZATChDYo8ibutzLnos"; -export const STATEMINT_AMBASSADOR_TREASURY_ACCOUNT = - "13wa8ddUNUhXnGeTrjYH8hYXF2jNdCJvgcADJakNvtNdGozX"; - export const STATEMINT_ASSETS = [ { id: 1984, diff --git a/site/src/context/PolkadotTreasury.jsx b/site/src/context/PolkadotTreasury.jsx index e95caa3cc..81fa4defe 100644 --- a/site/src/context/PolkadotTreasury.jsx +++ b/site/src/context/PolkadotTreasury.jsx @@ -12,7 +12,6 @@ import { useQueryAssetHubTreasuryFree } from "../hooks/treasury/useQueryAssetHub import { STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT, STATEMINT_FELLOWSHIP_SALARY_ACCOUNT, - STATEMINT_AMBASSADOR_TREASURY_ACCOUNT, } from "../constants/statemint"; import { useLoansBifrostDotBalance, @@ -81,12 +80,6 @@ export default function PolkadotTreasuryProvider({ children }) { isLoading: isFellowshipTreasuryDotLoading, } = useQueryAssetHubTreasuryFree(STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT); - const { balance: ambassadorUSDtBalance, isLoading: isAmbassadorUSDtLoading } = - useQueryAccountBalanceBySymbol( - "USDt", - STATEMINT_AMBASSADOR_TREASURY_ACCOUNT, - ); - const { balance: loansBifrostDotBalance, isLoading: isLoansBifrostDotLoading, @@ -126,7 +119,6 @@ export default function PolkadotTreasuryProvider({ children }) { assetHubUSDtBalance || 0, hydrationUSDtBalance || 0, fellowshipSalaryUSDtBalance || 0, - ambassadorUSDtBalance || 0, ).toString(), USDt.decimals, ); @@ -167,8 +159,7 @@ export default function PolkadotTreasuryProvider({ children }) { isUsdtBalanceLoadingOnRelayChain || isAssetHubUSDtLoading || isHydrationLoading || - isFellowshipSalaryUSDtLoading || - isAmbassadorUSDtLoading; + isFellowshipSalaryUSDtLoading; const isTotalUSDCLoading = isUsdcBalanceLoadingOnRelayChain || @@ -202,8 +193,6 @@ export default function PolkadotTreasuryProvider({ children }) { isHydrationLoading, fellowshipSalaryUSDtBalance, isFellowshipSalaryUSDtLoading, - ambassadorUSDtBalance, - isAmbassadorUSDtLoading, fellowshipTreasuryDotBalance, isFellowshipTreasuryDotLoading, loansBifrostDotBalance, diff --git a/site/src/pages/Overview/polkadot/treasuryDetail/ambassador.jsx b/site/src/pages/Overview/polkadot/treasuryDetail/ambassador.jsx deleted file mode 100644 index 1d5e9ebfb..000000000 --- a/site/src/pages/Overview/polkadot/treasuryDetail/ambassador.jsx +++ /dev/null @@ -1,46 +0,0 @@ -import TreasuryDetailItem from "./common/item"; -import { toPrecision } from "../../../../utils"; -import { USDt } from "../../../../utils/chains/usdt"; -import ValueDisplay from "../../../../components/ValueDisplay"; -import { STATEMINT_AMBASSADOR_TREASURY_ACCOUNT } from "../../../../constants/statemint"; -import AssetValueDisplay from "./common/assetValueDisplay"; -import { usePolkadotTreasuryData } from "../../../../context/PolkadotTreasury"; -import AssetWrapper from "./common/assetWrapper"; -import { ExternalLink } from "./common/assetItem"; - -export default function TreasuryDetailAmbassador() { - const { ambassadorUSDtBalance, isAmbassadorUSDtLoading } = - usePolkadotTreasuryData(); - - return ( - - Ambassador - - } - iconSrc="/imgs/data-collectives.svg" - content={ - - } - isLoading={isAmbassadorUSDtLoading} - footer={ - - - - } - /> - ); -} diff --git a/site/src/pages/Overview/polkadot/treasuryDetail/index.jsx b/site/src/pages/Overview/polkadot/treasuryDetail/index.jsx index e4a445b3c..432e62b54 100644 --- a/site/src/pages/Overview/polkadot/treasuryDetail/index.jsx +++ b/site/src/pages/Overview/polkadot/treasuryDetail/index.jsx @@ -10,7 +10,6 @@ import { mdcss, smcss } from "../../../../styles/responsive"; import TreasuryDetailLoans from "./loans"; import TreasuryDetailAssets from "./assets"; import TreasuryDetailMythToken from "./mythToken"; -import TreasuryDetailAmbassador from "./ambassador"; const Wrapper = styled(Card)` padding: 24px; @@ -27,7 +26,6 @@ export default function OverviewTreasuryDetail() { -