From 1d97655bf84ad2a50894d5f1dea86d7b66b4121f Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 30 Jan 2022 16:45:43 -0500 Subject: [PATCH 01/26] Update en.json --- public/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/en.json b/public/locales/en.json index 3846b3266..50a555b4f 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -185,7 +185,7 @@ "txSpeedUp_tokenApproval": "Token approval transaction was sped up. View it on Polygonscan.", "txSpeedUp_withdraw": "Withdraw transaction was sped up. View it on Polygonscan.", "unavailable": "Unavailable", - "unnecessaryApprovalAskA": "As some tokens (eg. USDT) do not comply to ERC20 standards for `approve` function, when using limited approvals, you may have to reset the approvals to 0 before changing to another value. If gas usage is your concern, we recommend using unlimited approvals. Otherwise, we recommend using limited approvals for added security.", + "unnecessaryApprovalAskA": "As some tokens (eg. USDT) do not comply to ERC20 standards for the `approve` function, when using limited approvals, you may have to reset the approvals to 0 before changing to another value. If gas usage is your concern, we recommend using unlimited approvals. Otherwise, we recommend using limited approvals for added security.", "unnecessaryApprovalAskQ": "Reset token approval to 0 when having partial approval beforehand.", "unstakeAll": "Unstake All", "usdBalance": "USD balance", From 794640213583011dd193492a2763c3cbf304cd6e Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Mon, 31 Jan 2022 09:01:17 -0500 Subject: [PATCH 02/26] Update Risk.tsx --- src/pages/Risk.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Risk.tsx b/src/pages/Risk.tsx index 353e77f75..1705483cf 100644 --- a/src/pages/Risk.tsx +++ b/src/pages/Risk.tsx @@ -10,7 +10,7 @@ function Risk(): ReactElement { return (
-

Risk

+

{t("riskIntro")}{" "} From e4e9ea7194de403560680a71bada9666385480d4 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:40:22 -0500 Subject: [PATCH 03/26] Update zh.json --- public/locales/zh.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/locales/zh.json b/public/locales/zh.json index 352bec457..28a1d0cf4 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -59,7 +59,7 @@ "instant": "立刻", "insufficientBalance": "余额不足", "inTotal": "总计", - "language": null, + "language": "语言", "liquidityUtilization": "流动性利用率", "lossOfPeg": "永久丧失挂钩", "lpAvailable": null, @@ -78,7 +78,7 @@ "myActivity": "活动记录（总计）", "myFarm": null, "myShare": "我的份额", - "network": null, + "network": "网络连接", "no": "否", "noDeposit2": "从存款开始跨出第一步!", "noDepositTitle": "您没有任何资金", @@ -125,7 +125,7 @@ "swap": "兑换", "swappedForAmount": null, "swapTimeline": null, - "theme": null, + "theme": "主题", "to": "至", "toBe": "为", "tokenValue": "代币价值", From b8d49caa54e6e7d57abb8fc17dec36a532a1e0cc Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sat, 5 Feb 2022 13:39:29 -0500 Subject: [PATCH 04/26] Update Transactions.tsx --- src/components/Transactions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Transactions.tsx b/src/components/Transactions.tsx index 1c49bb1b3..8969b076f 100644 --- a/src/components/Transactions.tsx +++ b/src/components/Transactions.tsx @@ -54,7 +54,7 @@ interface Transaction { export default function Transactions(): ReactElement { const SADDLE_SUBGRAPH_URL = - "https://api.thegraph.com/subgraphs/name/saddle-finance/saddle" + "https://api.thegraph.com/subgraphs/name/karthik-gupta/mune" const { t } = useTranslation() const { chainId, account } = useActiveWeb3React() const [transactionList, setTransactionList] = useState([]) From 53045970497ac09ed0b7218bf4b201b4da0aec94 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:42:12 -0500 Subject: [PATCH 05/26] Add files via upload --- src/assets/icons/frax.svg | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 44deadc65..7801602e8 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file From 9ea4af0813218e192be034e8a252fe20130216e6 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:43:21 -0500 Subject: [PATCH 06/26] Update frax.svg --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 7801602e8..de98f0814 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - \ No newline at end of file + From feab7a29412020ac7985867e8735366812ce1390 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:43:54 -0500 Subject: [PATCH 07/26] Update frax.svg --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index de98f0814..34b1ca439 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - + From d44f814d930bfe94eda352950c248eb0c6ddadd5 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Fri, 18 Feb 2022 11:47:44 -0500 Subject: [PATCH 08/26] Add files via upload --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 34b1ca439..7801602e8 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - + \ No newline at end of file From 1f33492fa5f8d74aa717efc7dd98e4b39bd2feb7 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 22 Feb 2022 07:33:29 -0500 Subject: [PATCH 09/26] Update frax.svg --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 7801602e8..5c663f65d 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - \ No newline at end of file + From 58794b586c6b7bcea09584debca99af1a0e61145 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 22 Feb 2022 07:42:15 -0500 Subject: [PATCH 10/26] Update frax.svg --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 5c663f65d..861be949c 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - + From aaaa200f0fd343b626e65a3e016a3bb42f494931 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 22 Feb 2022 07:46:07 -0500 Subject: [PATCH 11/26] Update frax.svg --- src/assets/icons/frax.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/icons/frax.svg b/src/assets/icons/frax.svg index 861be949c..2373f1ef7 100644 --- a/src/assets/icons/frax.svg +++ b/src/assets/icons/frax.svg @@ -1 +1 @@ - + From b1cde2e08cadfaf430ba1342c1017eeae205647e Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 27 Feb 2022 12:42:10 -0500 Subject: [PATCH 12/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 909abfa26..82ea592fb 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,24 +144,24 @@ function ReviewDeposit({ {deadline} {t("minutes")}

-
- {t("rates")} -
- {transactionData.from.items.map( - ({ token, singleTokenPriceUSD }) => ( - - 1 {token.symbol} = $ - {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} - - ), - )} - {[transactionData.to.item].map(({ token, singleTokenPriceUSD }) => ( - - 1 {token.symbol} = $ - {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} - - ))} -
+//
+// {t("rates")} +//
+// {transactionData.from.items.map( +// ({ token, singleTokenPriceUSD }) => ( +// +// 1 {token.symbol} = $ +// {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} +// +// ), +// )} +// {[transactionData.to.item].map(({ token, singleTokenPriceUSD }) => ( +// +// 1 {token.symbol} = $ +// {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} +// +// ))} +//
{isHighPriceImpactTxn && ( From 6b3a41a61956d1680efe8b1826b445681fb7689c Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 27 Feb 2022 12:45:09 -0500 Subject: [PATCH 13/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 82ea592fb..04b0a8516 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -162,7 +162,7 @@ function ReviewDeposit({ // // ))} //
- +// {isHighPriceImpactTxn && ( Date: Sun, 27 Feb 2022 12:47:51 -0500 Subject: [PATCH 14/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 04b0a8516..769aea18d 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -163,7 +163,7 @@ function ReviewDeposit({ // ))} // // - +// {isHighPriceImpactTxn && ( Date: Sun, 27 Feb 2022 13:08:33 -0500 Subject: [PATCH 15/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 769aea18d..d3f1f2778 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,7 +144,7 @@ function ReviewDeposit({ {deadline} {t("minutes")} -//
+
// {t("rates")} //
// {transactionData.from.items.map( @@ -162,8 +162,8 @@ function ReviewDeposit({ // // ))} //
-//
-//
+ + {isHighPriceImpactTxn && ( Date: Sun, 27 Feb 2022 13:13:23 -0500 Subject: [PATCH 16/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index d3f1f2778..35cb66b44 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -162,7 +162,7 @@ function ReviewDeposit({ // // ))} // - +// {isHighPriceImpactTxn && ( Date: Sun, 27 Feb 2022 13:18:46 -0500 Subject: [PATCH 17/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 35cb66b44..329b98ab9 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,25 +144,25 @@ function ReviewDeposit({ {deadline} {t("minutes")} -
-// {t("rates")} -//
-// {transactionData.from.items.map( -// ({ token, singleTokenPriceUSD }) => ( -// -// 1 {token.symbol} = $ -// {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} -// -// ), -// )} -// {[transactionData.to.item].map(({ token, singleTokenPriceUSD }) => ( -// -// 1 {token.symbol} = $ -// {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} -// -// ))} -//
-//
+ {/*
+ {t("rates")} +
+ {transactionData.from.items.map( + ({ token, singleTokenPriceUSD }) => ( + + 1 {token.symbol} = $ + {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} + + ), + )} + {[transactionData.to.item].map(({ token, singleTokenPriceUSD }) => ( + + 1 {token.symbol} = $ + {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} + + ))} +
+
{isHighPriceImpactTxn && ( !prevState) } /> - )} + )} */}

{t("estimatedOutput")}

From 6ab903ae1c325d6add8fd8a5a5c7ddcbb4f16d00 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:25:25 -0500 Subject: [PATCH 18/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 329b98ab9..4addff257 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,7 +144,7 @@ function ReviewDeposit({ {deadline} {t("minutes")}
- {/*
+ /**
{t("rates")}
{transactionData.from.items.map( @@ -171,7 +171,7 @@ function ReviewDeposit({ setHasConfirmedHighPriceImpact((prevState) => !prevState) } /> - )} */} + )} */

{t("estimatedOutput")}

From d7b62623664882d40c75158a832dad379d76d2c5 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:28:54 -0500 Subject: [PATCH 19/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 4addff257..909abfa26 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,7 +144,7 @@ function ReviewDeposit({ {deadline} {t("minutes")}
- /**
+
{t("rates")}
{transactionData.from.items.map( @@ -171,7 +171,7 @@ function ReviewDeposit({ setHasConfirmedHighPriceImpact((prevState) => !prevState) } /> - )} */ + )}

{t("estimatedOutput")}

From 2dd5c7c4c910ca7f12e03ad3fbf1f1498ea572b1 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:38:36 -0500 Subject: [PATCH 20/26] Update ReviewDeposit.tsx --- src/components/ReviewDeposit.tsx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/components/ReviewDeposit.tsx b/src/components/ReviewDeposit.tsx index 909abfa26..fd4badee4 100644 --- a/src/components/ReviewDeposit.tsx +++ b/src/components/ReviewDeposit.tsx @@ -144,25 +144,6 @@ function ReviewDeposit({ {deadline} {t("minutes")}
-
- {t("rates")} -
- {transactionData.from.items.map( - ({ token, singleTokenPriceUSD }) => ( - - 1 {token.symbol} = $ - {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} - - ), - )} - {[transactionData.to.item].map(({ token, singleTokenPriceUSD }) => ( - - 1 {token.symbol} = $ - {commify(formatBNToString(singleTokenPriceUSD, 18, 2))} - - ))} -
-
{isHighPriceImpactTxn && ( Date: Tue, 6 Sep 2022 10:43:25 -0400 Subject: [PATCH 21/26] Update Pools.tsx --- src/pages/Pools.tsx | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/pages/Pools.tsx b/src/pages/Pools.tsx index 26a1c05ca..b2fa96d7a 100644 --- a/src/pages/Pools.tsx +++ b/src/pages/Pools.tsx @@ -4,7 +4,9 @@ import { BTC_POOL_NAME, BTC_POOL_V2_NAME, D4_POOL_NAME, + DAI_METAPOOL_NAME, FRAX_ARB_USD_POOL_V2_NAME, + POLY_USD_POOL_V2_NAME, POOLS_MAP, PoolName, PoolTypes, @@ -14,6 +16,7 @@ import { SUSD_METAPOOL_V2_NAME, TBTC_METAPOOL_NAME, TBTC_METAPOOL_V2_NAME, + USDT_METAPOOL_NAME, VETH2_POOL_NAME, WCUSD_METAPOOL_NAME, WCUSD_METAPOOL_V2_NAME, @@ -47,6 +50,8 @@ function Pools(): ReactElement | null { const [susdPoolV2Data, susdV2UserShareData] = usePoolData( SUSD_METAPOOL_V2_NAME, ) + const [daiPoolData, daiUserShareData] = usePoolData(DAI_METAPOOL_NAME) + const [usdtPoolData, usdtUserShareData] = usePoolData(USDT_METAPOOL_NAME) const [tbtcPoolData, tbtcUserShareData] = usePoolData(TBTC_METAPOOL_NAME) const [tbtcPoolV2Data, tbtcV2UserShareData] = usePoolData( TBTC_METAPOOL_V2_NAME, @@ -60,6 +65,9 @@ function Pools(): ReactElement | null { const [fraxArbUsdPoolV2Data, fraxArbUsdV2UserShareData] = usePoolData( FRAX_ARB_USD_POOL_V2_NAME, ) + const [polyUsdPoolV2Data, polyUsdV2UserShareData] = usePoolData( + POLY_USD_POOL_V2_NAME, + ) const [currentModal, setCurrentModal] = useState(null) const approveAndMigrate = useApproveAndMigrate() const [activeMigration, setActiveMigration] = useState<{ @@ -128,6 +136,13 @@ function Pools(): ReactElement | null { userShareData: usdV2UserShareData, poolRoute: "/pools/usdv2", } + } else if (poolName === POLY_USD_POOL_V2_NAME) { + return { + name: POLY_USD_POOL_V2_NAME, + poolData: polyUsdPoolV2Data, + userShareData: polyUsdV2UserShareData, + poolRoute: "/pools/muneusdv2", + } } else if (poolName === SUSD_METAPOOL_NAME) { return { name: SUSD_METAPOOL_NAME, @@ -142,6 +157,20 @@ function Pools(): ReactElement | null { userShareData: susdV2UserShareData, poolRoute: "/pools/munefrax", } + } else if (poolName === DAI_METAPOOL_NAME) { + return { + name: DAI_METAPOOL_NAME, + poolData: daiPoolData, + userShareData: daiUserShareData, + poolRoute: "/pools/munedai", + } + } else if (poolName === USDT_METAPOOL_NAME) { + return { + name: USDT_METAPOOL_NAME, + poolData: usdtPoolData, + userShareData: usdtUserShareData, + poolRoute: "/pools/muneusdt", + } } else if (poolName === TBTC_METAPOOL_NAME) { return { name: TBTC_METAPOOL_NAME, From 0d058b15c222ac0c7637fc97b55665771e1ddc91 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 6 Sep 2022 10:45:54 -0400 Subject: [PATCH 22/26] Update index.ts --- src/constants/index.ts | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/src/constants/index.ts b/src/constants/index.ts index 6ccdb6059..785c59b9b 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -47,6 +47,10 @@ export const WCUSD_METAPOOL_NAME = "wCUSD Metapool" export const WCUSD_METAPOOL_V2_NAME = "wCUSD Metapool V2" export const ARB_USD_POOL_NAME = "MIM Pool" export const FRAX_ARB_USD_POOL_V2_NAME = "Mune USD pool" +export const POLY_USD_POOL_V2_NAME = "Mune USD pool V2" +export const DAI_METAPOOL_NAME = "DAI Metapool" +export const USDT_METAPOOL_NAME = "USDT Metapool" + export type PoolName = | typeof BTC_POOL_NAME | typeof BTC_POOL_V2_NAME @@ -63,6 +67,9 @@ export type PoolName = | typeof WCUSD_METAPOOL_V2_NAME | typeof ARB_USD_POOL_NAME | typeof FRAX_ARB_USD_POOL_V2_NAME + | typeof POLY_USD_POOL_V2_NAME + | typeof DAI_METAPOOL_NAME + | typeof USDT_METAPOOL_NAME export enum ChainId { POLYGON = 137, @@ -170,6 +177,22 @@ export const SUSD_META_SWAP_V2_DEPOSIT_ADDRESSES = buildAddresses({ [ChainId.POLYGON]: "0x0336A39E68E2C46151adEd0E70d0CB85D1EA090b", }) +export const DAI_META_SWAP_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0xB4C0b8835f67862D6809D392d367974D83ab988A", +}) + +export const DAI_META_SWAP_DEPOSIT_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x07Ea8df7c7B07A363830cc48d12cF23AAc5AE2AC", +}) + +export const USDT_META_SWAP_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x65f967fcefB37828B48f7393E576700Bf94940FD", +}) + +export const USDT_META_SWAP_DEPOSIT_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0xF91F3FE6EA4513225e254Dbd465aC9f2b96C2811", +}) + export const TBTC_META_SWAP_ADDRESSES = buildAddresses({ [ChainId.HARDHAT]: "0xA22D78bc37cE77FeE1c44F0C2C0d2524318570c3", }) @@ -239,6 +262,10 @@ export const FRAX_ARB_USD_SWAP_V2_ADDRESSES = buildAddresses({ [ChainId.POLYGON]: "0x63C0c411F591fB0F157E70c1129D632090E2F84e", }) +export const POLY_USD_SWAP_V2_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x42412CAbb7c3d58B3211B572608441f0B27fCec7", +}) + export const RETROACTIVE_SDL_MERKLETREE_DATA = buildAddresses({ [ChainId.HARDHAT]: "hardhat.json", }) @@ -253,6 +280,14 @@ export const SUSD_SWAP_TOKEN_V2_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.POLYGON]: "0x9E609CE41726DFDA0F12cbfAF7582A94488F7C3c", }) +export const DAI_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x809757C2b3f111389865ca3DE4E8dA2104dDcbD3", +}) + +export const USDT_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x5e6c4596A13d8E6C355C333295400B67aeD7c147", +}) + export const STABLECOIN_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.HARDHAT]: "0x6D1c89F08bbB35d80B6E6b6d58D2bEFE021eFE8d", }) @@ -278,6 +313,10 @@ export const FRAX_ARB_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.POLYGON]: "0x643cBbEfD3E6C8bFe19E0a58553aEeF5B60688e0", }) +export const POLY_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ + [ChainId.MATICMUMBAI]: "0x9e6048ADf269692E6FAC03c411Cc62b62cD57907", +}) + export const BTC_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.HARDHAT]: "0x6F1216D1BFe15c98520CA1434FC1d9D57AC95321", }) @@ -344,6 +383,28 @@ export const SUSD_SWAP_V2_TOKEN = new Token( true, ) +export const DAI_SWAP_TOKEN = new Token( + DAI_SWAP_TOKEN_CONTRACT_ADDRESSES, + 18, + "muneDAI", + "munedai", + "Mune DAI/muneUSDv2", + saddleLPTokenLogo, + false, + true, +) + +export const USDT_SWAP_TOKEN = new Token( + USDT_SWAP_TOKEN_CONTRACT_ADDRESSES, + 18, + "muneUSDT", + "muneusdt", + "Mune USDT/muneUSDv2", + saddleLPTokenLogo, + false, + true, +) + export const BTC_SWAP_TOKEN = new Token( BTC_SWAP_TOKEN_CONTRACT_ADDRESSES, 18, @@ -468,6 +529,17 @@ export const FRAX_ARB_USD_SWAP_V2_TOKEN = new Token( true, ) +export const POLY_USD_SWAP_V2_TOKEN = new Token( + POLY_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES, + 18, + "muneUSDV2", + "muneusdv2", + "Mune FRAX/USDC", + saddleLPTokenLogo, + false, + true, +) + export const VETH2_SWAP_TOKEN = new Token( VETH2_SWAP_TOKEN_CONTRACT_ADDRESSES, 18, @@ -596,9 +668,14 @@ export const MIM = new Token( export const FRAX_ARB_USD_POOL_V2_TOKENS = [DAI, USDC, USDT] export const STABLECOIN_POOL_TOKENS = [DAI, USDC, USDT] +export const POLY_USD_POOL_V2_TOKENS = [FRAX, USDC] export const SUSD_POOL_TOKENS = [FRAX, ...FRAX_ARB_USD_POOL_V2_TOKENS] export const SUSD_UNDERLYING_POOL_TOKENS = [FRAX, FRAX_ARB_USD_SWAP_V2_TOKEN] export const ARB_USD_POOL_TOKENS = [NUSD, MIM, USDC, USDT] +export const DAI_POOL_TOKENS = [DAI, ...POLY_USD_POOL_V2_TOKENS] +export const DAI_UNDERLYING_POOL_TOKENS = [DAI, POLY_USD_SWAP_V2_TOKEN] +export const USDT_POOL_TOKENS = [USDT, ...POLY_USD_POOL_V2_TOKENS] +export const USDT_UNDERLYING_POOL_TOKENS = [USDT, POLY_USD_SWAP_V2_TOKEN] // Tokenized BTC const TBTC_CONTRACT_ADDRESSES = buildAddresses({ @@ -872,6 +949,16 @@ export const POOLS_MAP: PoolsMap = { route: "muneusd", rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 1, [ChainId.POLYGON]: 1 }), }, + [POLY_USD_POOL_V2_NAME]: { + name: POLY_USD_POOL_V2_NAME, + addresses: POLY_USD_SWAP_V2_ADDRESSES, + lpToken: POLY_USD_SWAP_V2_TOKEN, + poolTokens: POLY_USD_POOL_V2_TOKENS, + isSynthetic: false, + type: PoolTypes.USD, + route: "muneusdv2", + rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 1 }), + }, [SUSD_METAPOOL_V2_NAME]: { name: SUSD_METAPOOL_V2_NAME, lpToken: SUSD_SWAP_V2_TOKEN, @@ -885,6 +972,32 @@ export const POOLS_MAP: PoolsMap = { route: "munefrax", rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2, [ChainId.POLYGON]: 2 }), }, + [DAI_METAPOOL_NAME]: { + name: DAI_METAPOOL_NAME, + lpToken: DAI_SWAP_TOKEN, + poolTokens: DAI_POOL_TOKENS, + addresses: DAI_META_SWAP_DEPOSIT_ADDRESSES, + isSynthetic: false, + type: PoolTypes.USD, + metaSwapAddresses: DAI_META_SWAP_ADDRESSES, + underlyingPoolTokens: DAI_UNDERLYING_POOL_TOKENS, + underlyingPool: POLY_USD_POOL_V2_NAME, + route: "munedai", + rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2 }), + }, + [USDT_METAPOOL_NAME]: { + name: USDT_METAPOOL_NAME, + lpToken: USDT_SWAP_TOKEN, + poolTokens: USDT_POOL_TOKENS, + addresses: USDT_META_SWAP_DEPOSIT_ADDRESSES, + isSynthetic: false, + type: PoolTypes.USD, + metaSwapAddresses: USDT_META_SWAP_ADDRESSES, + underlyingPoolTokens: USDT_UNDERLYING_POOL_TOKENS, + underlyingPool: POLY_USD_POOL_V2_NAME, + route: "muneusdt", + rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2 }), + }, [SUSD_METAPOOL_NAME]: { name: SUSD_METAPOOL_NAME, lpToken: SUSD_SWAP_TOKEN, @@ -964,6 +1077,8 @@ export function isMetaPool(poolName = ""): boolean { TBTC_METAPOOL_V2_NAME, WCUSD_METAPOOL_NAME, WCUSD_METAPOOL_V2_NAME, + DAI_METAPOOL_NAME, + USDT_METAPOOL_NAME, ]).has(poolName) } From e1983cfe40f62b819b2c4c720b925ff688b7da6e Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 6 Sep 2022 12:21:18 -0400 Subject: [PATCH 23/26] Update index.ts --- src/constants/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/constants/index.ts b/src/constants/index.ts index 785c59b9b..c40288cd2 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -947,6 +947,7 @@ export const POOLS_MAP: PoolsMap = { isSynthetic: false, type: PoolTypes.USD, route: "muneusd", + isOutdated: true, rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 1, [ChainId.POLYGON]: 1 }), }, [POLY_USD_POOL_V2_NAME]: { @@ -970,6 +971,7 @@ export const POOLS_MAP: PoolsMap = { underlyingPoolTokens: SUSD_UNDERLYING_POOL_TOKENS, underlyingPool: STABLECOIN_POOL_V2_NAME, route: "munefrax", + isOutdated: true, rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2, [ChainId.POLYGON]: 2 }), }, [DAI_METAPOOL_NAME]: { From f134c47c29bb9e2469888aef4a400de838bab271 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 6 Sep 2022 13:57:18 -0400 Subject: [PATCH 24/26] Update index.ts --- src/constants/index.ts | 162 +++++++---------------------------------- 1 file changed, 28 insertions(+), 134 deletions(-) diff --git a/src/constants/index.ts b/src/constants/index.ts index c40288cd2..9843291a2 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -45,9 +45,7 @@ export const TBTC_METAPOOL_NAME = "tBTC Metapool" export const TBTC_METAPOOL_V2_NAME = "tBTC Metapool V2" export const WCUSD_METAPOOL_NAME = "wCUSD Metapool" export const WCUSD_METAPOOL_V2_NAME = "wCUSD Metapool V2" -export const ARB_USD_POOL_NAME = "MIM Pool" -export const FRAX_ARB_USD_POOL_V2_NAME = "Mune USD pool" -export const POLY_USD_POOL_V2_NAME = "Mune USD pool V2" +export const POLY_USD_POOL_NAME = "Mune USD Pool" export const DAI_METAPOOL_NAME = "DAI Metapool" export const USDT_METAPOOL_NAME = "USDT Metapool" @@ -65,9 +63,7 @@ export type PoolName = | typeof TBTC_METAPOOL_V2_NAME | typeof WCUSD_METAPOOL_NAME | typeof WCUSD_METAPOOL_V2_NAME - | typeof ARB_USD_POOL_NAME - | typeof FRAX_ARB_USD_POOL_V2_NAME - | typeof POLY_USD_POOL_V2_NAME + | typeof POLY_USD_POOL_NAME | typeof DAI_METAPOOL_NAME | typeof USDT_METAPOOL_NAME @@ -179,18 +175,22 @@ export const SUSD_META_SWAP_V2_DEPOSIT_ADDRESSES = buildAddresses({ export const DAI_META_SWAP_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0xB4C0b8835f67862D6809D392d367974D83ab988A", + [ChainId.POLYGON]: "0xF1759bd517DcC2938043c55BfAAE096A7C7C24Fb", }) export const DAI_META_SWAP_DEPOSIT_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x07Ea8df7c7B07A363830cc48d12cF23AAc5AE2AC", + [ChainId.POLYGON]: "0xF7a9D62A9b5Fb3B74F3f21B3B47FDB481767Ae5b", }) export const USDT_META_SWAP_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x65f967fcefB37828B48f7393E576700Bf94940FD", + [ChainId.POLYGON]: "0xb00982846ED52D3e0109A907aeaAE7Be24F602DF", }) export const USDT_META_SWAP_DEPOSIT_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0xF91F3FE6EA4513225e254Dbd465aC9f2b96C2811", + [ChainId.POLYGON]: "0x49FC44b4c555c07fF88151B2FA7382E0b07513B7", }) export const TBTC_META_SWAP_ADDRESSES = buildAddresses({ @@ -257,13 +257,9 @@ export const ARB_USD_SWAP_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x2a46634cb2C6428ee235D297d879406b3B39EB23", }) -export const FRAX_ARB_USD_SWAP_V2_ADDRESSES = buildAddresses({ - [ChainId.MATICMUMBAI]: "0x16a676BA365bdab3Fb47D25CC83c5de4De25E3dd", - [ChainId.POLYGON]: "0x63C0c411F591fB0F157E70c1129D632090E2F84e", -}) - -export const POLY_USD_SWAP_V2_ADDRESSES = buildAddresses({ +export const POLY_USD_SWAP_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x42412CAbb7c3d58B3211B572608441f0B27fCec7", + [ChainId.POLYGON]: "0xc03DB5066571D4334D4aC7379145A867DD4d5480", }) export const RETROACTIVE_SDL_MERKLETREE_DATA = buildAddresses({ @@ -282,10 +278,12 @@ export const SUSD_SWAP_TOKEN_V2_CONTRACT_ADDRESSES = buildAddresses({ export const DAI_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x809757C2b3f111389865ca3DE4E8dA2104dDcbD3", + [ChainId.POLYGON]: "0x48AD165409350AE84c5F8F4B8249833aF075c27c", }) export const USDT_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x5e6c4596A13d8E6C355C333295400B67aeD7c147", + [ChainId.POLYGON]: "0x9bc778aBb2D4217b6613b6D2166478b777A8780b", }) export const STABLECOIN_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ @@ -304,17 +302,9 @@ export const WCUSD_SWAP_TOKEN_V2_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.HARDHAT]: "0x5c5baB00ef196517c81097dA095948317d458f21", }) -export const ARB_USD_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ - [ChainId.MATICMUMBAI]: "0xf002D9f706da112B01D2A0CBFD2e0aA61AFd1cDB", -}) - -export const FRAX_ARB_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ - [ChainId.MATICMUMBAI]: "0xe822644651422F0a298C5a936088B1e460e4CD69", - [ChainId.POLYGON]: "0x643cBbEfD3E6C8bFe19E0a58553aEeF5B60688e0", -}) - -export const POLY_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ +export const POLY_USD_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.MATICMUMBAI]: "0x9e6048ADf269692E6FAC03c411Cc62b62cD57907", + [ChainId.POLYGON]: "0x2B333A621dDC34C4fA12c9B088AbA30BBCd55179", }) export const BTC_SWAP_TOKEN_CONTRACT_ADDRESSES = buildAddresses({ @@ -361,34 +351,12 @@ export const SDL_TOKEN = new Token( false, ) -export const SUSD_SWAP_TOKEN = new Token( - SUSD_SWAP_TOKEN_CONTRACT_ADDRESSES, - 18, - "muneFRAX", - "munefrax", - "Mune FRAX/muneUSD", - saddleLPTokenLogo, - false, - true, -) - -export const SUSD_SWAP_V2_TOKEN = new Token( - SUSD_SWAP_TOKEN_V2_CONTRACT_ADDRESSES, - 18, - "muneFRAX", - "munefrax", - "Mune FRAX/muneUSD", - saddleLPTokenLogo, - false, - true, -) - export const DAI_SWAP_TOKEN = new Token( DAI_SWAP_TOKEN_CONTRACT_ADDRESSES, 18, "muneDAI", "munedai", - "Mune DAI/muneUSDv2", + "Mune DAI/muneUSD", saddleLPTokenLogo, false, true, @@ -399,7 +367,7 @@ export const USDT_SWAP_TOKEN = new Token( 18, "muneUSDT", "muneusdt", - "Mune USDT/muneUSDv2", + "Mune USDT/muneUSD", saddleLPTokenLogo, false, true, @@ -493,17 +461,6 @@ export const WCUSD_SWAP_V2_TOKEN = new Token( true, ) -export const ARB_USD_SWAP_TOKEN = new Token( - ARB_USD_SWAP_TOKEN_CONTRACT_ADDRESSES, - 18, - "saddleArbUSD", - "saddlearbUSD", - "Saddle nUSD/MIM/USDC/USDT", - saddleLPTokenLogo, - false, - true, -) - const FRAX_CONTRACT_ADDRESSES = buildAddresses({ [ChainId.HARDHAT]: "0x851356ae760d987E095750cCeb3bC6014560891C", [ChainId.MATICMUMBAI]: "0xBC7d5f9b67fb765812D56b680279831A2c94188F", @@ -518,22 +475,11 @@ export const FRAX = new Token( fraxLogo, ) -export const FRAX_ARB_USD_SWAP_V2_TOKEN = new Token( - FRAX_ARB_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES, +export const POLY_USD_SWAP_TOKEN = new Token( + POLY_USD_SWAP_TOKEN_CONTRACT_ADDRESSES, 18, "muneUSD", "muneusd", - "Mune DAI/USDC/USDT", - saddleLPTokenLogo, - false, - true, -) - -export const POLY_USD_SWAP_V2_TOKEN = new Token( - POLY_USD_SWAP_V2_TOKEN_CONTRACT_ADDRESSES, - 18, - "muneUSDV2", - "muneusdv2", "Mune FRAX/USDC", saddleLPTokenLogo, false, @@ -666,16 +612,13 @@ export const MIM = new Token( mimLogo, ) -export const FRAX_ARB_USD_POOL_V2_TOKENS = [DAI, USDC, USDT] export const STABLECOIN_POOL_TOKENS = [DAI, USDC, USDT] -export const POLY_USD_POOL_V2_TOKENS = [FRAX, USDC] -export const SUSD_POOL_TOKENS = [FRAX, ...FRAX_ARB_USD_POOL_V2_TOKENS] -export const SUSD_UNDERLYING_POOL_TOKENS = [FRAX, FRAX_ARB_USD_SWAP_V2_TOKEN] +export const POLY_USD_POOL_TOKENS = [FRAX, USDC] export const ARB_USD_POOL_TOKENS = [NUSD, MIM, USDC, USDT] -export const DAI_POOL_TOKENS = [DAI, ...POLY_USD_POOL_V2_TOKENS] -export const DAI_UNDERLYING_POOL_TOKENS = [DAI, POLY_USD_SWAP_V2_TOKEN] -export const USDT_POOL_TOKENS = [USDT, ...POLY_USD_POOL_V2_TOKENS] -export const USDT_UNDERLYING_POOL_TOKENS = [USDT, POLY_USD_SWAP_V2_TOKEN] +export const DAI_POOL_TOKENS = [DAI, ...POLY_USD_POOL_TOKENS] +export const DAI_UNDERLYING_POOL_TOKENS = [DAI, POLY_USD_SWAP_TOKEN] +export const USDT_POOL_TOKENS = [USDT, ...POLY_USD_POOL_TOKENS] +export const USDT_UNDERLYING_POOL_TOKENS = [USDT, POLY_USD_SWAP_TOKEN] // Tokenized BTC const TBTC_CONTRACT_ADDRESSES = buildAddresses({ @@ -928,52 +871,16 @@ export const POOLS_MAP: PoolsMap = { route: "d4", rewardPids: buildPids({ [ChainId.HARDHAT]: 2 }), }, - [ARB_USD_POOL_NAME]: { - name: ARB_USD_POOL_NAME, - addresses: ARB_USD_SWAP_ADDRESSES, - lpToken: ARB_USD_SWAP_TOKEN, - poolTokens: ARB_USD_POOL_TOKENS, - isSynthetic: false, - type: PoolTypes.USD, - route: "arbusd", - isOutdated: true, - rewardPids: buildPids({}), - }, - [FRAX_ARB_USD_POOL_V2_NAME]: { - name: FRAX_ARB_USD_POOL_V2_NAME, - addresses: FRAX_ARB_USD_SWAP_V2_ADDRESSES, - lpToken: FRAX_ARB_USD_SWAP_V2_TOKEN, - poolTokens: FRAX_ARB_USD_POOL_V2_TOKENS, + [POLY_USD_POOL_NAME]: { + name: POLY_USD_POOL_NAME, + addresses: POLY_USD_SWAP_ADDRESSES, + lpToken: POLY_USD_SWAP_TOKEN, + poolTokens: POLY_USD_POOL_TOKENS, isSynthetic: false, type: PoolTypes.USD, route: "muneusd", - isOutdated: true, - rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 1, [ChainId.POLYGON]: 1 }), - }, - [POLY_USD_POOL_V2_NAME]: { - name: POLY_USD_POOL_V2_NAME, - addresses: POLY_USD_SWAP_V2_ADDRESSES, - lpToken: POLY_USD_SWAP_V2_TOKEN, - poolTokens: POLY_USD_POOL_V2_TOKENS, - isSynthetic: false, - type: PoolTypes.USD, - route: "muneusdv2", rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 1 }), }, - [SUSD_METAPOOL_V2_NAME]: { - name: SUSD_METAPOOL_V2_NAME, - lpToken: SUSD_SWAP_V2_TOKEN, - poolTokens: SUSD_POOL_TOKENS, - addresses: SUSD_META_SWAP_V2_DEPOSIT_ADDRESSES, - isSynthetic: false, - type: PoolTypes.USD, - metaSwapAddresses: SUSD_META_SWAP_V2_ADDRESSES, - underlyingPoolTokens: SUSD_UNDERLYING_POOL_TOKENS, - underlyingPool: STABLECOIN_POOL_V2_NAME, - route: "munefrax", - isOutdated: true, - rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2, [ChainId.POLYGON]: 2 }), - }, [DAI_METAPOOL_NAME]: { name: DAI_METAPOOL_NAME, lpToken: DAI_SWAP_TOKEN, @@ -983,7 +890,7 @@ export const POOLS_MAP: PoolsMap = { type: PoolTypes.USD, metaSwapAddresses: DAI_META_SWAP_ADDRESSES, underlyingPoolTokens: DAI_UNDERLYING_POOL_TOKENS, - underlyingPool: POLY_USD_POOL_V2_NAME, + underlyingPool: POLY_USD_POOL_NAME, route: "munedai", rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2 }), }, @@ -996,23 +903,10 @@ export const POOLS_MAP: PoolsMap = { type: PoolTypes.USD, metaSwapAddresses: USDT_META_SWAP_ADDRESSES, underlyingPoolTokens: USDT_UNDERLYING_POOL_TOKENS, - underlyingPool: POLY_USD_POOL_V2_NAME, + underlyingPool: POLY_USD_POOL_NAME, route: "muneusdt", rewardPids: buildPids({ [ChainId.MATICMUMBAI]: 2 }), }, - [SUSD_METAPOOL_NAME]: { - name: SUSD_METAPOOL_NAME, - lpToken: SUSD_SWAP_TOKEN, - poolTokens: SUSD_POOL_TOKENS, - addresses: SUSD_META_SWAP_DEPOSIT_ADDRESSES, - isSynthetic: true, - type: PoolTypes.USD, - metaSwapAddresses: SUSD_META_SWAP_ADDRESSES, - underlyingPoolTokens: SUSD_UNDERLYING_POOL_TOKENS, - underlyingPool: STABLECOIN_POOL_V2_NAME, - route: "susd", - rewardPids: buildPids({}), - }, [TBTC_METAPOOL_NAME]: { name: TBTC_METAPOOL_NAME, lpToken: TBTC_SWAP_TOKEN, From 9a646d5a48bdcf9131f054abc209c76dda3ab6ee Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 6 Sep 2022 13:58:28 -0400 Subject: [PATCH 25/26] Update Pools.tsx --- src/pages/Pools.tsx | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/pages/Pools.tsx b/src/pages/Pools.tsx index b2fa96d7a..bd292b422 100644 --- a/src/pages/Pools.tsx +++ b/src/pages/Pools.tsx @@ -1,12 +1,10 @@ import { ALETH_POOL_NAME, - ARB_USD_POOL_NAME, BTC_POOL_NAME, BTC_POOL_V2_NAME, D4_POOL_NAME, DAI_METAPOOL_NAME, - FRAX_ARB_USD_POOL_V2_NAME, - POLY_USD_POOL_V2_NAME, + POLY_USD_POOL_NAME, POOLS_MAP, PoolName, PoolTypes, @@ -61,13 +59,8 @@ function Pools(): ReactElement | null { const [wcusdPoolV2Data, wcusdV2UserShareData] = usePoolData( WCUSD_METAPOOL_V2_NAME, ) - const [arbUsdPoolData, arbUsdUserShareData] = usePoolData(ARB_USD_POOL_NAME) - const [fraxArbUsdPoolV2Data, fraxArbUsdV2UserShareData] = usePoolData( - FRAX_ARB_USD_POOL_V2_NAME, - ) - const [polyUsdPoolV2Data, polyUsdV2UserShareData] = usePoolData( - POLY_USD_POOL_V2_NAME, - ) + const [polyUsdPoolData, polyUsdUserShareData] = + usePoolData(POLY_USD_POOL_NAME) const [currentModal, setCurrentModal] = useState(null) const approveAndMigrate = useApproveAndMigrate() const [activeMigration, setActiveMigration] = useState<{ @@ -136,11 +129,11 @@ function Pools(): ReactElement | null { userShareData: usdV2UserShareData, poolRoute: "/pools/usdv2", } - } else if (poolName === POLY_USD_POOL_V2_NAME) { + } else if (poolName === POLY_USD_POOL_NAME) { return { - name: POLY_USD_POOL_V2_NAME, - poolData: polyUsdPoolV2Data, - userShareData: polyUsdV2UserShareData, + name: POLY_USD_POOL_NAME, + poolData: polyUsdPoolData, + userShareData: polyUsdUserShareData, poolRoute: "/pools/muneusdv2", } } else if (poolName === SUSD_METAPOOL_NAME) { @@ -199,20 +192,6 @@ function Pools(): ReactElement | null { userShareData: wcusdV2UserShareData, poolRoute: "/pools/wcusdv2", } - } else if (poolName === ARB_USD_POOL_NAME) { - return { - name: ARB_USD_POOL_NAME, - poolData: arbUsdPoolData, - userShareData: arbUsdUserShareData, - poolRoute: "/pools/arbusd", - } - } else if (poolName === FRAX_ARB_USD_POOL_V2_NAME) { - return { - name: FRAX_ARB_USD_POOL_V2_NAME, - poolData: fraxArbUsdPoolV2Data, - userShareData: fraxArbUsdV2UserShareData, - poolRoute: "/pools/muneusd", - } } else { return { name: VETH2_POOL_NAME, From acf786f8ba7fd68c83b0e9bee98f87592175f883 Mon Sep 17 00:00:00 2001 From: P0DWOG <80604400+P0DWOG@users.noreply.github.com> Date: Tue, 6 Sep 2022 14:31:42 -0400 Subject: [PATCH 26/26] Update Pools.tsx --- src/pages/Pools.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Pools.tsx b/src/pages/Pools.tsx index bd292b422..b4c7559b2 100644 --- a/src/pages/Pools.tsx +++ b/src/pages/Pools.tsx @@ -134,7 +134,7 @@ function Pools(): ReactElement | null { name: POLY_USD_POOL_NAME, poolData: polyUsdPoolData, userShareData: polyUsdUserShareData, - poolRoute: "/pools/muneusdv2", + poolRoute: "/pools/muneusd", } } else if (poolName === SUSD_METAPOOL_NAME) { return {