@defisaver/positions-sdk 0.0.30-dev → 0.0.32

package/cjs/types/contracts/generated/FeedRegistry.d.ts

@@ -0,0 +1,182 @@
+/// <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 declare namespace FeedRegistryInterface {
+    type PhaseStruct = [number | string | BN, number | string | BN, number | string | BN] | {
+        phaseId: number | string | BN;
+        startingAggregatorRoundId: number | string | BN;
+        endingAggregatorRoundId: number | string | BN;
+    };
+    type PhaseStructOutputArray = [string, string, string];
+    type PhaseStructOutputStruct = {
+        phaseId: string;
+        startingAggregatorRoundId: string;
+        endingAggregatorRoundId: string;
+    };
+    type PhaseStructOutput = PhaseStructOutputArray & PhaseStructOutputStruct;
+}
+export type AccessControllerSet = ContractEventLog<{
+    accessController: string;
+    sender: string;
+    0: string;
+    1: string;
+}>;
+export type FeedConfirmed = ContractEventLog<{
+    asset: string;
+    denomination: string;
+    latestAggregator: string;
+    previousAggregator: string;
+    nextPhaseId: string;
+    sender: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+}>;
+export type FeedProposed = ContractEventLog<{
+    asset: string;
+    denomination: string;
+    proposedAggregator: string;
+    currentAggregator: string;
+    sender: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: 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 FeedRegistry extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): FeedRegistry;
+    clone(): FeedRegistry;
+    methods: {
+        acceptOwnership(): NonPayableTransactionObject<void>;
+        confirmFeed(base: string, quote: string, aggregator: string): NonPayableTransactionObject<void>;
+        decimals(base: string, quote: string): NonPayableTransactionObject<string>;
+        description(base: string, quote: string): NonPayableTransactionObject<string>;
+        getAccessController(): NonPayableTransactionObject<string>;
+        getAnswer(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getCurrentPhaseId(base: string, quote: string): NonPayableTransactionObject<string>;
+        getFeed(base: string, quote: string): NonPayableTransactionObject<string>;
+        getNextRoundId(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getPhase(base: string, quote: string, phaseId: number | string | BN): NonPayableTransactionObject<FeedRegistryInterface.PhaseStructOutput>;
+        getPhaseFeed(base: string, quote: string, phaseId: number | string | BN): NonPayableTransactionObject<string>;
+        getPhaseRange(base: string, quote: string, phaseId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string
+        ] & {
+            startingRoundId: string;
+            endingRoundId: string;
+        }>;
+        getPreviousRoundId(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getProposedFeed(base: string, quote: string): NonPayableTransactionObject<string>;
+        getRoundData(base: string, quote: string, _roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        getRoundFeed(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getTimestamp(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<string>;
+        isFeedEnabled(aggregator: string): NonPayableTransactionObject<boolean>;
+        latestAnswer(base: string, quote: string): NonPayableTransactionObject<string>;
+        latestRound(base: string, quote: string): NonPayableTransactionObject<string>;
+        latestRoundData(base: string, quote: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        latestTimestamp(base: string, quote: string): NonPayableTransactionObject<string>;
+        owner(): NonPayableTransactionObject<string>;
+        proposeFeed(base: string, quote: string, aggregator: string): NonPayableTransactionObject<void>;
+        proposedGetRoundData(base: string, quote: string, roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            id: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        proposedLatestRoundData(base: string, quote: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            id: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setAccessController(_accessController: string): NonPayableTransactionObject<void>;
+        transferOwnership(to: string): NonPayableTransactionObject<void>;
+        typeAndVersion(): NonPayableTransactionObject<string>;
+        version(base: string, quote: string): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AccessControllerSet(cb?: Callback<AccessControllerSet>): EventEmitter;
+        AccessControllerSet(options?: EventOptions, cb?: Callback<AccessControllerSet>): EventEmitter;
+        FeedConfirmed(cb?: Callback<FeedConfirmed>): EventEmitter;
+        FeedConfirmed(options?: EventOptions, cb?: Callback<FeedConfirmed>): EventEmitter;
+        FeedProposed(cb?: Callback<FeedProposed>): EventEmitter;
+        FeedProposed(options?: EventOptions, cb?: Callback<FeedProposed>): 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: "AccessControllerSet", cb: Callback<AccessControllerSet>): void;
+    once(event: "AccessControllerSet", options: EventOptions, cb: Callback<AccessControllerSet>): void;
+    once(event: "FeedConfirmed", cb: Callback<FeedConfirmed>): void;
+    once(event: "FeedConfirmed", options: EventOptions, cb: Callback<FeedConfirmed>): void;
+    once(event: "FeedProposed", cb: Callback<FeedProposed>): void;
+    once(event: "FeedProposed", options: EventOptions, cb: Callback<FeedProposed>): 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/FeedRegistry.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/MorphoBlueView.d.ts

@@ -0,0 +1,122 @@
+/// <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, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type MarketParamsStruct = [string, string, string, string, number | string | BN] | {
+    loanToken: string;
+    collateralToken: string;
+    oracle: string;
+    irm: string;
+    lltv: number | string | BN;
+};
+export type MarketParamsStructOutputArray = [
+    string,
+    string,
+    string,
+    string,
+    string
+];
+export type MarketParamsStructOutputStruct = {
+    loanToken: string;
+    collateralToken: string;
+    oracle: string;
+    irm: string;
+    lltv: string;
+};
+export type MarketParamsStructOutput = MarketParamsStructOutputArray & MarketParamsStructOutputStruct;
+export declare namespace MorphoBlueView {
+    type MarketInfoStruct = [
+        string | number[],
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        id: string | number[];
+        totalSupplyAssets: number | string | BN;
+        totalSupplyShares: number | string | BN;
+        totalBorrowAssets: number | string | BN;
+        totalBorrowShares: number | string | BN;
+        lastUpdate: number | string | BN;
+        fee: number | string | BN;
+        borrowRate: number | string | BN;
+        oracle: number | string | BN;
+    };
+    type MarketInfoStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type MarketInfoStructOutputStruct = {
+        id: string;
+        totalSupplyAssets: string;
+        totalSupplyShares: string;
+        totalBorrowAssets: string;
+        totalBorrowShares: string;
+        lastUpdate: string;
+        fee: string;
+        borrowRate: string;
+        oracle: string;
+    };
+    type MarketInfoStructOutput = MarketInfoStructOutputArray & MarketInfoStructOutputStruct;
+    type PositionInfoStruct = [
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        supplyShares: number | string | BN;
+        suppliedInAssets: number | string | BN;
+        borrowShares: number | string | BN;
+        borrowedInAssets: number | string | BN;
+        collateral: number | string | BN;
+    };
+    type PositionInfoStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type PositionInfoStructOutputStruct = {
+        supplyShares: string;
+        suppliedInAssets: string;
+        borrowShares: string;
+        borrowedInAssets: string;
+        collateral: string;
+    };
+    type PositionInfoStructOutput = PositionInfoStructOutputArray & PositionInfoStructOutputStruct;
+}
+export interface MorphoBlueView extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): MorphoBlueView;
+    clone(): MorphoBlueView;
+    methods: {
+        MORPHO_BLUE_ADDRESS(): NonPayableTransactionObject<string>;
+        getMarketId(marketParams: MarketParamsStruct): NonPayableTransactionObject<string>;
+        getMarketInfo(marketParams: MarketParamsStruct): NonPayableTransactionObject<MorphoBlueView.MarketInfoStructOutput>;
+        getMarketInfoNotTuple(loanToken: string, collToken: string, oracle: string, irm: string, lltv: number | string | BN): NonPayableTransactionObject<MorphoBlueView.MarketInfoStructOutput>;
+        getUserInfo(marketParams: MarketParamsStruct, owner: string): NonPayableTransactionObject<MorphoBlueView.PositionInfoStructOutput>;
+        morphoBlue(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+}

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

@@ -21,6 +21,7 @@ export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
 export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
+export type { FeedRegistry } from "./FeedRegistry";
 export type { GHO } from "./GHO";
 export type { GhoDiscountRateStrategy } from "./GhoDiscountRateStrategy";
 export type { IAToken } from "./IAToken";
@@ -37,6 +38,7 @@ export type { McdView } from "./McdView";
 export type { MorphoAaveV2Proxy } from "./MorphoAaveV2Proxy";
 export type { MorphoAaveV2View } from "./MorphoAaveV2View";
 export type { MorphoAaveV3ProxyEthMarket } from "./MorphoAaveV3ProxyEthMarket";
+export type { MorphoBlueView } from "./MorphoBlueView";
 export type { Pot } from "./Pot";
 export type { PriceFeed } from "./PriceFeed";
 export type { REth } from "./REth";

package/cjs/types/curveUsd.d.ts

@@ -67,12 +67,6 @@ export interface CrvUSDAggregatedPositionData {
     borrowedUsd: string;
     borrowed: string;
     safetyRatio: string;
-    borrowLimitUsd: string;
-    minAllowedRatio: number;
-    collFactor: string;
-    leveragedType: string;
-    leveragedAsset?: string;
-    liquidationPrice?: string;
 }
 export interface CrvUSDUsedAsset {
     isSupplied: boolean;

package/cjs/types/index.d.ts

@@ -5,3 +5,4 @@ export * from './curveUsd';
 export * from './liquity';
 export * from './maker';
 export * from './chickenBonds';
+export * from './morphoBlue';

package/cjs/types/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./curveUsd"), exports);
 __exportStar(require("./liquity"), exports);
 __exportStar(require("./maker"), exports);
 __exportStar(require("./chickenBonds"), exports);
+__exportStar(require("./morphoBlue"), exports);

package/cjs/types/morphoBlue.d.ts

@@ -0,0 +1,74 @@
+import { MMUsedAssets, NetworkNumber } from './common';
+export declare enum MorphoBlueVersions {
+    MorphoBlueWstEthEth = "morphobluewstetheth"
+}
+export interface MorphoBlueMarketData {
+    chainIds: NetworkNumber[];
+    label: string;
+    shortLabel: string;
+    url: string;
+    value: MorphoBlueVersions;
+    loanToken: string;
+    collateralToken: string;
+    oracle: string;
+    irm: string;
+    lltv: number | string;
+    protocolName: string;
+}
+export interface MorphoBlueAssetData {
+    symbol: string;
+    address: string;
+    price: string;
+    supplyRate: string;
+    borrowRate: string;
+    incentiveSupplyApy?: string;
+    incentiveSupplyToken?: string;
+    totalSupply?: string;
+    totalBorrow?: string;
+}
+export type MorphoBlueAssetsData = {
+    [key: string]: MorphoBlueAssetData;
+};
+export interface MorphoBlueMarketInfo {
+    id: string;
+    fee: string;
+    loanToken: string;
+    collateralToken: string;
+    utillization: string;
+    oracle: string;
+    lltv: string;
+    assetsData: MorphoBlueAssetsData;
+}
+export interface MorphoBlueAggregatedPositionData {
+    suppliedUsd: string;
+    suppliedCollateralUsd: string;
+    borrowedUsd: string;
+    borrowLimitUsd: string;
+    liquidationLimitUsd: string;
+    leftToBorrowUsd: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+    ltv: string;
+    leveragedType: string;
+    leveragedAsset?: string;
+    leveragedLsdAssetRatio?: string;
+    liquidationPrice?: string;
+}
+export interface MorphoBluePositionData {
+    usedAssets: MMUsedAssets;
+    suppliedUsd: string;
+    suppliedCollateralUsd: string;
+    borrowedUsd: string;
+    borrowLimitUsd: string;
+    liquidationLimitUsd: string;
+    leftToBorrowUsd: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
+    ltv: string;
+    leveragedType: string;
+    leveragedAsset?: string;
+    leveragedLsdAssetRatio?: string;
+    liquidationPrice?: string;
+}

package/cjs/types/morphoBlue.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MorphoBlueVersions = void 0;
+var MorphoBlueVersions;
+(function (MorphoBlueVersions) {
+    MorphoBlueVersions["MorphoBlueWstEthEth"] = "morphobluewstetheth";
+})(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));

package/esm/compoundV3/index.js

@@ -169,7 +169,7 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
     if (loanData.depositAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isSupplied = true;
         usedAssets[baseAssetSymbol].supplied = assetAmountInEth(loanData.depositAmount, baseAssetInfo.symbol);
-        usedAssets[baseAssetSymbol].suppliedUsd = assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol);
+        usedAssets[baseAssetSymbol].suppliedUsd = new Dec(assetAmountInEth(loanData.depositValue, baseAssetInfo.symbol)).mul(assetsData[baseAssetSymbol].price).toString();
     }
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;