@1delta/margin-fetcher 0.0.30 → 0.0.31

package/dist/lending/user-data/morpho/userCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CAkGP,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA4FP,CAAA"}

package/dist/lending/user-data/morpho/userCallParse.js

@@ -61,8 +61,6 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
             let datas = {};
             // we loop over the return dat
             for (let i = 0; i < data.length; i++) {
-                let totalDebt24h = 0;
-                let totalDeposits24h = 0;
                 // get balance data array for chunk
                 const balanceDatas = decodePackedDataset(data[i]);
                 // itereate of balanceDatas received in chunk
@@ -72,8 +70,6 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                     marketsHandled.push(markeId);
                     const market = lenderData[markeId]?.params?.market;
                     const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, prices, pricesHist);
-                    totalDebt24h += addedDebt;
-                    totalDeposits24h += addedDeposits;
                     const payload = {
                         chainId,
                         account,
@@ -81,7 +77,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                         rewards: {},
                         userEMode: 0,
                     };
-                    const userData = createBaseTypeUserState(payload, lenderData[markeId].data, totalDeposits24h, totalDebt24h);
+                    const userData = createBaseTypeUserState(payload, lenderData[markeId].data, addedDeposits, addedDebt);
                     datas[market.lender] = {
                         ...payload,
                         ...userData,
@@ -179,7 +175,8 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, price
             [loanAddress]: dataForLoanAsset,
             [collateralAddress]: dataForCollateralAsset,
         },
-        addedDeposits: Number(loanDepositNumber) * priceHistLoan + Number(collateralDec) * priceHist,
+        addedDeposits: Number(loanDepositNumber) * priceHistLoan +
+            Number(collateralDec) * priceHist,
         addedDebt: Number(borrowDec) * priceHistLoan,
     };
 }

