@defisaver/positions-sdk 0.0.6 → 0.0.8

package/cjs/aaveV3/index.js

@@ -163,14 +163,12 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationThreshold).div(10000).toString(),
                     collateralFactor: new decimal_js_1.default(tokenMarket.ltv).div(10000).toString(),
                     priceSource: tokenMarket.priceSource,
-                } }));
+                }, aTokenAddress: tokenMarket.aTokenAddress }));
         })));
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
-                if (!(0, utils_1.isLayer2Network)(network) && _market.symbol === 'cbETH')
-                    return;
                 _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/cjs/chickenBonds/index.js

@@ -90,7 +90,7 @@ const fetchCBondsForUser = (web3, network, address) => __awaiter(void 0, void 0,
     return bonds.map(({ bondID, accruedBLUSD, claimedBLUSD, endTime, lusdAmount, maxAmountBLUSD, startTime, status, tokenURI, }) => ({
         bondId: bondID,
         status,
-        // tokenURI: decodeTokenURIToSvg(tokenURI),
+        tokenURI: (0, chickenBondsHelpers_1.decodeTokenURIToSvg)(tokenURI),
         startTime: new Date(+startTime * 1000),
         endTime: new Date(+endTime * 1000),
         accruedBLUSD: (0, tokens_1.assetAmountInEth)(accruedBLUSD, 'bLUSD'),
@@ -112,6 +112,7 @@ const fetchCBondForId = (web3, network, bondId) => __awaiter(void 0, void 0, voi
         claimedBLUSD: (0, tokens_1.assetAmountInEth)(bond.claimedBLUSD, 'bLUSD'),
         lusdAmount: (0, tokens_1.assetAmountInEth)(bond.lusdAmount, 'LUSD'),
         maxAmountBLUSD: (0, tokens_1.assetAmountInEth)(bond.maxAmountBLUSD, 'bLUSD'),
+        tokenURI: (0, chickenBondsHelpers_1.decodeTokenURIToSvg)(bond.tokenURI),
     };
 });
 exports.fetchCBondForId = fetchCBondForId;

package/cjs/helpers/aaveHelpers/index.js

@@ -77,8 +77,20 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
-    payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new decimal_js_1.default(suppliedUsd).mul((0, exports.aaveAnyGetEmodeMutableProps)(data, symbol).collateralFactor));
-    payload.liquidationLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new decimal_js_1.default(suppliedUsd).mul((0, exports.aaveAnyGetEmodeMutableProps)(data, symbol).liquidationRatio));
+    payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const suppliedUsdAmount = (0, exports.isMorphoAaveV3)(data)
+            // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+            ? new decimal_js_1.default(suppliedUsd).minus(new decimal_js_1.default(suppliedUsd).div(100).times(0.1)).toString()
+            : suppliedUsd;
+        return new decimal_js_1.default(suppliedUsdAmount).mul((0, exports.aaveAnyGetEmodeMutableProps)(data, symbol).collateralFactor);
+    });
+    payload.liquidationLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const suppliedUsdAmount = (0, exports.isMorphoAaveV3)(data)
+            // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+            ? new decimal_js_1.default(suppliedUsd).minus(new decimal_js_1.default(suppliedUsd).div(100).times(0.1)).toString()
+            : suppliedUsd;
+        return new decimal_js_1.default(suppliedUsdAmount).mul((0, exports.aaveAnyGetEmodeMutableProps)(data, symbol).liquidationRatio);
+    });
     payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();

package/cjs/helpers/chickenBondsHelpers/index.d.ts

@@ -1,2 +1,3 @@
 export declare const calcCBondsBLUSDFloorPrice: (bLUSDSupply: string, totalReserveLUSD: string) => string;
 export declare const calcAverageBondAgeMs: (totalWeightedStartTimes: string, totalPendingLusd: string) => number;
+export declare const decodeTokenURIToSvg: (tokenURI: string) => string;

