@1delta/margin-fetcher 0.0.10 → 0.0.13

package/dist/lending/user-data/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}

package/dist/lending/user-data/types.js

@@ -1,3 +1,15 @@
+import { Lender } from '@1delta/asset-registry';
+/** Filter all morphos into one for querying */
+export function organizeUserQueries(queries) {
+    const morphos = queries.filter((q) => q.lender.startsWith('MORPHO_BLUE'));
+    const nonMorphos = queries.filter((q) => !q.lender.startsWith('MORPHO_BLUE'));
+    const morphosCollapsed = {
+        lender: Lender.MORPHO_BLUE,
+        account: queries[0].account,
+        params: morphos.map((p) => p.lender),
+    };
+    return [...nonMorphos, morphosCollapsed];
+}
 // Aave V2 specific enums
 export var AaveV2TypeGetUserReserveData;
 (function (AaveV2TypeGetUserReserveData) {

package/dist/lending/user-data/utils/createGeneralUserState.d.ts

@@ -1,4 +1,4 @@
-import { AaveV2Public, AaveV2UserReserveResponse, AaveV3Public, AaveV3UserReserveResponse, CompoundV3Public, CompoundV3UserReserveResponse } from "../types";
+import { AaveV2Public, AaveV2UserReserveResponse, AaveV3Public, AaveV3UserReserveResponse, CompoundV3Public, CompoundV3UserReserveResponse } from '../types';
 type LenderUserData = AaveV3UserReserveResponse | AaveV2UserReserveResponse | CompoundV3UserReserveResponse;
 type LenderState = AaveV3Public | AaveV2Public | CompoundV3Public;
 export declare function createBaseTypeUserState(payload: LenderUserData, lenderData: {
@@ -7,7 +7,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
     account: string;
     chainId: string;
     balanceData: {
-        "0": {
+        '0': {
             rewards?: any;
             borrowDiscountedCollateral: number;
             collateral: number;
@@ -21,7 +21,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
         };
     };
     aprData: {
-        "0": {
+        '0': {
             apr: number;
             borrowApr: number;
             depositApr: number;
@@ -35,7 +35,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
         };
     };
     userConfigs: {
-        "0": {
+        '0': {
             selectedMode: number;
             id: string;
         };

package/dist/lending/user-data/utils/createGeneralUserState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGeneralUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createGeneralUserState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAG5J,KAAK,cAAc,GAAG,yBAAyB,GAAG,yBAAyB,GAAG,6BAA6B,CAAA;AAC3G,KAAK,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,CAAA;AAEjE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,EACxC,gBAAgB,GAAE,MAAU,EAC5B,YAAY,GAAE,MAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0GzB"}
+{"version":3,"file":"createGeneralUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createGeneralUserState.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,yBAAyB,EACzB,YAAY,EACZ,yBAAyB,EACzB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,UAAU,CAAA;AAGjB,KAAK,cAAc,GACf,yBAAyB,GACzB,yBAAyB,GACzB,6BAA6B,CAAA;AACjC,KAAK,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,CAAA;AAEjE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,EACxC,gBAAgB,GAAE,MAAU,EAC5B,YAAY,GAAE,MAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwHzB"}

package/dist/lending/user-data/utils/createGeneralUserState.js

@@ -1,7 +1,7 @@
-import { divideAccrualsToAprs } from ".";
-import { safeDivide } from "./formatting";
+import { divideAccrualsToAprs } from '.';
+import { safeDivide } from './formatting';
 export function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
-    let assetKeys = Object.keys(payload.lendingPositions["0"] ?? {});
+    let assetKeys = Object.keys(payload.lendingPositions['0'] ?? {});
     const { chainId, account } = payload;
     const mode = Number(payload.userEMode ?? 0);
     // organic yields
@@ -24,19 +24,22 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
         const asset = assetKeys[i];
         if (!lenderData?.[asset])
             continue;
-        const { depositsUSD, debtStableUSD, debtUSD, collateralActive } = payload.lendingPositions["0"][asset];
-        const { depositRate, stakingYield, variableBorrowRate, stableBorrowRate, rewards } = lenderData[asset];
+        const { depositsUSD, debtStableUSD, debtUSD, collateralActive } = payload.lendingPositions['0'][asset];
+        const { depositRate, stakingYield, variableBorrowRate, stableBorrowRate, rewards, } = lenderData[asset];
         // amounts
         deposits += depositsUSD;
         debt += debtStableUSD;
         debt += debtUSD;
-        // rewards 
+        // rewards
         Object.entries(rewards ?? {}).forEach(([key, rewardData]) => {
             rewardDepositAccrual += rewardData.depositRate * depositsUSD;
-            rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD + (rewardData.stableBorrowRate ?? 0) * debtStableUSD;
+            rewardBorrowAccrual +=
+                rewardData.variableBorrowRate * debtUSD +
+                    (rewardData.stableBorrowRate ?? 0) * debtStableUSD;
             // totals
             const rewDepo = rewardData.depositRate * depositsUSD;
-            const rewDebt = rewardData.variableBorrowRate * debtUSD + (rewardData.stableBorrowRate ?? 0) * (debtStableUSD ?? 0);
+            const rewDebt = rewardData.variableBorrowRate * debtUSD +
+                (rewardData.stableBorrowRate ?? 0) * (debtStableUSD ?? 0);
             if (!rewardsPerAsset[key])
                 rewardsPerAsset[key] = { depositApr: 0, borrowApr: 0 };
             if (rewDepo > 0)
@@ -49,17 +52,21 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
         stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
         if (collateralActive) {
             // risk adjusted
-            collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
-            borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+            collateral +=
+                (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
+            borrowDiscountedCollateral +=
+                (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) *
+                    depositsUSD;
         }
         // IRs
         depositInterest += depositRate * depositsUSD;
-        borrowInterest += debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
+        borrowInterest +=
+            debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
     }
     const nav = deposits - debt;
     // aggregated balance data
     const balanceData = {
-        "0": {
+        '0': {
             borrowDiscountedCollateral,
             collateral,
             deposits,
@@ -69,12 +76,12 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
             deposits24h: totalDeposits24h,
             debt24h: totalDebt24h,
             nav24h: totalDeposits24h - totalDebt24h,
-            ...(payload.rewards ? { rewards: payload.rewards } : {})
-        }
+            ...(payload.rewards ? { rewards: payload.rewards } : {}),
+        },
     };
     // aggregated apr data
     const aprData = {
-        "0": {
+        '0': {
             apr: safeDivide(depositInterest - borrowInterest, nav),
             borrowApr: safeDivide(borrowInterest, debt),
             depositApr: safeDivide(depositInterest, deposits),
@@ -85,9 +92,9 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
             stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
             stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
             stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
-        }
+        },
     };
-    const userConfigs = { "0": { selectedMode: mode, id: account } };
+    const userConfigs = { '0': { selectedMode: mode, id: account } };
     return {
         account,
         chainId,

package/dist/utils/index.d.ts

@@ -1,4 +1,8 @@
 import { Lender } from "@1delta/asset-registry";
+export declare function isCompoundV3(lender: string): boolean;
+export declare function isCompoundV3Type(lender: string): boolean;
+export declare function isInit(lender: string): lender is Lender.INIT;
+export declare function isMorphoType(lender: string): boolean;
 export declare const AAVE_V3_2_PROTOCOLS: Lender[];
 export declare function isAaveV3Type(lender: string): boolean;
 export declare function isAaveV3Original(lender: string): boolean;
@@ -6,9 +10,6 @@ export declare function isAaveV2Type(lender: string): boolean;
 export declare function isYLDR(lender: string): lender is Lender.YLDR;
 export declare function isAaveV32Type(lender: Lender): boolean;
 export declare function isAaveType(lender: string): boolean;
-export declare function isCompoundV3(lender: string): boolean;
-export declare function isCompoundV3Type(lender: string): boolean;
-export declare function isInit(lender: string): lender is Lender.INIT;
 export declare function isSwaylend(lender: string): boolean;
 export declare const getLendersForChain: (c: string) => string[];
 /** Filter lenders by protocol list */
@@ -19,4 +20,5 @@ export declare const AAVES_PER_CHAIN: {
 };
 export declare const getComposerAddress: (chainId: string) => string;
 export declare const getLenderAssets: (chainId: string | number | undefined, lendingProtocol?: Lender) => string[];
+export declare function isMultiMarket(lender: string): boolean;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAQ/B,eAAO,MAAM,mBAAmB,UAAkE,CAAA;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aAqB3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAQ7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,wBAAgC,KAAG,MAAM,EAO9G,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAIP,MAAM,wBAAwB,CAAA;AAO/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE1F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE9F,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAAmC;AAExE,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAI1C;AAID,eAAO,MAAM,mBAAmB,UAAkE,CAAA;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA4B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAS7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}

package/dist/utils/index.js

@@ -1,8 +1,16 @@
-import { AAVE_FORK_POOL_DATA, AAVE_STYLE_RESERVE_ASSETS, AAVE_V2_LENDERS, AAVE_V3_LENDERS, COMPOUND_BASE_TOKENS, COMPOUND_STYLE_RESERVE_ASSETS, INIT_STYLE_RESERVE_ASSETS, Lender, SWAYLEND_RESERVE_ASSETS, INIT_CONFIG_DATA, } from "@1delta/asset-registry";
+import { AAVE_FORK_POOL_DATA, AAVE_STYLE_RESERVE_ASSETS, AAVE_V2_LENDERS, AAVE_V3_LENDERS, COMPOUND_BASE_TOKENS, COMPOUND_STYLE_RESERVE_ASSETS, INIT_STYLE_RESERVE_ASSETS, Lender, SWAYLEND_RESERVE_ASSETS, INIT_CONFIG_DATA, MORPHO_BLUE_POOL_DATA, } from "@1delta/asset-registry";
 import { uniq } from "lodash";
 import { COMPOSERS } from "./constants";
 const AAVE_V3_KEY = "AAVE_V3";
 const COMPOUND_V3_KEY = "COMPOUND_V3";
+export function isCompoundV3(lender) { return lender.startsWith(COMPOUND_V3_KEY); }
+export function isCompoundV3Type(lender) { return lender.startsWith(COMPOUND_V3_KEY); }
+export function isInit(lender) { return lender === Lender.INIT; }
+export function isMorphoType(lender) {
+    return [
+        Lender.MORPHO_BLUE
+    ].includes(lender);
+}
 const SWAYLEND_KEY = "SWAYLEND";
 export const AAVE_V3_2_PROTOCOLS = [Lender.AAVE_V3, Lender.AAVE_V3_ETHER_FI, Lender.AAVE_V3_PRIME];
 export function isAaveV3Type(lender) {
@@ -23,15 +31,6 @@ export function isAaveV32Type(lender) {
 export function isAaveType(lender) {
     return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender);
 }
-export function isCompoundV3(lender) {
-    return lender.startsWith(COMPOUND_V3_KEY);
-}
-export function isCompoundV3Type(lender) {
-    return lender.startsWith(COMPOUND_V3_KEY);
-}
-export function isInit(lender) {
-    return lender === Lender.INIT;
-}
 export function isSwaylend(lender) {
     return lender.startsWith(SWAYLEND_KEY);
 }
@@ -55,6 +54,12 @@ export const getLendersForChain = (c) => {
         if (chains.includes(c))
             lenders.push(l);
     });
+    // morpho
+    Object.entries(MORPHO_BLUE_POOL_DATA).forEach(([l, data]) => {
+        const chains = Object.keys(data);
+        if (chains.includes(c))
+            lenders.push(l);
+    });
     return lenders;
 };
 /** Filter lenders by protocol list */
@@ -63,8 +68,9 @@ export const filterLendersByProtocol = (allLenders, protocolList) => {
     if (!protocolList || protocolList.length === 0) {
         return allLenders;
     }
+    const hasMorpho = protocolList.includes(Lender.MORPHO_BLUE);
     // Filter lenders based on protocol list
-    return allLenders.filter((lender) => protocolList.includes(lender));
+    return allLenders.filter((lender) => protocolList.includes(lender) || (hasMorpho && lender.startsWith("MORPHO_BLUE")));
 };
 const getAavesForChain = () => {
     let lenders = {};
@@ -95,3 +101,6 @@ export const getLenderAssets = (chainId, lendingProtocol = Lender.AAVE_V3) => {
         return SWAYLEND_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? 0] ?? [];
     return [];
 };
+export function isMultiMarket(lender) {
+    return lender.startsWith("MORPHO_BLUE");
+}

package/dist/utils/parsing.d.ts

@@ -7,6 +7,7 @@ export declare enum TimeScale {
 }
 export declare const aprToApy: (apr: number) => number;
 export declare const apyToApr: (apy: number) => number;
+export declare const apyToAprPercent: (apy: number) => number;
 export declare const formatAaveYieldToNumber: (n?: string | bigint) => number;
 export declare const calculateRateForCompound: (n: string, chainId: string, lender?: Lender) => number;
 export declare const formatAaveRawApyToApr: (raw: bigint | string | undefined) => number;

package/dist/utils/parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIvD,eAAO,MAAM,GAAG,QAAQ,CAAC;AAEzB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAC;AAEF,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAC"}
+{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIvD,eAAO,MAAM,GAAG,QAAQ,CAAC;AAEzB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAC;AAEF,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAE1C,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAC"}

package/dist/utils/parsing.js

@@ -30,6 +30,9 @@ export const aprToApy = (apr) => {
 export const apyToApr = (apy) => {
     return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
 };
+export const apyToAprPercent = (apy) => {
+    return 100 * ((apy / 100 + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
+};
 export const formatAaveYieldToNumber = (n) => {
     if (!n)
         return 0;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAiCA,UAAU,iBAAiB;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAA;CACrG;AAYD,eAAO,MAAM,kBAAkB,uCA6I9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAkCA,UAAU,iBAAiB;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAA;CACrG;AAYD,eAAO,MAAM,kBAAkB,uCAqJ9B,CAAA"}

package/dist/yields/index.js

@@ -1,4 +1,4 @@
-import { apyToApr } from "../utils/parsing";
+import { apyToAprPercent, apyToApr } from "../utils/parsing";
 const FeedData = {
     WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
     STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -11,6 +11,7 @@ const FeedData = {
     WEETH: 'https://www.ether.fi/api/apr',
     SAVAX: "https://api.benqi.fi/liquidstaking/apr",
     RSETH: "https://universe.kelpdao.xyz/rseth/totalApy",
+    TRUMATIC: "https://api.trufin.io/staker/apy?staker=MATIC"
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields'
@@ -81,7 +82,7 @@ export const fetchGeneralYields = async () => {
     const susdePromise = safeFetch('SUSDE', async () => {
         try {
             const res = await fetch(FeedData.SUSDE).then(r => r.json());
-            return Number(res?.data[0]?.apy ?? 0);
+            return apyToAprPercent(res?.data[0]?.apy ?? 0);
         }
         catch (e) {
             return 0;
@@ -89,7 +90,11 @@ export const fetchGeneralYields = async () => {
     });
     const rsethPromise = safeFetch('RSETH', async () => {
         const res = await fetch(FeedData.RSETH).then(r => r.json());
-        return Number(res.totalAPY);
+        return apyToAprPercent(res.totalAPY);
+    });
+    const trumaticPromise = safeFetch('TRUMATIC', async () => {
+        const res = await fetch(FeedData.TRUMATIC).then(r => r.json());
+        return apyToAprPercent(res.apy);
     });
     const cbethPromise = safeFetch('CBETH', async () => {
         try {
@@ -99,7 +104,7 @@ export const fetchGeneralYields = async () => {
                     "Content-Type": "application/json"
                 }
             }).then(r => r.json());
-            return Number(res.apy) * 100;
+            return apyToAprPercent(res.apy) * 100;
         }
         catch (e) {
             console.log("CBETH failed", e);
@@ -116,7 +121,7 @@ export const fetchGeneralYields = async () => {
             }
         })));
     });
-    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData,] = await Promise.all([
+    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -129,6 +134,7 @@ export const fetchGeneralYields = async () => {
         savaxPromise,
         cbethPromise,
         rsethPromise,
+        trumaticPromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -146,6 +152,7 @@ export const fetchGeneralYields = async () => {
             SAVAX: savaxData,
             CBETH: cbethData,
             RSETH: rsethData,
+            TRUMATIC: trumaticData,
         },
         lenderRewards: {
             "167000": {

package/package.json

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

package/src/abis/morpho/blue.ts

@@ -0,0 +1,99 @@
+export const MorphoBlueAbi = [
+    {
+        "inputs": [
+            {
+                "internalType": "Id",
+                "name": "",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "position",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "supplyShares",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint128",
+                "name": "borrowShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "collateral",
+                "type": "uint128"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "slots",
+                "type": "bytes32[]"
+            }
+        ],
+        "name": "extSloads",
+        "outputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "res",
+                "type": "bytes32[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "Id",
+                "name": "",
+                "type": "bytes32"
+            }
+        ],
+        "name": "market",
+        "outputs": [
+            {
+                "internalType": "uint128",
+                "name": "totalSupplyAssets",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalSupplyShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalBorrowAssets",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalBorrowShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "lastUpdate",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "fee",
+                "type": "uint128"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+] as const

package/src/abis/morpho/lens.ts

@@ -0,0 +1,31 @@
+export const MorphoLensAbi = [
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "marketsIds",
+                "type": "bytes32[]"
+            },
+            {
+                "internalType": "address",
+                "name": "user",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "morpho",
+                "type": "address"
+            }
+        ],
+        "name": "getUserDataCompact",
+        "outputs": [
+            {
+                "internalType": "bytes",
+                "name": "data",
+                "type": "bytes"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/src/lending/aave-v2-type/types.ts

@@ -1,4 +1,5 @@
 import { RewardsMap } from "../aave-v3-type/types";
+import { GenericCurrency } from "../types";
 
 
 export enum AaveV2TypeGetReserveDataIndexes {
@@ -53,6 +54,7 @@ export enum AaveV2TypeIncentivesControllerPoolInfoIndexes {
 export interface AaveV2GeneralPublicResponse {
   data: {
     [tokenSymbol: string]: {
+      asset: GenericCurrency
       // token amounts
       totalDeposits: number;
       totalDebtStable: number;