@defisaver/positions-sdk 0.0.5 → 0.0.7

package/cjs/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/cjs/types/contracts/generated/COMPPriceFeed.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/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/cjs/types/contracts/generated/ETHPriceFeed.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/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/cjs/types/contracts/generated/USDCPriceFeed.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/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/esm/aaveV2/index.d.ts

@@ -1,9 +1,9 @@
 import Web3 from 'web3';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
 import { AaveMarketInfo, AaveV2AssetsData, AaveV2PositionData } from '../types';
-export declare const getAaveV2MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, ethPrice: string, mainnetWeb3: Web3) => Promise<{
+export declare const getAaveV2MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, mainnetWeb3: Web3) => Promise<{
     assetsData: AaveV2AssetsData;
 }>;
 export declare const getAaveV2AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getAaveV2AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: AaveV2AssetsData, market: AaveMarketInfo) => Promise<AaveV2PositionData>;
-export declare const getAaveV2FullPositionData: (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, ethPrice: string, mainnetWeb3: Web3) => Promise<AaveV2PositionData>;
+export declare const getAaveV2FullPositionData: (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3) => Promise<AaveV2PositionData>;

package/esm/aaveV2/index.js

@@ -16,7 +16,9 @@ import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { AAVE_V2 } from '../markets/aave';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
-export const getAaveV2MarketsData = (web3, network, selectedMarket, ethPrice, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+import { getEthPrice } from '../services/priceService';
+export const getAaveV2MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const ethPrice = yield getEthPrice(mainnetWeb3);
     const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
     const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
     const marketAddress = selectedMarket.providerAddress;
@@ -167,8 +169,8 @@ export const getAaveV2AccountData = (web3, network, address, assetsData, market)
     payload.totalInterestUsd = totalInterestUsd;
     return payload;
 });
-export const getAaveV2FullPositionData = (web3, network, address, market, ethPrice, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield getAaveV2MarketsData(web3, network, market, ethPrice, mainnetWeb3);
+export const getAaveV2FullPositionData = (web3, network, address, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketData = yield getAaveV2MarketsData(web3, network, market, mainnetWeb3);
     const positionData = yield getAaveV2AccountData(web3, network, address, marketData.assetsData, market);
     return positionData;
 });

package/esm/aaveV3/index.js

@@ -154,7 +154,7 @@ 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 */

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

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { CompoundMarketData, CompoundV3AssetsData, CompoundV3MarketsData, CompoundV3PositionData } from '../types/compound';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
-export declare const getCompoundV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, compPrice: string, defaultWeb3: Web3) => Promise<CompoundV3MarketsData>;
+export declare const getCompoundV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: CompoundMarketData, defaultWeb3: Web3) => Promise<CompoundV3MarketsData>;
 export declare const EMPTY_COMPOUND_V3_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -34,4 +34,4 @@ export declare const getCompoundV3AccountData: (web3: Web3, network: NetworkNumb
     selectedMarket: CompoundMarketData;
     assetsData: CompoundV3AssetsData;
 })) => Promise<CompoundV3PositionData>;
-export declare const getCompoundV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, selectedMarket: CompoundMarketData, compPrice: string, mainnetWeb3: Web3) => Promise<CompoundV3PositionData>;
+export declare const getCompoundV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, proxyAddress: string, selectedMarket: CompoundMarketData, mainnetWeb3: Web3) => Promise<CompoundV3PositionData>;

package/esm/compoundV3/index.js

@@ -18,7 +18,10 @@ import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { formatBaseData, formatMarketData, getCompoundV3AggregatedData, getIncentiveApys, } from '../helpers/compoundHelpers';
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC } from '../markets/compound';
-export const getCompoundV3MarketsData = (web3, network, selectedMarket, compPrice, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
+export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield getEthPrice(defaultWeb3) : yield getUSDCPrice(defaultWeb3);
+    const compPrice = yield getCompPrice(defaultWeb3);
     const contract = CompV3ViewContract(web3, network);
     const CompV3ViewAddress = contract.options.address;
     const calls = [
@@ -34,7 +37,7 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, compPric
         },
     ];
     const data = yield multicall(calls, web3, network);
-    const colls = data[1].colls.map((coll) => formatMarketData(coll, network));
+    const colls = data[1].colls.map((coll) => formatMarketData(coll, network, baseAssetPrice));
     if (selectedMarket.value === CompoundVersions.CompoundV3ETH) {
         for (const coll of colls) {
             if (coll.symbol === 'wstETH') {
@@ -61,7 +64,7 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, compPric
             }
         }
     }
-    const base = formatBaseData(data[0].baseToken, network);
+    const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);
     const payload = {};
     const baseObj = Object.assign(Object.assign({}, base), getIncentiveApys(base, compPrice));
     const allAssets = [baseObj, ...colls];
@@ -191,8 +194,8 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
     });
     return payload;
 });
-export const getCompoundV3FullPositionData = (web3, network, address, proxyAddress, selectedMarket, compPrice, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield getCompoundV3MarketsData(web3, network, selectedMarket, compPrice, mainnetWeb3);
+export const getCompoundV3FullPositionData = (web3, network, address, proxyAddress, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketData = yield getCompoundV3MarketsData(web3, network, selectedMarket, mainnetWeb3);
     const positionData = yield getCompoundV3AccountData(web3, network, address, proxyAddress, { selectedMarket, assetsData: marketData.assetsData });
     return positionData;
 });