@defisaver/positions-sdk 0.0.5 → 0.0.7

package/esm/types/contracts/generated/ETHPriceFeed.d.ts

@@ -0,0 +1,135 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type AnswerUpdated = ContractEventLog<{
+    current: string;
+    roundId: string;
+    updatedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type NewRound = ContractEventLog<{
+    roundId: string;
+    startedBy: string;
+    startedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type OwnershipTransferRequested = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export type OwnershipTransferred = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export interface ETHPriceFeed extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): ETHPriceFeed;
+    clone(): ETHPriceFeed;
+    methods: {
+        acceptOwnership(): NonPayableTransactionObject<void>;
+        accessController(): NonPayableTransactionObject<string>;
+        aggregator(): NonPayableTransactionObject<string>;
+        confirmAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        decimals(): NonPayableTransactionObject<string>;
+        description(): NonPayableTransactionObject<string>;
+        getAnswer(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        getTimestamp(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        latestAnswer(): NonPayableTransactionObject<string>;
+        latestRound(): NonPayableTransactionObject<string>;
+        latestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        latestTimestamp(): NonPayableTransactionObject<string>;
+        owner(): NonPayableTransactionObject<string>;
+        phaseAggregators(arg0: number | string | BN): NonPayableTransactionObject<string>;
+        phaseId(): NonPayableTransactionObject<string>;
+        proposeAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        proposedAggregator(): NonPayableTransactionObject<string>;
+        proposedGetRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        proposedLatestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setController(_accessController: string): NonPayableTransactionObject<void>;
+        transferOwnership(_to: string): NonPayableTransactionObject<void>;
+        version(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AnswerUpdated(cb?: Callback<AnswerUpdated>): EventEmitter;
+        AnswerUpdated(options?: EventOptions, cb?: Callback<AnswerUpdated>): EventEmitter;
+        NewRound(cb?: Callback<NewRound>): EventEmitter;
+        NewRound(options?: EventOptions, cb?: Callback<NewRound>): EventEmitter;
+        OwnershipTransferRequested(cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferRequested(options?: EventOptions, cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferred(cb?: Callback<OwnershipTransferred>): EventEmitter;
+        OwnershipTransferred(options?: EventOptions, cb?: Callback<OwnershipTransferred>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AnswerUpdated", cb: Callback<AnswerUpdated>): void;
+    once(event: "AnswerUpdated", options: EventOptions, cb: Callback<AnswerUpdated>): void;
+    once(event: "NewRound", cb: Callback<NewRound>): void;
+    once(event: "NewRound", options: EventOptions, cb: Callback<NewRound>): void;
+    once(event: "OwnershipTransferRequested", cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferRequested", options: EventOptions, cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferred", cb: Callback<OwnershipTransferred>): void;
+    once(event: "OwnershipTransferred", options: EventOptions, cb: Callback<OwnershipTransferred>): void;
+}

package/esm/types/contracts/generated/ETHPriceFeed.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

package/esm/types/contracts/generated/USDCPriceFeed.d.ts

@@ -0,0 +1,135 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type AnswerUpdated = ContractEventLog<{
+    current: string;
+    roundId: string;
+    updatedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type NewRound = ContractEventLog<{
+    roundId: string;
+    startedBy: string;
+    startedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type OwnershipTransferRequested = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export type OwnershipTransferred = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export interface USDCPriceFeed extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): USDCPriceFeed;
+    clone(): USDCPriceFeed;
+    methods: {
+        acceptOwnership(): NonPayableTransactionObject<void>;
+        accessController(): NonPayableTransactionObject<string>;
+        aggregator(): NonPayableTransactionObject<string>;
+        confirmAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        decimals(): NonPayableTransactionObject<string>;
+        description(): NonPayableTransactionObject<string>;
+        getAnswer(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        getTimestamp(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        latestAnswer(): NonPayableTransactionObject<string>;
+        latestRound(): NonPayableTransactionObject<string>;
+        latestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        latestTimestamp(): NonPayableTransactionObject<string>;
+        owner(): NonPayableTransactionObject<string>;
+        phaseAggregators(arg0: number | string | BN): NonPayableTransactionObject<string>;
+        phaseId(): NonPayableTransactionObject<string>;
+        proposeAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        proposedAggregator(): NonPayableTransactionObject<string>;
+        proposedGetRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        proposedLatestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setController(_accessController: string): NonPayableTransactionObject<void>;
+        transferOwnership(_to: string): NonPayableTransactionObject<void>;
+        version(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AnswerUpdated(cb?: Callback<AnswerUpdated>): EventEmitter;
+        AnswerUpdated(options?: EventOptions, cb?: Callback<AnswerUpdated>): EventEmitter;
+        NewRound(cb?: Callback<NewRound>): EventEmitter;
+        NewRound(options?: EventOptions, cb?: Callback<NewRound>): EventEmitter;
+        OwnershipTransferRequested(cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferRequested(options?: EventOptions, cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferred(cb?: Callback<OwnershipTransferred>): EventEmitter;
+        OwnershipTransferred(options?: EventOptions, cb?: Callback<OwnershipTransferred>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AnswerUpdated", cb: Callback<AnswerUpdated>): void;
+    once(event: "AnswerUpdated", options: EventOptions, cb: Callback<AnswerUpdated>): void;
+    once(event: "NewRound", cb: Callback<NewRound>): void;
+    once(event: "NewRound", options: EventOptions, cb: Callback<NewRound>): void;
+    once(event: "OwnershipTransferRequested", cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferRequested", options: EventOptions, cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferred", cb: Callback<OwnershipTransferred>): void;
+    once(event: "OwnershipTransferred", options: EventOptions, cb: Callback<OwnershipTransferred>): void;
+}

package/esm/types/contracts/generated/USDCPriceFeed.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

package/esm/types/contracts/generated/index.d.ts

@@ -7,6 +7,7 @@ export type { AaveV3PoolAddressesProvider } from "./AaveV3PoolAddressesProvider"
 export type { AaveV3ProtocolDataProvider } from "./AaveV3ProtocolDataProvider";
 export type { AaveV3View } from "./AaveV3View";
 export type { BalanceScanner } from "./BalanceScanner";
+export type { COMPPriceFeed } from "./COMPPriceFeed";
 export type { CbEth } from "./CbEth";
 export type { ChickenBondsManager } from "./ChickenBondsManager";
 export type { ChickenBondsView } from "./ChickenBondsView";
@@ -17,6 +18,7 @@ export type { CompV3USDbCBulker } from "./CompV3USDbCBulker";
 export type { CompV3View } from "./CompV3View";
 export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
+export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
 export type { GHO } from "./GHO";
 export type { GhoDiscountRateStrategy } from "./GhoDiscountRateStrategy";
@@ -43,6 +45,7 @@ export type { SparkPoolAddressesProvider } from "./SparkPoolAddressesProvider";
 export type { SparkProtocolDataProvider } from "./SparkProtocolDataProvider";
 export type { SparkView } from "./SparkView";
 export type { TroveManager } from "./TroveManager";
+export type { USDCPriceFeed } from "./USDCPriceFeed";
 export type { UniMulticall } from "./UniMulticall";
 export type { CETHv3 } from "./CETHv3";
 export type { CUSDCv3 } from "./CUSDCv3";

package/package.json

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

package/src/aaveV2/index.ts

@@ -15,8 +15,10 @@ import {
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { AAVE_V2 } from '../markets/aave';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
+import { getEthPrice } from '../services/priceService';
 
-export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, ethPrice: string, mainnetWeb3: Web3) => {
+export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, mainnetWeb3: Web3) => {
+  const ethPrice = await getEthPrice(mainnetWeb3);
   const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
   const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
   const marketAddress = selectedMarket.providerAddress;
@@ -212,8 +214,8 @@ export const getAaveV2AccountData = async (web3: Web3, network: NetworkNumber, a
   return payload;
 };
 
-export const getAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, ethPrice: string, mainnetWeb3: Web3): Promise<AaveV2PositionData> => {
-  const marketData = await getAaveV2MarketsData(web3, network, market, ethPrice, mainnetWeb3);
+export const getAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3): Promise<AaveV2PositionData> => {
+  const marketData = await getAaveV2MarketsData(web3, network, market, mainnetWeb3);
   const positionData = await getAaveV2AccountData(web3, network, address, marketData.assetsData, market);
   return positionData;
 };

package/src/aaveV3/index.ts

@@ -237,6 +237,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
           collateralFactor: new Dec(tokenMarket.ltv).div(10000).toString(),
           priceSource: tokenMarket.priceSource,
         },
+        aTokenAddress: tokenMarket.aTokenAddress,
       });
     }));
 

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/compoundV3/index.ts

@@ -21,8 +21,11 @@ import {
   formatBaseData, formatMarketData, getCompoundV3AggregatedData, getIncentiveApys,
 } from '../helpers/compoundHelpers';
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC } from '../markets/compound';
+import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
 
-export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, compPrice: string, defaultWeb3: Web3): Promise<CompoundV3MarketsData> => {
+export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultWeb3: Web3): Promise<CompoundV3MarketsData> => {
+  const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? await getEthPrice(defaultWeb3) : await getUSDCPrice(defaultWeb3);
+  const compPrice = await getCompPrice(defaultWeb3);
   const contract = CompV3ViewContract(web3, network);
   const CompV3ViewAddress = contract.options.address;
   const calls = [
@@ -38,7 +41,7 @@ export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumbe
     },
   ];
   const data = await multicall(calls, web3, network);
-  const colls = data[1].colls.map((coll: any) => formatMarketData(coll, network)) as CompoundV3AssetData[];
+  const colls = data[1].colls.map((coll: any) => formatMarketData(coll, network, baseAssetPrice)) as CompoundV3AssetData[];
   if (selectedMarket.value === CompoundVersions.CompoundV3ETH) {
     for (const coll of colls) {
       if (coll.symbol === 'wstETH') {
@@ -65,7 +68,7 @@ export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumbe
       }
     }
   }
-  const base = formatBaseData(data[0].baseToken, network);
+  const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);
 
   const payload: CompoundV3AssetsData = {};
 
@@ -252,8 +255,8 @@ export const getCompoundV3AccountData = async (
   return payload;
 };
 
-export const getCompoundV3FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, selectedMarket: CompoundMarketData, compPrice: string, mainnetWeb3: Web3): Promise<CompoundV3PositionData> => {
-  const marketData = await getCompoundV3MarketsData(web3, network, selectedMarket, compPrice, mainnetWeb3);
+export const getCompoundV3FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, selectedMarket: CompoundMarketData, mainnetWeb3: Web3): Promise<CompoundV3PositionData> => {
+  const marketData = await getCompoundV3MarketsData(web3, network, selectedMarket, mainnetWeb3);
   const positionData = await getCompoundV3AccountData(web3, network, address, proxyAddress, { selectedMarket, assetsData: marketData.assetsData });
   return positionData;
 };

package/src/config/contracts.js

@@ -597,5 +597,23 @@ module.exports = {
     "networks": {
       "1": { "address": "0x57619FE9C539f890b19c61812226F9703ce37137" }
     }
+  },
+  "COMPPriceFeed": {
+    "abi": [{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"},{"internalType":"address","name":"_accessController","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"int256","name":"current","type":"int256"},{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"updatedAt","type":"uint256"}],"name":"AnswerUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":true,"internalType":"address","name":"startedBy","type":"address"},{"indexed":false,"internalType":"uint256","name":"startedAt","type":"uint256"}],"name":"NewRound","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"accessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"aggregator","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"confirmAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRound","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address payable","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint16","name":"","type":"uint16"}],"name":"phaseAggregators","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"phaseId","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"proposeAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"proposedAggregator","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"proposedGetRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"proposedLatestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_accessController","type":"address"}],"name":"setController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+    "networks": {
+      "1": { "address": "0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5" }
+    }
+  },
+  "ETHPriceFeed": {
+    "abi": [{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"},{"internalType":"address","name":"_accessController","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"int256","name":"current","type":"int256"},{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"updatedAt","type":"uint256"}],"name":"AnswerUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":true,"internalType":"address","name":"startedBy","type":"address"},{"indexed":false,"internalType":"uint256","name":"startedAt","type":"uint256"}],"name":"NewRound","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"accessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"aggregator","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"confirmAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRound","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address payable","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint16","name":"","type":"uint16"}],"name":"phaseAggregators","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"phaseId","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"proposeAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"proposedAggregator","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"proposedGetRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"proposedLatestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_accessController","type":"address"}],"name":"setController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+    "networks": {
+      "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" }
+    },
+  },
+  "USDCPriceFeed": {
+    "abi": [{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"},{"internalType":"address","name":"_accessController","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"int256","name":"current","type":"int256"},{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"updatedAt","type":"uint256"}],"name":"AnswerUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"roundId","type":"uint256"},{"indexed":true,"internalType":"address","name":"startedBy","type":"address"},{"indexed":false,"internalType":"uint256","name":"startedAt","type":"uint256"}],"name":"NewRound","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"accessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"aggregator","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"confirmAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRound","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint16","name":"","type":"uint16"}],"name":"phaseAggregators","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"phaseId","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_aggregator","type":"address"}],"name":"proposeAggregator","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"proposedAggregator","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"proposedGetRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"proposedLatestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_accessController","type":"address"}],"name":"setController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+    "networks": {
+      "1": { "address": "0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6" }
+    }
   }
 }