package/cjs/helpers/chickenBondsHelpers/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcAverageBondAgeMs = exports.calcCBondsBLUSDFloorPrice = void 0;
+exports.decodeTokenURIToSvg = exports.calcAverageBondAgeMs = exports.calcCBondsBLUSDFloorPrice = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const calcCBondsBLUSDFloorPrice = (bLUSDSupply, totalReserveLUSD) => {
     if (new decimal_js_1.default(bLUSDSupply).eq(0))
@@ -17,3 +17,16 @@ const calcAverageBondAgeMs = (totalWeightedStartTimes, totalPendingLusd) => {
     return Date.now() - averageStartTimeMs;
 };
 exports.calcAverageBondAgeMs = calcAverageBondAgeMs;
+const decodeTokenURIToSvg = (tokenURI) => {
+    var _a;
+    try {
+        const dataStartIndex = tokenURI.indexOf('base64,') + 'base64,'.length;
+        const json = atob(tokenURI.slice(dataStartIndex));
+        return (_a = JSON.parse(json)) === null || _a === void 0 ? void 0 : _a.image;
+    }
+    catch (e) {
+        console.error(e);
+        return 'Error parsing NFT image';
+    }
+};
+exports.decodeTokenURIToSvg = decodeTokenURIToSvg;

package/cjs/helpers/compoundHelpers/index.js

@@ -26,7 +26,7 @@ const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
     const price = (0, utils_1.getEthAmountForDecimals)(data.price, 8);
-    return (Object.assign(Object.assign({}, data), { price: (0, utils_1.getEthAmountForDecimals)(data.price, 8), priceUSD: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
+    return (Object.assign(Object.assign({}, data), { priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
 };
 exports.formatMarketData = formatMarketData;
 // TODO: maybe not hardcode decimals
@@ -38,7 +38,7 @@ const formatBaseData = (data, network, baseAssetPrice) => {
             .toString()), borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(data.borrowRate).div(1e18).mul(constants_1.SECONDS_PER_YEAR).mul(100)
             .toString()), utilization: (0, utils_1.getEthAmountForDecimals)(data.utilization, 16), // utilization is totalSupply/totalBorrow in 1e18, but we need % so when we mul with 100 it's 16 decimals
         totalSupply,
-        totalBorrow, marketLiquidity: new decimal_js_1.default(totalSupply).minus(totalBorrow).toString(), symbol: (0, utils_1.wethToEth)(assetInfo.symbol), price: (0, utils_1.getEthAmountForDecimals)(data.price, 8), priceUSD: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
+        totalBorrow, marketLiquidity: new decimal_js_1.default(totalSupply).minus(totalBorrow).toString(), symbol: (0, utils_1.wethToEth)(assetInfo.symbol), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 exports.formatBaseData = formatBaseData;
 const getIncentiveApys = (baseData, compPrice) => {

package/cjs/types/chickenBonds.d.ts

@@ -30,6 +30,7 @@ export interface BondInfoBasic {
     claimedBLUSD: string;
     lusdAmount: string;
     maxAmountBLUSD: string;
+    tokenURI: string;
 }
 export declare enum BondStatus {
     Nonexistent = "0",

package/esm/aaveV3/index.js

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, GhoTokenContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
+import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
 import { calculateNetApy, getStakingApy } from '../staking';
 import { multicall } from '../multicall';
 import { getAssetsBalances } from '../assets';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
-import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
+import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode, } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 export const test = (web3, network) => {
     const contract = AaveV3ViewContract(web3, 1);
@@ -154,14 +154,12 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     liquidationRatio: new Dec(tokenMarket.liquidationThreshold).div(10000).toString(),
                     collateralFactor: new Dec(tokenMarket.ltv).div(10000).toString(),
                     priceSource: tokenMarket.priceSource,
-                } }));
+                }, aTokenAddress: tokenMarket.aTokenAddress }));
         })));
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
-                if (!isLayer2Network(network) && _market.symbol === 'cbETH')
-                    return;
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
             }

package/esm/chickenBonds/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { ChickenBondsManagerContract, ChickenBondsViewContract } from '../contracts';
 import { multicall } from '../multicall';
-import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice } from '../helpers/chickenBondsHelpers';
+import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice, decodeTokenURIToSvg } from '../helpers/chickenBondsHelpers';
 export const getChickenBondsAccountBalances = (web3, network, block, addressMapping, bondId) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = ChickenBondsViewContract(web3, network, block);
     const fullBondInfo = yield viewContract.methods.getBondFullInfo(bondId).call({}, block);
