@defisaver/positions-sdk 0.0.5 → 0.0.6

package/esm/contracts.d.ts

@@ -39,3 +39,6 @@ export declare const McdJugContract: (web3: Web3, network: NetworkNumber, block?
 export declare const McdVatContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.McdVat;
 export declare const ChickenBondsViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.ChickenBondsView;
 export declare const ChickenBondsManagerContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.ChickenBondsManager;
+export declare const ETHPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.ETHPriceFeed;
+export declare const COMPPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.COMPPriceFeed;
+export declare const USDCPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.USDCPriceFeed;

package/esm/contracts.js

@@ -54,3 +54,6 @@ export const McdJugContract = createContractFromConfigFunc('McdJug');
 export const McdVatContract = createContractFromConfigFunc('McdVat');
 export const ChickenBondsViewContract = createContractFromConfigFunc('ChickenBondsView');
 export const ChickenBondsManagerContract = createContractFromConfigFunc('ChickenBondsManager');
+export const ETHPriceFeedContract = createContractFromConfigFunc('ETHPriceFeed');
+export const COMPPriceFeedContract = createContractFromConfigFunc('COMPPriceFeed');
+export const USDCPriceFeedContract = createContractFromConfigFunc('USDCPriceFeed');

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

@@ -1,7 +1,7 @@
 import { BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarketData, CompoundV2AssetsData, CompoundV2UsedAssets, CompoundV3AssetData, CompoundV3AssetsData, CompoundV3UsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const formatMarketData: (data: any, network: NetworkNumber) => CompoundV3AssetData;
-export declare const formatBaseData: (data: any, network: NetworkNumber) => CompoundV3AssetData & BaseAdditionalAssetData;
+export declare const formatMarketData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData;
+export declare const formatBaseData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData & BaseAdditionalAssetData;
 export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => {
     incentiveSupplyApy: string;
     incentiveBorrowApy: string;

package/esm/helpers/compoundHelpers/index.js

@@ -16,13 +16,14 @@ import { getEthAmountForDecimals, handleWbtcLegacy, wethToEth } from '../../serv
 import { SECONDS_PER_YEAR } from '../../constants';
 import { aprToApy, calcLeverageLiqPrice, calculateBorrowingAssetLimit, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-export const formatMarketData = (data, network) => {
+export const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
-    return (Object.assign(Object.assign({}, data), { price: getEthAmountForDecimals(data.price, 8), 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 }));
+    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 }));
 };
 // TODO: maybe not hardcode decimals
-export const formatBaseData = (data, network) => {
+export const formatBaseData = (data, network, baseAssetPrice) => {
     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);
@@ -30,7 +31,7 @@ export const formatBaseData = (data, network) => {
             .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), 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), 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 }));
 };
 export const getIncentiveApys = (baseData, compPrice) => {
     const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();

package/esm/morphoAaveV2/index.d.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
 import { MorphoAaveV2AssetsData, MorphoAaveV2MarketData, MorphoAaveV2PositionData } from '../types';
-export declare const getMorphoAaveV2MarketsData: (web3: Web3, network: NetworkNumber, ethPrice: string, mainnetWeb3: Web3) => Promise<MorphoAaveV2MarketData>;
+export declare const getMorphoAaveV2MarketsData: (web3: Web3, network: NetworkNumber, mainnetWeb3: Web3) => Promise<MorphoAaveV2MarketData>;
 export declare const getMorphoAaveV2AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getMorphoAaveV2AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV2AssetsData) => Promise<MorphoAaveV2PositionData>;
-export declare const getMorphoAaveV2FullPositionData: (web3: Web3, network: NetworkNumber, address: string, ethPrice: string, mainnetWeb3: Web3) => Promise<MorphoAaveV2PositionData>;
+export declare const getMorphoAaveV2FullPositionData: (web3: Web3, network: NetworkNumber, address: string, mainnetWeb3: Web3) => Promise<MorphoAaveV2PositionData>;

package/esm/morphoAaveV2/index.js

@@ -16,7 +16,9 @@ import { AaveVersions, } from '../types';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
-export const getMorphoAaveV2MarketsData = (web3, network, ethPrice, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+import { getEthPrice } from '../services/priceService';
+export const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const ethPrice = yield getEthPrice(mainnetWeb3);
     const morphoAaveV2ViewContract = MorphoAaveV2ViewContract(web3, network);
     const [contractData, morphoRewardsRes] = yield Promise.allSettled([
         morphoAaveV2ViewContract.methods.getAllMarketsInfo().call(),
@@ -192,8 +194,8 @@ export const getMorphoAaveV2AccountData = (web3, network, address, assetsData) =
     });
     return payload;
 });
-export const getMorphoAaveV2FullPositionData = (web3, network, address, ethPrice, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield getMorphoAaveV2MarketsData(web3, network, ethPrice, mainnetWeb3);
+export const getMorphoAaveV2FullPositionData = (web3, network, address, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketData = yield getMorphoAaveV2MarketsData(web3, network, mainnetWeb3);
     const positionData = yield getMorphoAaveV2AccountData(web3, network, address, marketData.assetsData);
     return positionData;
 });

package/esm/services/priceService.d.ts

@@ -0,0 +1,4 @@
+import Web3 from 'web3';
+export declare const getEthPrice: (web3: Web3) => Promise<string>;
+export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
+export declare const getCompPrice: (web3: Web3) => Promise<string>;

package/esm/services/priceService.js

@@ -0,0 +1,27 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import Dec from 'decimal.js';
+import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
+import { NetworkNumber } from '../types/common';
+export const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
+export const getUSDCPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = USDCPriceFeedContract(web3, NetworkNumber.Eth);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
+export const getCompPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = COMPPriceFeedContract(web3, NetworkNumber.Eth);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});

package/esm/types/contracts/generated/COMPPriceFeed.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 COMPPriceFeed extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): COMPPriceFeed;
+    clone(): COMPPriceFeed;
+    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/COMPPriceFeed.js

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

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.6",
   "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/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;
 };