package/src/contracts.ts

@@ -94,4 +94,8 @@ export const McdJugContract = createContractFromConfigFunc<ContractTypes.McdJug>
 export const McdVatContract = createContractFromConfigFunc<ContractTypes.McdVat>('McdVat');
 
 export const ChickenBondsViewContract = createContractFromConfigFunc<ContractTypes.ChickenBondsView>('ChickenBondsView');
-export const ChickenBondsManagerContract = createContractFromConfigFunc<ContractTypes.ChickenBondsManager>('ChickenBondsManager');
+export const ChickenBondsManagerContract = createContractFromConfigFunc<ContractTypes.ChickenBondsManager>('ChickenBondsManager');
+
+export const ETHPriceFeedContract = createContractFromConfigFunc<ContractTypes.ETHPriceFeed>('ETHPriceFeed');
+export const COMPPriceFeedContract = createContractFromConfigFunc<ContractTypes.COMPPriceFeed>('COMPPriceFeed');
+export const USDCPriceFeedContract = createContractFromConfigFunc<ContractTypes.USDCPriceFeed>('USDCPriceFeed');

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

@@ -11,12 +11,14 @@ import {
 import { calculateNetApy } from '../../staking';
 import { NetworkNumber } from '../../types/common';
 
-export const formatMarketData = (data: any, network: NetworkNumber): CompoundV3AssetData => {
+export const formatMarketData = (data: any, network: NetworkNumber, baseAssetPrice: string): CompoundV3AssetData => {
   const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
   const isWETH = assetInfo.symbol === 'WETH';
+  const price = getEthAmountForDecimals(data.price, 8);
   return ({
     ...data,
-    price: getEthAmountForDecimals(data.price, 8),
+    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),
@@ -30,7 +32,7 @@ export const formatMarketData = (data: any, network: NetworkNumber): CompoundV3A
 };
 
 // TODO: maybe not hardcode decimals
-export const formatBaseData = (data: any, network: NetworkNumber): CompoundV3AssetData & BaseAdditionalAssetData => {
+export const formatBaseData = (data: any, network: NetworkNumber, baseAssetPrice: string): CompoundV3AssetData & BaseAdditionalAssetData => {
   const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
   const totalSupply = getEthAmountForDecimals(new Dec(data.totalSupply).mul(data.supplyIndex).toString(), 15 + assetInfo.decimals);
   const totalBorrow = getEthAmountForDecimals(new Dec(data.totalBorrow).mul(data.borrowIndex).toString(), 15 + assetInfo.decimals);
@@ -45,7 +47,8 @@ export const formatBaseData = (data: any, network: NetworkNumber): CompoundV3Ass
     totalBorrow,
     marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(),
     symbol: wethToEth(assetInfo.symbol),
-    price: getEthAmountForDecimals(data.price, 8),
+    priceInBaseAsset: getEthAmountForDecimals(data.price, 8),
+    price: baseAssetPrice,
     collateralFactor: '0',
     liquidationRatio: '0',
     canBeBorrowed: true,

package/src/morphoAaveV2/index.ts

@@ -14,8 +14,10 @@ import {
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
+import { getEthPrice } from '../services/priceService';
 
-export const getMorphoAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, ethPrice: string, mainnetWeb3: Web3): Promise<MorphoAaveV2MarketData> => {
+export const getMorphoAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, mainnetWeb3: Web3): Promise<MorphoAaveV2MarketData> => {
+  const ethPrice = await getEthPrice(mainnetWeb3);
   const morphoAaveV2ViewContract = MorphoAaveV2ViewContract(web3, network);
 
   const [contractData, morphoRewardsRes] = await Promise.allSettled([
@@ -246,8 +248,8 @@ export const getMorphoAaveV2AccountData = async (web3: Web3, network: NetworkNum
   return payload;
 };
 
-export const getMorphoAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, ethPrice: string, mainnetWeb3: Web3): Promise<MorphoAaveV2PositionData> => {
-  const marketData = await getMorphoAaveV2MarketsData(web3, network, ethPrice, mainnetWeb3);
+export const getMorphoAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, mainnetWeb3: Web3): Promise<MorphoAaveV2PositionData> => {
+  const marketData = await getMorphoAaveV2MarketsData(web3, network, mainnetWeb3);
   const positionData = await getMorphoAaveV2AccountData(web3, network, address, marketData.assetsData);
   return positionData;
 };