@@ -82,7 +82,7 @@ export const fetchCBondsForUser = (web3, network, address) => __awaiter(void 0,
     return bonds.map(({ bondID, accruedBLUSD, claimedBLUSD, endTime, lusdAmount, maxAmountBLUSD, startTime, status, tokenURI, }) => ({
         bondId: bondID,
         status,
-        // tokenURI: decodeTokenURIToSvg(tokenURI),
+        tokenURI: decodeTokenURIToSvg(tokenURI),
         startTime: new Date(+startTime * 1000),
         endTime: new Date(+endTime * 1000),
         accruedBLUSD: assetAmountInEth(accruedBLUSD, 'bLUSD'),
@@ -103,5 +103,6 @@ export const fetchCBondForId = (web3, network, bondId) => __awaiter(void 0, void
         claimedBLUSD: assetAmountInEth(bond.claimedBLUSD, 'bLUSD'),
         lusdAmount: assetAmountInEth(bond.lusdAmount, 'LUSD'),
         maxAmountBLUSD: assetAmountInEth(bond.maxAmountBLUSD, 'bLUSD'),
+        tokenURI: decodeTokenURIToSvg(bond.tokenURI),
     };
 });

package/esm/helpers/aaveHelpers/index.js

@@ -61,8 +61,20 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     const payload = {};
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
-    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new Dec(suppliedUsd).mul(aaveAnyGetEmodeMutableProps(data, symbol).collateralFactor));
-    payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => new Dec(suppliedUsd).mul(aaveAnyGetEmodeMutableProps(data, symbol).liquidationRatio));
+    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const suppliedUsdAmount = isMorphoAaveV3(data)
+            // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+            ? new Dec(suppliedUsd).minus(new Dec(suppliedUsd).div(100).times(0.1)).toString()
+            : suppliedUsd;
+        return new Dec(suppliedUsdAmount).mul(aaveAnyGetEmodeMutableProps(data, symbol).collateralFactor);
+    });
+    payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const suppliedUsdAmount = isMorphoAaveV3(data)
+            // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+            ? new Dec(suppliedUsd).minus(new Dec(suppliedUsd).div(100).times(0.1)).toString()
+            : suppliedUsd;
+        return new Dec(suppliedUsdAmount).mul(aaveAnyGetEmodeMutableProps(data, symbol).liquidationRatio);
+    });
     payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();

package/esm/helpers/chickenBondsHelpers/index.d.ts

@@ -1,2 +1,3 @@
 export declare const calcCBondsBLUSDFloorPrice: (bLUSDSupply: string, totalReserveLUSD: string) => string;
 export declare const calcAverageBondAgeMs: (totalWeightedStartTimes: string, totalPendingLusd: string) => number;
+export declare const decodeTokenURIToSvg: (tokenURI: string) => string;

package/esm/helpers/chickenBondsHelpers/index.js

@@ -9,3 +9,15 @@ export const calcAverageBondAgeMs = (totalWeightedStartTimes, totalPendingLusd)
         .toNumber();
     return Date.now() - averageStartTimeMs;
 };
+export const decodeTokenURIToSvg = (tokenURI) => {
+    var _a;
+    try {
+        const dataStartIndex = tokenURI.indexOf('base64,') + 'base64,'.length;
+        const json = atob(tokenURI.slice(dataStartIndex));
+        return (_a = JSON.parse(json)) === null || _a === void 0 ? void 0 : _a.image;
+    }
+    catch (e) {
+        console.error(e);
+        return 'Error parsing NFT image';
+    }
+};

package/esm/helpers/compoundHelpers/index.js

@@ -20,7 +20,7 @@ export const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
     const price = getEthAmountForDecimals(data.price, 8);