package/dist/prices/main-prices/addresses/morpho.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"morpho.d.ts","sourceRoot":"","sources":["../../../../src/prices/main-prices/addresses/morpho.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,uBAAuB,EAAE,MAAM,CAAA;CAChC;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAi/E5D,CAAA"}
+{"version":3,"file":"morpho.d.ts","sourceRoot":"","sources":["../../../../src/prices/main-prices/addresses/morpho.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,uBAAuB,EAAE,MAAM,CAAA;CAChC;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAw/E5D,CAAA"}

package/dist/prices/main-prices/addresses/morpho.js

@@ -1029,6 +1029,13 @@ export const MrophoOracles = {
             loanAssetDecimals: 18,
             collateralAssetDecimals: 18,
         },
+        {
+            oracle: '0xC3dA445C9c4Cd78325C6DCDD314936C2Aa226372',
+            loanAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
+            collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
+            loanAssetDecimals: 8,
+            collateralAssetDecimals: 8,
+        },
         {
             oracle: '0xB60F728BdcE5e3921C0E42c1a6F07A1313D0040e',
             loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1043,13 +1050,6 @@ export const MrophoOracles = {
             loanAssetDecimals: 6,
             collateralAssetDecimals: 18,
         },
-        {
-            oracle: '0xC3dA445C9c4Cd78325C6DCDD314936C2Aa226372',
-            loanAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
-            collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
-            loanAssetDecimals: 8,
-            collateralAssetDecimals: 8,
-        },
         {
             oracle: '0xBa4c6d027b3c08Cb8c21840501Cd04ad6Bb37Cd0',
             loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1072,11 +1072,11 @@ export const MrophoOracles = {
             collateralAssetDecimals: 6,
         },
         {
-            oracle: '0x970b106C6C1df8276577dBdC8FdA010e418fC1EC',
-            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-            collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
+            oracle: '0xD978CE03d8BB0eb3f09cB2a469DbbC25DB42F3Ae',
+            loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
+            collateralAsset: '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b',
             loanAssetDecimals: 6,
-            collateralAssetDecimals: 18,
+            collateralAssetDecimals: 6,
         },
         {
             oracle: '0x3C40506CcD8f124f05a900446d38dDA4baAfd82d',
@@ -1086,25 +1086,25 @@ export const MrophoOracles = {
             collateralAssetDecimals: 8,
         },
         {
-            oracle: '0xD978CE03d8BB0eb3f09cB2a469DbbC25DB42F3Ae',
-            loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
-            collateralAsset: '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b',
+            oracle: '0x970b106C6C1df8276577dBdC8FdA010e418fC1EC',
+            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+            collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
             loanAssetDecimals: 6,
-            collateralAssetDecimals: 6,
+            collateralAssetDecimals: 18,
         },
         {
-            oracle: '0x2477367cFF71b31b4BE6963e5691859E8fcDF084',
-            loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
-            collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
+            oracle: '0x83F4197076614efe8e4c37BB9EFBfeaD08d4719f',
+            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+            collateralAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
             loanAssetDecimals: 6,
-            collateralAssetDecimals: 18,
+            collateralAssetDecimals: 8,
         },
         {
-            oracle: '0x07A9c82f38aAD9855FaF76D398F9C64a7A12F0AE',
+            oracle: '0x2477367cFF71b31b4BE6963e5691859E8fcDF084',
             loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
-            collateralAsset: '0x0913da6da4b42f538b445599b46bb4622342cf52',
+            collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
             loanAssetDecimals: 6,
-            collateralAssetDecimals: 8,
+            collateralAssetDecimals: 18,
         },
         {
             oracle: '0xcC139318686969b9D30Dd62aA206725B269DA40d',
@@ -1114,9 +1114,9 @@ export const MrophoOracles = {
             collateralAssetDecimals: 8,
         },
         {
-            oracle: '0x83F4197076614efe8e4c37BB9EFBfeaD08d4719f',
-            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-            collateralAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
+            oracle: '0x07A9c82f38aAD9855FaF76D398F9C64a7A12F0AE',
+            loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
+            collateralAsset: '0x0913da6da4b42f538b445599b46bb4622342cf52',
             loanAssetDecimals: 6,
             collateralAssetDecimals: 8,
         },
@@ -1176,6 +1176,13 @@ export const MrophoOracles = {
             loanAssetDecimals: 6,
             collateralAssetDecimals: 8,
         },
+        {
+            oracle: '0xaa9853c78B92606b21cE57Da7F04F301f031Aba4',
+            loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
+            collateralAsset: '0xe007ca01894c863d7898045ed5a3b4abf0b18f37',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
         {
             oracle: '0xcb2d3027Be1Fe4c88fc1840187efCF301Ff7176a',
             loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
@@ -1204,6 +1211,13 @@ export const MrophoOracles = {
             loanAssetDecimals: 6,
             collateralAssetDecimals: 18,
         },
+        {
+            oracle: '0x269013966Ef83A88B75f0573199CF1Cad8c30f82',
+            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+            collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 8,
+        },
         {
             oracle: '0x1c5f3862c913E015eD0a2A9d71E13BE74101F47d',
             loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1218,13 +1232,6 @@ export const MrophoOracles = {
             loanAssetDecimals: 6,
             collateralAssetDecimals: 18,
         },
-        {
-            oracle: '0x269013966Ef83A88B75f0573199CF1Cad8c30f82',
-            loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-            collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
-            loanAssetDecimals: 6,
-            collateralAssetDecimals: 8,
-        },
         {
             oracle: '0xe8F70671Bc494A96332c809d042bD9bF09452B57',
             loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',

package/dist/yields/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAgGA,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QACb,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SACzD,CAAA;KACF,CAAA;CACF;AAcD,eAAO,MAAM,kBAAkB,uCA0a9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAkGA,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QACb,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SACzD,CAAA;KACF,CAAA;CACF;AAcD,eAAO,MAAM,kBAAkB,uCA4b9B,CAAA"}

package/dist/yields/index.js

@@ -1,4 +1,5 @@
 import { apyToAprPercent, apyToApr } from '../utils/parsing';
+import { addressToAssetYearn } from './yieldTypes';
 const hyUSD = 'High Yield USD Base::HYUSD';
 const bsdETH = 'Based ETH::BSDETH';
 const wstHype = 'Staked HYPE Shares::WSTHYPE';
@@ -61,6 +62,7 @@ const FeedData = {
     ETHZERO: 'https://app.usual.money/api/rewards/rates/ETH0',
     JITOSOL: 'https://www.jito.network/api/getJitoPoolStats/',
     THBILL: 'https://thbill-api.theo.xyz/snapshots',
+    YEARN_KATANA: 'https://katana-apr-service.vercel.app/api/vaults',
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields',
@@ -175,6 +177,18 @@ export const fetchGeneralYields = async () => {
         const res = await fetch(FeedData.ETHX).then((r) => r.json());
         return apyToAprPercent(res.value);
     });
+    const yearnKatanaPromise = safeFetch('YEARN_KATANA', async () => {
+        const res = await fetch(FeedData.YEARN_KATANA).then((r) => r.json());
+        let map = {};
+        Object.entries(res).forEach(([addr, data]) => {
+            const key = addressToAssetYearn[addr.toLowerCase()];
+            if (key) {
+                const apr = ((data.apr.netAPR ?? 0) + (data.apr.extra.extrinsicYield ?? 0)) * 100;
+                map[key] = apr;
+            }
+        });
+        return map;
+    });
     const osEthPromise = safeFetch('OSETH', async () => {
         const res = await fetch(FeedData.OSETH, {
             method: 'POST',
@@ -223,7 +237,7 @@ export const fetchGeneralYields = async () => {
     const jitoSolPromise = safeFetch('JITOSOL', async () => {
         const res = await fetch(FeedData.JITOSOL, {
             method: 'GET',
-            headers: { Accept: 'application/json' },
+            headers: { Accept: 'application/json', 'User-Agent': '1delta/yields' },
         }).then((r) => r.json());
         const val = averageDataLastN(res?.getStakePoolStats?.apy, 7);
         return apyToApr(val) * 100;
@@ -362,7 +376,7 @@ export const fetchGeneralYields = async () => {
             },
         })));
     });
-    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData, osEthData, ethXData, pufEthData, angleData, susdsData, srUsdData, yusdData, rlpData, wstusrData, csusdlData, sdeusdData, rswethData, ynethxData, ethZeroData, usdZeroPlusData, jitoSolData, thBillData,] = await Promise.all([
+    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData, osEthData, ethXData, pufEthData, angleData, susdsData, srUsdData, yusdData, rlpData, wstusrData, csusdlData, sdeusdData, rswethData, ynethxData, ethZeroData, usdZeroPlusData, jitoSolData, thBillData, yearnKatanaData,] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -395,6 +409,7 @@ export const fetchGeneralYields = async () => {
         usdZeroPlusPromise,
         jitoSolPromise,
         thbillPromise,
+        yearnKatanaPromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -432,6 +447,7 @@ export const fetchGeneralYields = async () => {
             ...rtokensData,
             ...hypeData,
             ...angleData,
+            ...yearnKatanaData,
         },
         lenderRewards: {
             '167000': {

package/dist/yields/yieldTypes.d.ts

@@ -0,0 +1,76 @@
+export type YearnVault = {
+    address: string;
+    symbol: string;
+    name: string;
+    chainID: number;
+    token: {
+        address: string;
+        name: string;
+        symbol: string;
+        description: string;
+        decimals: number;
+    };
+    tvl: {
+        totalAssets: string;
+        tvl: number;
+        price: number;
+    };
+    apr: {
+        type: string;
+        netAPR: number | null;
+        fees: {
+            performance: number;
+            management: number;
+        };
+        points: {
+            weekAgo: number;
+            monthAgo: number;
+            inception: number;
+        };
+        pricePerShare: {
+            today: number;
+            weekAgo: number;
+            monthAgo: number;
+        };
+        extra: {
+            stakingRewardsAPR: number | null;
+            gammaRewardAPR: number | null;
+            katanaRewardsAPR: number | null;
+            katanaAppRewardsAPR: number | null;
+            FixedRateKatanaRewards: number | null;
+            katanaBonusAPY: number | null;
+            extrinsicYield: number | null;
+            katanaNativeYield: number | null;
+        };
+        forwardAPR: {
+            type: string;
+            netAPR: number | null;
+            composite: {
+                boost: number | null;
+                poolAPY: number | null;
+                boostedAPR: number | null;
+                baseAPR: number | null;
+                cvxAPR: number | null;
+                rewardsAPR: number | null;
+            };
+        };
+    };
+    strategies: {
+        address: string;
+        name: string;
+        status: string;
+        netAPR?: number;
+        details: {
+            totalDebt: string;
+            totalLoss: string;
+            totalGain: string;
+            performanceFee: number;
+            lastReport: number;
+            debtRatio?: number;
+        };
+    }[];
+};
+export declare const addressToAssetYearn: {
+    [a: string]: string;
+};
+//# sourceMappingURL=yieldTypes.d.ts.map

package/dist/yields/yieldTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yieldTypes.d.ts","sourceRoot":"","sources":["../../src/yields/yieldTypes.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAA;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,WAAW,EAAE,MAAM,CAAA;QACnB,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,GAAG,EAAE;QACH,WAAW,EAAE,MAAM,CAAA;QACnB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;QACrB,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM,CAAA;YACnB,UAAU,EAAE,MAAM,CAAA;SACnB,CAAA;QACD,MAAM,EAAE;YACN,OAAO,EAAE,MAAM,CAAA;YACf,QAAQ,EAAE,MAAM,CAAA;YAChB,SAAS,EAAE,MAAM,CAAA;SAClB,CAAA;QACD,aAAa,EAAE;YACb,KAAK,EAAE,MAAM,CAAA;YACb,OAAO,EAAE,MAAM,CAAA;YACf,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,KAAK,EAAE;YACL,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;YAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;YAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;YAC/B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;YAClC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAA;YACrC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;YAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;YAC7B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;SACjC,CAAA;QACD,UAAU,EAAE;YACV,IAAI,EAAE,MAAM,CAAA;YACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;YACrB,SAAS,EAAE;gBACT,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;gBACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;gBACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;gBACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;gBACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBACrB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;aAC1B,CAAA;SACF,CAAA;KACF,CAAA;IACD,UAAU,EAAE;QACV,OAAO,EAAE,MAAM,CAAA;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,OAAO,EAAE;YACP,SAAS,EAAE,MAAM,CAAA;YACjB,SAAS,EAAE,MAAM,CAAA;YACjB,SAAS,EAAE,MAAM,CAAA;YACjB,cAAc,EAAE,MAAM,CAAA;YACtB,UAAU,EAAE,MAAM,CAAA;YAClB,SAAS,CAAC,EAAE,MAAM,CAAA;SACnB,CAAA;KACF,EAAE,CAAA;CACJ,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAMtD,CAAA"}

package/dist/yields/yieldTypes.js

@@ -0,0 +1,7 @@
+export const addressToAssetYearn = {
+    '0xe007ca01894c863d7898045ed5a3b4abf0b18f37': 'vbETH yVault::yvvbETH',
+    '0x80c34bd3a3569e126e7055831036aa7b212cb159': 'vbUSDC yVault::yvvbUSDC',
+    '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b': 'vbUSDT yVault::yvvbUSDT',
+    '0xaa0362ecc584b985056e47812931270b99c91f9d': 'vbWBTC yVault::yvvbWBTC',
+    '0x93fec6639717b6215a48e5a72a162c50dcc40d68': 'vbAUSD yVault::yvvbAUSD',
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/lending/user-data/morpho/userCallParse.ts

@@ -83,9 +83,6 @@ export const getMorphoUserDataConverterWithlens = (
 
       // we loop over the return dat
       for (let i = 0; i < data.length; i++) {
-        let totalDebt24h = 0
-        let totalDeposits24h = 0
-
         // get balance data array for chunk
         const balanceDatas = decodePackedDataset(data[i])
 
@@ -107,9 +104,6 @@ export const getMorphoUserDataConverterWithlens = (
               pricesHist,
             )
 
-          totalDebt24h += addedDebt
-          totalDeposits24h += addedDeposits
-
           const payload = {
             chainId,
             account,
@@ -121,8 +115,8 @@ export const getMorphoUserDataConverterWithlens = (
           const userData = createBaseTypeUserState(
             payload,
             lenderData[markeId].data,
-            totalDeposits24h,
-            totalDebt24h,
+            addedDeposits,
+            addedDebt,
           )
 
           datas[market.lender] = {
@@ -174,7 +168,6 @@ function createMorphoEntryFromMarketWithLens(
   // prices
   const priceLoan = prices[loanKey] ?? 1
   const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan
-
   // balances
   const deposits = balanceInfo.supplyAssets
   const borrow = balanceInfo.borrowAssets
@@ -250,7 +243,8 @@ function createMorphoEntryFromMarketWithLens(
       [collateralAddress]: dataForCollateralAsset,
     },
     addedDeposits:
-      Number(loanDepositNumber) * priceHistLoan + Number(collateralDec) * priceHist,
+      Number(loanDepositNumber) * priceHistLoan +
+      Number(collateralDec) * priceHist,
     addedDebt: Number(borrowDec) * priceHistLoan,
   }
 }

package/src/prices/main-prices/addresses/morpho.ts

@@ -1038,6 +1038,13 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       loanAssetDecimals: 18,
       collateralAssetDecimals: 18,
     },
+    {
+      oracle: '0xC3dA445C9c4Cd78325C6DCDD314936C2Aa226372',
+      loanAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
+      collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
+      loanAssetDecimals: 8,
+      collateralAssetDecimals: 8,
+    },
     {
       oracle: '0xB60F728BdcE5e3921C0E42c1a6F07A1313D0040e',
       loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1052,13 +1059,6 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       loanAssetDecimals: 6,
       collateralAssetDecimals: 18,
     },
-    {
-      oracle: '0xC3dA445C9c4Cd78325C6DCDD314936C2Aa226372',
-      loanAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
-      collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
-      loanAssetDecimals: 8,
-      collateralAssetDecimals: 8,
-    },
     {
       oracle: '0xBa4c6d027b3c08Cb8c21840501Cd04ad6Bb37Cd0',
       loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1081,11 +1081,11 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       collateralAssetDecimals: 6,
     },
     {
-      oracle: '0x970b106C6C1df8276577dBdC8FdA010e418fC1EC',
-      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-      collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
+      oracle: '0xD978CE03d8BB0eb3f09cB2a469DbbC25DB42F3Ae',
+      loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
+      collateralAsset: '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b',
       loanAssetDecimals: 6,
-      collateralAssetDecimals: 18,
+      collateralAssetDecimals: 6,
     },
     {
       oracle: '0x3C40506CcD8f124f05a900446d38dDA4baAfd82d',
@@ -1095,25 +1095,25 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       collateralAssetDecimals: 8,
     },
     {
-      oracle: '0xD978CE03d8BB0eb3f09cB2a469DbbC25DB42F3Ae',
-      loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
-      collateralAsset: '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b',
+      oracle: '0x970b106C6C1df8276577dBdC8FdA010e418fC1EC',
+      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+      collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
       loanAssetDecimals: 6,
-      collateralAssetDecimals: 6,
+      collateralAssetDecimals: 18,
     },
     {
-      oracle: '0x2477367cFF71b31b4BE6963e5691859E8fcDF084',
-      loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
-      collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
+      oracle: '0x83F4197076614efe8e4c37BB9EFBfeaD08d4719f',
+      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+      collateralAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
       loanAssetDecimals: 6,
-      collateralAssetDecimals: 18,
+      collateralAssetDecimals: 8,
     },
     {
-      oracle: '0x07A9c82f38aAD9855FaF76D398F9C64a7A12F0AE',
+      oracle: '0x2477367cFF71b31b4BE6963e5691859E8fcDF084',
       loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
-      collateralAsset: '0x0913da6da4b42f538b445599b46bb4622342cf52',
+      collateralAsset: '0xee7d8bcfb72bc1880d0cf19822eb0a2e6577ab62',
       loanAssetDecimals: 6,
-      collateralAssetDecimals: 8,
+      collateralAssetDecimals: 18,
     },
     {
       oracle: '0xcC139318686969b9D30Dd62aA206725B269DA40d',
@@ -1123,9 +1123,9 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       collateralAssetDecimals: 8,
     },
     {
-      oracle: '0x83F4197076614efe8e4c37BB9EFBfeaD08d4719f',
-      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-      collateralAsset: '0xb0f70c0bd6fd87dbeb7c10dc692a2a6106817072',
+      oracle: '0x07A9c82f38aAD9855FaF76D398F9C64a7A12F0AE',
+      loanAsset: '0x2dca96907fde857dd3d816880a0df407eeb2d2f2',
+      collateralAsset: '0x0913da6da4b42f538b445599b46bb4622342cf52',
       loanAssetDecimals: 6,
       collateralAssetDecimals: 8,
     },
@@ -1185,6 +1185,13 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       loanAssetDecimals: 6,
       collateralAssetDecimals: 8,
     },
+    {
+      oracle: '0xaa9853c78B92606b21cE57Da7F04F301f031Aba4',
+      loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
+      collateralAsset: '0xe007ca01894c863d7898045ed5a3b4abf0b18f37',
+      loanAssetDecimals: 6,
+      collateralAssetDecimals: 18,
+    },
     {
       oracle: '0xcb2d3027Be1Fe4c88fc1840187efCF301Ff7176a',
       loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
@@ -1213,6 +1220,13 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       loanAssetDecimals: 6,
       collateralAssetDecimals: 18,
     },
+    {
+      oracle: '0x269013966Ef83A88B75f0573199CF1Cad8c30f82',
+      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
+      collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
+      loanAssetDecimals: 6,
+      collateralAssetDecimals: 8,
+    },
     {
       oracle: '0x1c5f3862c913E015eD0a2A9d71E13BE74101F47d',
       loanAsset: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
@@ -1227,13 +1241,6 @@ export const MrophoOracles: { [c: string]: MrophoOracleInfo[] } = {
       loanAssetDecimals: 6,
       collateralAssetDecimals: 18,
     },
-    {
-      oracle: '0x269013966Ef83A88B75f0573199CF1Cad8c30f82',
-      loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',
-      collateralAsset: '0xecac9c5f704e954931349da37f60e39f515c11c1',
-      loanAssetDecimals: 6,
-      collateralAssetDecimals: 8,
-    },
     {
       oracle: '0xe8F70671Bc494A96332c809d042bD9bF09452B57',
       loanAsset: '0x00000000efe302beaa2b3e6e1b18d08d69a9012a',

package/src/yields/index.ts

@@ -1,4 +1,5 @@
 import { apyToAprPercent, apyToApr } from '../utils/parsing'
+import { addressToAssetYearn, YearnVault } from './yieldTypes'
 
 const hyUSD = 'High Yield USD Base::HYUSD'
 const bsdETH = 'Based ETH::BSDETH'
@@ -65,6 +66,7 @@ const FeedData = {
   ETHZERO: 'https://app.usual.money/api/rewards/rates/ETH0',
   JITOSOL: 'https://www.jito.network/api/getJitoPoolStats/',
   THBILL: 'https://thbill-api.theo.xyz/snapshots',
+  YEARN_KATANA: 'https://katana-apr-service.vercel.app/api/vaults',
 }
 
 const LenderAPIs = {
@@ -219,6 +221,22 @@ export const fetchGeneralYields = async () => {
     return apyToAprPercent(res.value)
   })
 
+  const yearnKatanaPromise = safeFetch('YEARN_KATANA', async () => {
+    const res: { [address: string]: YearnVault } = await fetch(
+      FeedData.YEARN_KATANA,
+    ).then((r) => r.json())
+    let map: any = {}
+    Object.entries(res).forEach(([addr, data]) => {
+      const key = addressToAssetYearn[addr.toLowerCase()]
+      if (key) {
+        const apr =
+          ((data.apr.netAPR ?? 0) + (data.apr.extra.extrinsicYield ?? 0)) * 100
+        map[key] = apr
+      }
+    })
+    return map
+  })
+
   const osEthPromise = safeFetch('OSETH', async () => {
     const res = await fetch(FeedData.OSETH, {
       method: 'POST',
@@ -274,7 +292,7 @@ export const fetchGeneralYields = async () => {
   const jitoSolPromise = safeFetch('JITOSOL', async () => {
     const res = await fetch(FeedData.JITOSOL, {
       method: 'GET',
-      headers: { Accept: 'application/json' },
+      headers: { Accept: 'application/json', 'User-Agent': '1delta/yields' },
     }).then((r) => r.json())
     const val = averageDataLastN(res?.getStakePoolStats?.apy, 7)
     return apyToApr(val) * 100
@@ -317,7 +335,6 @@ export const fetchGeneralYields = async () => {
       method: 'GET',
       headers: {
         Accept: 'application/json',
-
         'User-Agent': '1delta/yields',
       },
     }).then((r) => r.json())
@@ -469,6 +486,7 @@ export const fetchGeneralYields = async () => {
     usdZeroPlusData,
     jitoSolData,
     thBillData,
+    yearnKatanaData,
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -502,6 +520,7 @@ export const fetchGeneralYields = async () => {
     usdZeroPlusPromise,
     jitoSolPromise,
     thbillPromise,
+    yearnKatanaPromise,
   ])
 
   const data: YieldDataWithTimestamp = {
@@ -540,6 +559,7 @@ export const fetchGeneralYields = async () => {
       ...rtokensData,
       ...hypeData,
       ...angleData,
+      ...yearnKatanaData,
     },
     lenderRewards: {
       '167000': {

package/src/yields/yieldTypes.ts

@@ -0,0 +1,80 @@
+export type YearnVault = {
+  address: string
+  symbol: string
+  name: string
+  chainID: number
+  token: {
+    address: string
+    name: string
+    symbol: string
+    description: string
+    decimals: number
+  }
+  tvl: {
+    totalAssets: string
+    tvl: number
+    price: number
+  }
+  apr: {
+    type: string
+    netAPR: number | null
+    fees: {
+      performance: number
+      management: number
+    }
+    points: {
+      weekAgo: number
+      monthAgo: number
+      inception: number
+    }
+    pricePerShare: {
+      today: number
+      weekAgo: number
+      monthAgo: number
+    }
+    extra: {
+      stakingRewardsAPR: number | null
+      gammaRewardAPR: number | null
+      katanaRewardsAPR: number | null
+      katanaAppRewardsAPR: number | null
+      FixedRateKatanaRewards: number | null
+      katanaBonusAPY: number | null
+      extrinsicYield: number | null
+      katanaNativeYield: number | null
+    }
+    forwardAPR: {
+      type: string
+      netAPR: number | null
+      composite: {
+        boost: number | null
+        poolAPY: number | null
+        boostedAPR: number | null
+        baseAPR: number | null
+        cvxAPR: number | null
+        rewardsAPR: number | null
+      }
+    }
+  }
+  strategies: {
+    address: string
+    name: string
+    status: string
+    netAPR?: number
+    details: {
+      totalDebt: string
+      totalLoss: string
+      totalGain: string
+      performanceFee: number
+      lastReport: number
+      debtRatio?: number
+    }
+  }[]
+}
+
+export const addressToAssetYearn: { [a: string]: string } = {
+  '0xe007ca01894c863d7898045ed5a3b4abf0b18f37': 'vbETH yVault::yvvbETH',
+  '0x80c34bd3a3569e126e7055831036aa7b212cb159': 'vbUSDC yVault::yvvbUSDC',
+  '0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b': 'vbUSDT yVault::yvvbUSDT',
+  '0xaa0362ecc584b985056e47812931270b99c91f9d': 'vbWBTC yVault::yvvbWBTC',
+  '0x93fec6639717b6215a48e5a72a162c50dcc40d68': 'vbAUSD yVault::yvvbAUSD',
+}

package/test/lenderData.test.ts

@@ -6,7 +6,6 @@ import {
   generateLendingPairs,
   getLenderPublicData,
   getLenderPublicDataAll,
-  getTopPairs,
 } from '../src'
 import { getEvmClient, multicallRetry } from '@1delta/providers'
 import { Chain, Lender } from '@1delta/asset-registry'
@@ -20,7 +19,7 @@ describe(
       const chainId = Chain.ARBITRUM_ONE
 
       const ps = [
-        fetchMainPrices([chainId], getEvmClient),
+        fetchMainPrices([chainId]),
         fetchGeneralYields(),
       ]
 
@@ -46,7 +45,7 @@ describe(
       const chainId = Chain.POLYGON_MAINNET
 
       const ps = [
-        fetchMainPrices([chainId], getEvmClient),
+        fetchMainPrices([chainId]),
         fetchGeneralYields(),
       ]
 

package/test/morphoPrice.test.ts

@@ -2,7 +2,7 @@ import { describe, it } from 'vitest'
 import { fetchMorphoPriceMeta } from './morpho'
 import { Chain } from '@1delta/asset-registry'
 
-const chainId = Chain.BASE
+const chainId = Chain.KATANA
 describe(
   'find prices',
   () => {

package/test/userDataMorphoKatana.test.ts

@@ -9,8 +9,8 @@ import { LenderUserQuery } from '../src/lending/user-data/types'
 import { prettyPrint } from './utils'
 
 // random user with ETH
-const TEST_ADDRESS = '0xaffe73AA5EBd0CD95D89ab9fa2512Fc9e2d3289b'
-let prices, yields
+const TEST_ADDRESS = '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5'
+let prices, yields, pricesHist
 
 async function getUserData(chainId: Chain, publicData: any) {
   // Define user queries
@@ -51,14 +51,13 @@ describe(
             `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
           ).then((a) => a.json())
           prices = all.prices
+          pricesHist = all.priceHist
           yields = all.yields
           const publicData = all.data[chainId]
           const { userData } = await getUserData(chainId, publicData)
 
           prettyPrint(
-            userData[
-              'MORPHO_BLUE_16DED80178992B02F7C467C373CFC9F4EEE7F0356DF672F6A768EC92B2FFDEFF'
-            ],
+            userData ['MORPHO_BLUE_6691CDCADD5D23AC68D2C1CF54DC97AB8242D2A888230DE411094480252C2ED3'],
           )
 
           // Basic validation