Merge pull request #2054 from usual-dao/usUSDC-yield

Us usds yield

Author: slasher125

src/adaptors/usual/index.js

@@ -17,12 +17,16 @@ const CONFIG = {
     USD0: '0x35f1C5cB7Fb977E669fD244C567Da99d8a3a6850',
     CHAIN: 'Arbitrum',
   },
+  USUSDSPP_VAULT: '0x67ec31a47a4126A66C7bb2fE017308cf5832A4Db',
+  USUSDSPP_VAULT_SYMBOL: 'usUSDS++',
   USUAL_TOKEN: '0xC4441c2BE5d8fA8126822B9929CA0b81Ea0DE38E',
+  SUSDS_TOKEN: '0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD',
   USUALX_TOKEN: '0x06B964d96f5dCF7Eae9d7C559B09EDCe244d4B8E',
   USUALX_LOCKUP: '0x85B6F9BDdb10c6B320d07416a250F984f0F0E9ED',
   USUALX_LOCKUP_SYMBOL: 'lUSUALx (12 months)',
   USD0_SYMBOL: 'USD0',
   USUAL_SYMBOL: 'USUAL',
+  USUALX_SYMBOL: 'USUALx',
   USD0PP_SYMBOL: 'USD0++',
   ETH0_SYMBOL: 'ETH0',
   URLS: {
@@ -104,21 +108,6 @@ async function getETH0ChainData(chainConfig) {
 }
 
 async function getUsualXAPY(chain, usualXPrice) {
-  const { output } = await sdk.api.abi.call({
-    target: CONFIG.USUALX_TOKEN,
-    chain: chain.toLowerCase(),
-    abi: abi.find((abi) => abi.name === 'totalAssets'),
-  });
-  const totalAssets = output / CONFIG.SCALAR;
-  const rate =
-    (
-      await sdk.api.abi.call({
-        target: CONFIG.USUALX_TOKEN,
-        chain: chain.toLowerCase(),
-        abi: abi.find((abi) => abi.name === 'getYieldRate'),
-      })
-    ).output / CONFIG.SCALAR;
-
   const blacklistedBalances = await sdk.api.abi
     .multiCall({
       abi: 'erc20:balanceOf',
@@ -145,13 +134,13 @@ async function getUsualXAPY(chain, usualXPrice) {
   const usualXTVL =
     rawUsualXTVL - (blacklistedBalances?.reduce((a, b) => a + b, 0) ?? 0);
 
-  const usualXApr = (rate * CONFIG.DAYS_PER_YEAR) / totalAssets;
+  const usualXApr = await getRewardData(
+    CONFIG.USUALX_SYMBOL,
+    CONFIG.USUAL_SYMBOL
+  );
 
-  // Applying weekly compounding only to USUALx apyReward
-  const usualxApyReward = utils.aprToApy(
-    usualXApr * 100,
-    CONFIG.WEEKS_PER_YEAR
-  ); // Weekly compounding for apyReward
+  // Applying daily compounding only to USUALx apyReward
+  const usualxApyReward = utils.aprToApy(usualXApr.apr, CONFIG.DAYS_PER_YEAR); // Daily compounding for apyReward
 
   const usualxMarketCap = usualXTVL * usualXPrice;
   const usualXLockupMarketCap = usualXLockupBalance * usualXPrice;
@@ -175,6 +164,64 @@ async function getUsualXAPY(chain, usualXPrice) {
   };
 }
 
+async function getUsUSDSAPY(chain) {
+  const { output } = await sdk.api.abi.call({
+    target: CONFIG.USUSDSPP_VAULT,
+    chain: chain.toLowerCase(),
+    abi: abi.find((abi) => abi.name === 'totalAssets'),
+  });
+  const totalAssets = output / CONFIG.SCALAR;
+
+  const blacklistedBalances = await sdk.api.abi
+    .multiCall({
+      abi: 'erc20:balanceOf',
+      calls: CONFIG.USUALX_BALANCES_BLACKLIST.map((address) => ({
+        target: CONFIG.USUSDSPP_VAULT,
+        params: [address],
+      })),
+      chain: chain.toLowerCase(),
+      permitFailure: true,
+    })
+    .then((call) =>
+      call.output.map((e) => {
+        return e.output / CONFIG.SCALAR;
+      })
+    );
+
+  const rawUsUSDSppTVL = await getTokenSupply(chain, CONFIG.USUSDSPP_VAULT);
+
+  const usualXTVL =
+    rawUsUSDSppTVL - (blacklistedBalances?.reduce((a, b) => a + b, 0) ?? 0);
+
+  //sUSDS++ vault data
+  const susdsBalance = await getTokenBalance(
+    'Ethereum',
+    CONFIG.SUSDS_TOKEN,
+    CONFIG.USUSDSPP_VAULT
+  );
+  const susdsPrice = await getTokenPrice('Ethereum', CONFIG.SUSDS_TOKEN);
+  const usUSDSppMarketCap = susdsBalance * susdsPrice;
+
+  const baseRewards = await getRewardData(
+    CONFIG.USUSDSPP_VAULT_SYMBOL,
+    CONFIG.USD0PP_SYMBOL
+  );
+  const baseUsUSDSApy = utils.aprToApy(baseRewards.apr, CONFIG.WEEKS_PER_YEAR);
+  const usualRewards = await getRewardData(
+    CONFIG.USUSDSPP_VAULT_SYMBOL,
+    CONFIG.USUAL_SYMBOL
+  );
+  const usUSDSRewardApy = utils.aprToApy(
+    usualRewards.apr,
+    CONFIG.DAYS_PER_YEAR
+  );
+  return {
+    baseUsUSDSApy,
+    usUSDSRewardApy,
+    usUSDSppMarketCap,
+  };
+}
+
 async function getRewardData(pool, reward) {
   const { data } = await axios.get(`${CONFIG.URLS.REWARD_APR_RATE}`);
   const apr = data[pool][reward];
@@ -218,7 +265,8 @@ const apy = async () => {
     usualXLockupMarketCap,
     usualXUnlockedMarketCap,
   } = await getUsualXAPY('Ethereum', usualxPrice);
-
+  const { baseUsUSDSApy, usUSDSRewardApy, usUSDSppMarketCap } =
+    await getUsUSDSAPY('Ethereum');
   return [
     createPoolData(
       CONFIG.ETHEREUM.CHAIN,
@@ -253,7 +301,7 @@ const apy = async () => {
       project: 'usual',
       symbol: 'USUALx',
       tvlUsd: usualXUnlockedMarketCap,
-      apyBase: usualxApyReward, // Weekly compounding for USUALx APY
+      apyBase: usualxApyReward, // Daily compounding for USUALx APY
       apyReward: 0, // No additional reward for USUALx
       rewardTokens: [CONFIG.ETHEREUM.USD0],
       poolMeta: 'Staked USUAL',
@@ -266,13 +314,26 @@ const apy = async () => {
       project: 'usual',
       symbol: 'USUALx',
       tvlUsd: usualXLockupMarketCap,
-      apyBase: usualxApyReward, // Weekly compounding for USUALx APY
-      apyReward: usualxApyRevenueSwitch, // Revenue switch APY for Lockup USUALx
+      apyBase: usualxApyReward, // Daily compounding for USUALx APY
+      apyReward: usualxApyRevenueSwitch, // Revenue switch APY for Lockup USUALx Weekly compounding
       rewardTokens: [CONFIG.ETHEREUM.USD0],
       underlyingTokens: [CONFIG.USUAL_TOKEN],
-      poolMeta: 'USUALx Lockup',
+      poolMeta: 'Lockup',
       url: 'https://app.usual.money/swap?from=USUALx&to=lUSUALx',
     },
+    {
+      pool: CONFIG.USUSDSPP_VAULT,
+      chain: 'Ethereum',
+      project: 'usual',
+      symbol: 'usUSDS++',
+      tvlUsd: usUSDSppMarketCap,
+      apyBase: baseUsUSDSApy, // Weekly compounding for USUSDS++ APY in USD0++
+      apyReward: usUSDSRewardApy, // Reward in Usual APY for USUSDS++
+      rewardTokens: [CONFIG.USUAL_TOKEN],
+      underlyingTokens: [CONFIG.ETHEREUM.USD0PP],
+      poolMeta: 'usUSDS++ vault',
+      url: 'https://app.usual.money/vault/susds',
+    },
   ];
 };