-    return (Object.assign(Object.assign({}, data), { price: getEthAmountForDecimals(data.price, 8), priceUSD: new Dec(price).mul(baseAssetPrice).toString(), collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18), liquidationRatio: getEthAmountForDecimals(data.liquidateCollateralFactor, 18), supplyCap: getEthAmountForDecimals(data.supplyCap, assetInfo.decimals), totalSupply: getEthAmountForDecimals(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
+    return (Object.assign(Object.assign({}, data), { priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: new Dec(price).mul(baseAssetPrice).toString(), collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18), liquidationRatio: getEthAmountForDecimals(data.liquidateCollateralFactor, 18), supplyCap: getEthAmountForDecimals(data.supplyCap, assetInfo.decimals), totalSupply: getEthAmountForDecimals(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
 };
 // TODO: maybe not hardcode decimals
 export const formatBaseData = (data, network, baseAssetPrice) => {
@@ -31,7 +31,7 @@ export const formatBaseData = (data, network, baseAssetPrice) => {
             .toString()), borrowRate: aprToApy(new Dec(data.borrowRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)
             .toString()), utilization: getEthAmountForDecimals(data.utilization, 16), // utilization is totalSupply/totalBorrow in 1e18, but we need % so when we mul with 100 it's 16 decimals
         totalSupply,
-        totalBorrow, marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(), symbol: wethToEth(assetInfo.symbol), price: getEthAmountForDecimals(data.price, 8), priceUSD: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: getEthAmountForDecimals(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: getEthAmountForDecimals(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: getEthAmountForDecimals(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
+        totalBorrow, marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(), symbol: wethToEth(assetInfo.symbol), priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: getEthAmountForDecimals(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: getEthAmountForDecimals(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: getEthAmountForDecimals(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 export const getIncentiveApys = (baseData, compPrice) => {
     const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();

package/esm/types/chickenBonds.d.ts

@@ -30,6 +30,7 @@ export interface BondInfoBasic {
     claimedBLUSD: string;
     lusdAmount: string;
     maxAmountBLUSD: string;
+    tokenURI: string;
 }
 export declare enum BondStatus {
     Nonexistent = "0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -4,15 +4,23 @@ import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tok
 import {
   AaveIncentiveDataProviderV3Contract,
   AaveV3ViewContract,
-  GhoTokenContract,
   getConfigContractAbi,
   getConfigContractAddress,
+  GhoTokenContract,
 } from '../contracts';
 import {
   addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth,
 } from '../services/utils';
 import {
-  AaveMarketInfo, AaveV3AssetData, AaveV3AssetsData, AaveV3IncentiveData, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAsset, AaveV3UsedAssets, EModeCategoryData, EModeCategoryDataMapping,
+  AaveMarketInfo,
+  AaveV3AssetData,
+  AaveV3AssetsData,
+  AaveV3IncentiveData,
+  AaveV3MarketData,
+  AaveV3PositionData,
+  AaveV3UsedAsset,
+  AaveV3UsedAssets,
+  EModeCategoryDataMapping,
 } from '../types/aave';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
@@ -22,7 +30,11 @@ import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
-import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
+import {
+  aaveAnyGetAggregatedPositionData,
+  aaveV3IsInIsolationMode,
+  aaveV3IsInSiloedMode,
+} from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 
 export const test = (web3: Web3, network: NetworkNumber) => {
@@ -237,6 +249,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
           collateralFactor: new Dec(tokenMarket.ltv).div(10000).toString(),
           priceSource: tokenMarket.priceSource,
         },
+        aTokenAddress: tokenMarket.aTokenAddress,
       });
     }));
 
@@ -245,7 +258,6 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
     /* eslint-disable no-param-reassign */
     const rewardForMarket: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput | undefined = rewardInfo?.[_market.underlyingTokenAddress as any];
     if (['wstETH', 'cbETH', 'rETH', 'sDAI'].includes(_market.symbol)) {
-      if (!isLayer2Network(network) && _market.symbol === 'cbETH') return;
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol, defaultWeb3);
       _market.incentiveSupplyToken = _market.symbol;
     }

package/src/chickenBonds/index.ts

@@ -9,7 +9,7 @@ import {
 import { ChickenBondsManagerContract, ChickenBondsViewContract } from '../contracts';
 import { BondInfoBasic, ChickenBondsSystemInfoBasic } from '../types';
 import { multicall } from '../multicall';
-import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice } from '../helpers/chickenBondsHelpers';
+import { calcAverageBondAgeMs, calcCBondsBLUSDFloorPrice, decodeTokenURIToSvg } from '../helpers/chickenBondsHelpers';
 
 export const getChickenBondsAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, bondId: string): Promise<PositionBalances> => {
   const viewContract = ChickenBondsViewContract(web3, network, block);
@@ -94,7 +94,7 @@ export const fetchCBondsForUser = async (web3: Web3, network: NetworkNumber, add
   }) => ({
     bondId: bondID,
     status,
-    // tokenURI: decodeTokenURIToSvg(tokenURI),
+    tokenURI: decodeTokenURIToSvg(tokenURI),
     startTime: new Date(+startTime * 1000),
     endTime: new Date(+endTime * 1000),
     accruedBLUSD: assetAmountInEth(accruedBLUSD, 'bLUSD'),
@@ -118,5 +118,6 @@ export const fetchCBondForId = async (web3: Web3, network: NetworkNumber, bondId
     claimedBLUSD: assetAmountInEth(bond.claimedBLUSD, 'bLUSD'),
     lusdAmount: assetAmountInEth(bond.lusdAmount, 'LUSD'),
     maxAmountBLUSD: assetAmountInEth(bond.maxAmountBLUSD, 'bLUSD'),
+    tokenURI: decodeTokenURIToSvg(bond.tokenURI),
   };
 };

package/src/helpers/aaveHelpers/index.ts

@@ -87,12 +87,26 @@ export const aaveAnyGetAggregatedPositionData = ({
   payload.borrowLimitUsd = getAssetsTotal(
     usedAssets,
     ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(aaveAnyGetEmodeMutableProps(data, symbol).collateralFactor),
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
+      const suppliedUsdAmount = isMorphoAaveV3(data)
+        // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+        ? new Dec(suppliedUsd).minus(new Dec(suppliedUsd).div(100).times(0.1)).toString()
+        : suppliedUsd;
+
+      return new Dec(suppliedUsdAmount).mul(aaveAnyGetEmodeMutableProps(data, symbol).collateralFactor);
+    },
   );
   payload.liquidationLimitUsd = getAssetsTotal(
     usedAssets,
     ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(aaveAnyGetEmodeMutableProps(data, symbol).liquidationRatio),
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
+      const suppliedUsdAmount = isMorphoAaveV3(data)
+        // Morpho has a slightly different method for calculating health ratio than underlying pool (To account for potential errors in rounding)
+        ? new Dec(suppliedUsd).minus(new Dec(suppliedUsd).div(100).times(0.1)).toString()
+        : suppliedUsd;
+
+      return new Dec(suppliedUsdAmount).mul(aaveAnyGetEmodeMutableProps(data, symbol).liquidationRatio);
+    },
   );
   payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
   const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);

package/src/helpers/chickenBondsHelpers/index.ts

@@ -10,4 +10,15 @@ export const calcAverageBondAgeMs = (totalWeightedStartTimes: string, totalPendi
     .toNumber();
 
   return Date.now() - averageStartTimeMs;
+};
+
+export const decodeTokenURIToSvg = (tokenURI: string): string => {
+  try {
+    const dataStartIndex = tokenURI.indexOf('base64,') + 'base64,'.length;
+    const json = atob(tokenURI.slice(dataStartIndex));
+    return JSON.parse(json)?.image;
+  } catch (e) {
+    console.error(e);
+    return 'Error parsing NFT image';
+  }
 };

package/src/helpers/compoundHelpers/index.ts

@@ -17,8 +17,8 @@ export const formatMarketData = (data: any, network: NetworkNumber, baseAssetPri
   const price = getEthAmountForDecimals(data.price, 8);
   return ({
     ...data,
-    price: getEthAmountForDecimals(data.price, 8),
-    priceUSD: new Dec(price).mul(baseAssetPrice).toString(),
+    priceInBaseAsset: getEthAmountForDecimals(data.price, 8),
+    price: new Dec(price).mul(baseAssetPrice).toString(),
     collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18),
     liquidationRatio: getEthAmountForDecimals(data.liquidateCollateralFactor, 18),
     supplyCap: getEthAmountForDecimals(data.supplyCap, assetInfo.decimals),
@@ -47,8 +47,8 @@ export const formatBaseData = (data: any, network: NetworkNumber, baseAssetPrice
     totalBorrow,
     marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(),
     symbol: wethToEth(assetInfo.symbol),
-    price: getEthAmountForDecimals(data.price, 8),
-    priceUSD: baseAssetPrice,
+    priceInBaseAsset: getEthAmountForDecimals(data.price, 8),
+    price: baseAssetPrice,
     collateralFactor: '0',
     liquidationRatio: '0',
     canBeBorrowed: true,

package/src/types/chickenBonds.ts

@@ -32,6 +32,7 @@ export interface BondInfoBasic {
   claimedBLUSD: string,
   lusdAmount: string,
   maxAmountBLUSD: string,
+  tokenURI: string,
 }
 
 export enum BondStatus {