@defisaver/positions-sdk 0.0.102 → 0.0.104

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

@@ -1,9 +1,10 @@
-import { LlamaLendAggregatedPositionData, LlamaLendMarketData, LlamaLendUsedAssets } from '../../types';
+import { LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const getLlamaLendAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest }: {
+export declare const getLlamaLendAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest }: {
     loanExists: boolean;
     usedAssets: LlamaLendUsedAssets;
     network: NetworkNumber;
     selectedMarket: LlamaLendMarketData;
     numOfBands: number | string;
+    assetsData: LlamaLendAssetsData;
 }) => LlamaLendAggregatedPositionData;

package/cjs/helpers/llamaLendHelpers/index.js

@@ -18,9 +18,10 @@ exports.getLlamaLendAggregatedData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
 const utils_1 = require("../../services/utils");
+const staking_1 = require("../../staking");
 const getLlamaLendAggregatedData = (_a) => {
     var _b;
-    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
+    var { loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands", "assetsData"]);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
     const payload = {};
@@ -29,6 +30,10 @@ const getLlamaLendAggregatedData = (_a) => {
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ collateral }) => collateral, ({ suppliedUsd }) => suppliedUsd);
     payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     payload.suppliedForYieldUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedForYield }) => suppliedForYield || '0');
+    const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)(usedAssets, assetsData);
+    payload.netApy = netApy;
+    payload.incentiveUsd = incentiveUsd;
+    payload.totalInterestUsd = totalInterestUsd;
     payload.ratio = loanExists
         ? new decimal_js_1.default(payload.suppliedUsd)
             .dividedBy(payload.borrowedUsd)

package/cjs/llamaLend/index.d.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { LlamaLendGlobalMarketData, LlamaLendMarketData, LlamaLendUserData } from '../types';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
-export declare const getLlamaLendGlobalData: (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
+export declare const getLlamaLendGlobalData: (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3) => Promise<LlamaLendGlobalMarketData>;
 export declare const getLlamaLendAccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 export declare const getLlamaLendUserData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;
-export declare const getLlamaLendFullPositionData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendUserData>;
+export declare const getLlamaLendFullPositionData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3) => Promise<LlamaLendUserData>;

package/cjs/llamaLend/index.js

@@ -21,6 +21,7 @@ const contracts_1 = require("../contracts");
 const llamaLendHelpers_1 = require("../helpers/llamaLendHelpers");
 const utils_1 = require("../services/utils");
 const llamaLend_1 = require("../markets/llamaLend");
+const staking_1 = require("../staking");
 const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.LlamaLendViewContract)(web3, network);
     const minBand = parseInt(_minBand, 10);
@@ -57,7 +58,7 @@ const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) =>
         highPrice: (0, tokens_1.assetAmountInEth)(band.highPrice),
     }));
 });
-const getLlamaLendGlobalData = (web3, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const getLlamaLendGlobalData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.LlamaLendViewContract)(web3, network);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
@@ -104,6 +105,10 @@ const getLlamaLendGlobalData = (web3, network, selectedMarket) => __awaiter(void
         canBeSupplied: true,
         canBeBorrowed: false,
     };
+    if (staking_1.STAKING_ASSETS.includes(collAsset)) {
+        assetsData[collAsset].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset, defaultWeb3);
+        assetsData[collAsset].incentiveSupplyToken = collAsset;
+    }
     return {
         A: data.A,
         loanDiscount: data.loanDiscount,
@@ -224,12 +229,12 @@ const getLlamaLendUserData = (web3, network, address, selectedMarket, marketData
         priceHigh,
         priceLow, liquidationDiscount: (0, tokens_1.assetAmountInEth)(data.liquidationDiscount), numOfBands: data.N, usedAssets,
         status }), (0, llamaLendHelpers_1.getLlamaLendAggregatedData)({
-        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
+        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket, numOfBands: data.N, assetsData,
     })), { userBands });
 });
 exports.getLlamaLendUserData = getLlamaLendUserData;
-const getLlamaLendFullPositionData = (web3, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield (0, exports.getLlamaLendGlobalData)(web3, network, selectedMarket);
+const getLlamaLendFullPositionData = (web3, network, address, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketData = yield (0, exports.getLlamaLendGlobalData)(web3, network, selectedMarket, defaultWeb3);
     const positionData = yield (0, exports.getLlamaLendUserData)(web3, network, address, selectedMarket, marketData);
     return positionData;
 });

package/cjs/markets/llamaLend/contractAddresses.js

@@ -10,9 +10,9 @@ const ethAddresses = {
         vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
     },
     [types_1.LlamaLendVersions.LLWstethCrvusd2]: {
-        controllerId: 11,
-        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
-        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+        controllerId: 13,
+        controllerAddress: '0x5756A035F276a8095A922931F224F4ed06149608',
+        vaultAddress: '0x21CF1c5Dc48C603b89907FE6a7AE83EA5e3709aF',
     },
     [types_1.LlamaLendVersions.LLSusdeCrvusd]: {
         controllerId: 7,
@@ -64,11 +64,12 @@ const ethAddresses = {
         controllerAddress: '0xcaD85b7fe52B1939DCEebEe9bCf0b2a5Aa0cE617',
         vaultAddress: '0xccd37EB6374Ae5b1f0b85ac97eFf14770e0D0063',
     },
-    [types_1.LlamaLendVersions.LLPufethCrvusd]: {
-        controllerId: 10,
-        controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
-        vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
-    },
+    // temp disabled
+    // [LlamaLendVersions.LLPufethCrvusd]: {
+    //   controllerId: 10,
+    //   controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
+    //   vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
+    // },
     [types_1.LlamaLendVersions.LLUsdeCrvusd]: {
         controllerId: 14,
         controllerAddress: '0x74f88Baa966407b50c10B393bBD789639EFfE78B',

package/cjs/markets/llamaLend/index.d.ts

@@ -17,7 +17,6 @@ export declare const LLAMALEND_FXN_CRVUSD_MARKET: (networkId: NetworkNumber) =>
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_USDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
-export declare const LLAMALEND_PUFETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LlamaLendMarkets: (networkId: NetworkNumber) => Record<LlamaLendVersionsType, LlamaLendMarketData>;
 export declare const getLlamaLendMarketData: (market: LlamaLendVersionsType, network?: NetworkNumber) => LlamaLendMarketData;
 export declare const getLlamaLendMarketFromControllerAddress: (controllerAddress: string, network: NetworkNumber) => LlamaLendMarketData;

package/cjs/markets/llamaLend/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLlamaLendMarketFromControllerAddress = exports.getLlamaLendMarketData = exports.LlamaLendMarkets = exports.LLAMALEND_PUFETH_CRVUSD_MARKET = exports.LLAMALEND_USDE_CRVUSD_MARKET = exports.LLAMALEND_WBTC_CRVUSD_MARKET_2 = exports.LLAMALEND_WBTC_CRVUSD_MARKET = exports.LLAMALEND_FXN_CRVUSD_MARKET = exports.LLAMALEND_ARB_CRVUSD_MARKET_2 = exports.LLAMALEND_ARB_CRVUSD_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET_2 = exports.LLAMALEND_CRVUSD_WETH_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_TBTC_MARKET = exports.LLAMALEND_TBTC_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_CRV_MARKET = exports.LLAMALEND_CRV_CRVUSD_MARKET = exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2 = exports.LLAMALEND_SUSDE_CRVUSD_MARKET = exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2 = exports.LLAMALEND_WSTETH_CRVUSD_MARKET = void 0;
+exports.getLlamaLendMarketFromControllerAddress = exports.getLlamaLendMarketData = exports.LlamaLendMarkets = exports.LLAMALEND_USDE_CRVUSD_MARKET = exports.LLAMALEND_WBTC_CRVUSD_MARKET_2 = exports.LLAMALEND_WBTC_CRVUSD_MARKET = exports.LLAMALEND_FXN_CRVUSD_MARKET = exports.LLAMALEND_ARB_CRVUSD_MARKET_2 = exports.LLAMALEND_ARB_CRVUSD_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET_2 = exports.LLAMALEND_CRVUSD_WETH_MARKET = exports.LLAMALEND_WETH_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_TBTC_MARKET = exports.LLAMALEND_TBTC_CRVUSD_MARKET = exports.LLAMALEND_CRVUSD_CRV_MARKET = exports.LLAMALEND_CRV_CRVUSD_MARKET = exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2 = exports.LLAMALEND_SUSDE_CRVUSD_MARKET = exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2 = exports.LLAMALEND_WSTETH_CRVUSD_MARKET = void 0;
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
 const contractAddresses_1 = require("./contractAddresses");
@@ -38,8 +38,17 @@ const LLAMALEND_WBTC_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds:
 exports.LLAMALEND_WBTC_CRVUSD_MARKET_2 = LLAMALEND_WBTC_CRVUSD_MARKET_2;
 const LLAMALEND_USDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - USDe/crvUSD', shortLabel: 'USDe/crvUSD', value: types_1.LlamaLendVersions.LLUsdeCrvusd, collAsset: 'USDe', baseAsset: 'crvUSD', url: 'usdecrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLUsdeCrvusd)));
 exports.LLAMALEND_USDE_CRVUSD_MARKET = LLAMALEND_USDE_CRVUSD_MARKET;
-const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [common_1.NetworkNumber.Eth], label: 'LlamaLend - pufETH/crvUSD', shortLabel: 'pufETH/crvUSD', value: types_1.LlamaLendVersions.LLPufethCrvusd, collAsset: 'pufETH', baseAsset: 'crvUSD', url: 'pufethcrvusd' }, (0, contractAddresses_1.getLLamaLendAddresses)(networkId, types_1.LlamaLendVersions.LLPufethCrvusd)));
-exports.LLAMALEND_PUFETH_CRVUSD_MARKET = LLAMALEND_PUFETH_CRVUSD_MARKET;
+// temp disabled
+// export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+//   chainIds: [NetworkNumber.Eth],
+//   label: 'LlamaLend - pufETH/crvUSD',
+//   shortLabel: 'pufETH/crvUSD',
+//   value: LlamaLendVersions.LLPufethCrvusd,
+//   collAsset: 'pufETH',
+//   baseAsset: 'crvUSD',
+//   url: 'pufethcrvusd',
+//   ...getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd),
+// });
 const LlamaLendMarkets = (networkId) => ({
     [types_1.LlamaLendVersions.LLWstethCrvusd]: (0, exports.LLAMALEND_WSTETH_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLWstethCrvusd2]: (0, exports.LLAMALEND_WSTETH_CRVUSD_MARKET_2)(networkId),
@@ -58,7 +67,7 @@ const LlamaLendMarkets = (networkId) => ({
     [types_1.LlamaLendVersions.LLSusdeCrvusd]: (0, exports.LLAMALEND_SUSDE_CRVUSD_MARKET)(networkId),
     [types_1.LlamaLendVersions.LLSusdeCrvusd2]: (0, exports.LLAMALEND_SUSDE_CRVUSD_MARKET_2)(networkId),
     [types_1.LlamaLendVersions.LLUsdeCrvusd]: (0, exports.LLAMALEND_USDE_CRVUSD_MARKET)(networkId),
-    [types_1.LlamaLendVersions.LLPufethCrvusd]: (0, exports.LLAMALEND_PUFETH_CRVUSD_MARKET)(networkId),
+    // [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId), // temp disabled
 });
 exports.LlamaLendMarkets = LlamaLendMarkets;
 const getLlamaLendMarketData = (market, network = 1) => (0, exports.LlamaLendMarkets)(network)[market];

package/cjs/staking/staking.js

@@ -91,7 +91,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return data.apy;
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -112,6 +112,10 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
             return getApyFromDfsApi('osETH');
         if (asset === 'ETHx')
             return getApyFromDfsApi('ETHx');
+        if (asset === 'rsETH')
+            return getApyFromDfsApi('rsETH');
+        if (asset === 'pufETH')
+            return getApyFromDfsApi('pufETH');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/cjs/types/llamaLend.d.ts

@@ -6,7 +6,6 @@ export declare enum LLVersionsEth {
     LLSusdeCrvusd = "llamaLendsUSDecrvUSD",
     LLSusdeCrvusd2 = "llamaLendsUSDecrvUSD2",
     LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
-    LLPufethCrvusd = "llamaLendPufETHcrvUSD",
     LLUsdeCrvusd = "llamaLendUSDecrvUSD",
     LLWethCrvusd2 = "llamaLendWETHcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
@@ -24,7 +23,7 @@ export declare enum LLVersionsArb {
     LLWbtcCrvusd2 = "llamaLendWBTCcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
     LLWethCrvusd = "llamaLendWETHcrvUSD",
-    LLWeth2Crvusd = "llamaLendWETHcrvUSD2"
+    LLWethCrvusd2 = "llamaLendWETHcrvUSD2"
 }
 export declare const LlamaLendVersions: {
     readonly LLArbCrvusd: LLVersionsArb.LLArbCrvusd;
@@ -34,14 +33,12 @@ export declare const LlamaLendVersions: {
     readonly LLWbtcCrvusd2: LLVersionsArb.LLWbtcCrvusd2;
     readonly LLCrvCrvusd: LLVersionsArb.LLCrvCrvusd;
     readonly LLWethCrvusd: LLVersionsArb.LLWethCrvusd;
-    readonly LLWeth2Crvusd: LLVersionsArb.LLWeth2Crvusd;
+    readonly LLWethCrvusd2: LLVersionsArb.LLWethCrvusd2;
     readonly LLWstethCrvusd: LLVersionsEth.LLWstethCrvusd;
     readonly LLWstethCrvusd2: LLVersionsEth.LLWstethCrvusd2;
     readonly LLSusdeCrvusd: LLVersionsEth.LLSusdeCrvusd;
     readonly LLSusdeCrvusd2: LLVersionsEth.LLSusdeCrvusd2;
-    readonly LLPufethCrvusd: LLVersionsEth.LLPufethCrvusd;
     readonly LLUsdeCrvusd: LLVersionsEth.LLUsdeCrvusd;
-    readonly LLWethCrvusd2: LLVersionsEth.LLWethCrvusd2;
     readonly LLCrvusdCrv: LLVersionsEth.LLCrvusdCrv;
     readonly LLTbtcCrvusd: LLVersionsEth.LLTbtcCrvusd;
     readonly LLCrvusdTbtc: LLVersionsEth.LLCrvusdTbtc;
@@ -116,6 +113,9 @@ export interface LlamaLendAggregatedPositionData {
     leveragedType: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
 }
 export interface LlamaLendUsedAsset {
     isSupplied: boolean;

package/cjs/types/llamaLend.js

@@ -9,7 +9,7 @@ var LLVersionsEth;
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
     LLVersionsEth["LLSusdeCrvusd2"] = "llamaLendsUSDecrvUSD2";
     LLVersionsEth["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
-    LLVersionsEth["LLPufethCrvusd"] = "llamaLendPufETHcrvUSD";
+    // LLPufethCrvusd = 'llamaLendPufETHcrvUSD', // temp disabled
     LLVersionsEth["LLUsdeCrvusd"] = "llamaLendUSDecrvUSD";
     LLVersionsEth["LLWethCrvusd2"] = "llamaLendWETHcrvUSD2";
     // long and short crv
@@ -32,7 +32,7 @@ var LLVersionsArb;
     LLVersionsArb["LLWbtcCrvusd2"] = "llamaLendWBTCcrvUSD2";
     LLVersionsArb["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
     LLVersionsArb["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
-    LLVersionsArb["LLWeth2Crvusd"] = "llamaLendWETHcrvUSD2";
+    LLVersionsArb["LLWethCrvusd2"] = "llamaLendWETHcrvUSD2";
 })(LLVersionsArb || (exports.LLVersionsArb = LLVersionsArb = {}));
 exports.LlamaLendVersions = Object.assign(Object.assign({}, LLVersionsEth), LLVersionsArb);
 var LlamaLendStatus;

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

@@ -1,9 +1,10 @@
-import { LlamaLendAggregatedPositionData, LlamaLendMarketData, LlamaLendUsedAssets } from '../../types';
+import { LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const getLlamaLendAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest }: {
+export declare const getLlamaLendAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest }: {
     loanExists: boolean;
     usedAssets: LlamaLendUsedAssets;
     network: NetworkNumber;
     selectedMarket: LlamaLendMarketData;
     numOfBands: number | string;
+    assetsData: LlamaLendAssetsData;
 }) => LlamaLendAggregatedPositionData;

package/esm/helpers/llamaLendHelpers/index.js

@@ -12,9 +12,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { mapRange } from '../../services/utils';
+import { calculateNetApy } from '../../staking';
 export const getLlamaLendAggregatedData = (_a) => {
     var _b;
-    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
+    var { loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands", "assetsData"]);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
     const payload = {};
@@ -23,6 +24,10 @@ export const getLlamaLendAggregatedData = (_a) => {
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ collateral }) => collateral, ({ suppliedUsd }) => suppliedUsd);
     payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedForYield }) => suppliedForYield || '0');
+    const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
+    payload.netApy = netApy;
+    payload.incentiveUsd = incentiveUsd;
+    payload.totalInterestUsd = totalInterestUsd;
     payload.ratio = loanExists
         ? new Dec(payload.suppliedUsd)
             .dividedBy(payload.borrowedUsd)

package/esm/llamaLend/index.d.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { LlamaLendGlobalMarketData, LlamaLendMarketData, LlamaLendUserData } from '../types';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
-export declare const getLlamaLendGlobalData: (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
+export declare const getLlamaLendGlobalData: (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3) => Promise<LlamaLendGlobalMarketData>;
 export declare const getLlamaLendAccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 export declare const getLlamaLendUserData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;
-export declare const getLlamaLendFullPositionData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendUserData>;
+export declare const getLlamaLendFullPositionData: (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3) => Promise<LlamaLendUserData>;

package/esm/llamaLend/index.js

@@ -15,6 +15,7 @@ import { LlamaLendViewContract } from '../contracts';
 import { getLlamaLendAggregatedData } from '../helpers/llamaLendHelpers';
 import { getEthAmountForDecimals, wethToEth } from '../services/utils';
 import { getLlamaLendMarketFromControllerAddress } from '../markets/llamaLend';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = LlamaLendViewContract(web3, network);
     const minBand = parseInt(_minBand, 10);
@@ -51,7 +52,7 @@ const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) =>
         highPrice: assetAmountInEth(band.highPrice),
     }));
 });
-export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+export const getLlamaLendGlobalData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = LlamaLendViewContract(web3, network);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
@@ -98,6 +99,10 @@ export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __await
         canBeSupplied: true,
         canBeBorrowed: false,
     };
+    if (STAKING_ASSETS.includes(collAsset)) {
+        assetsData[collAsset].incentiveSupplyApy = yield getStakingApy(collAsset, defaultWeb3);
+        assetsData[collAsset].incentiveSupplyToken = collAsset;
+    }
     return {
         A: data.A,
         loanDiscount: data.loanDiscount,
@@ -216,11 +221,11 @@ export const getLlamaLendUserData = (web3, network, address, selectedMarket, mar
         priceHigh,
         priceLow, liquidationDiscount: assetAmountInEth(data.liquidationDiscount), numOfBands: data.N, usedAssets,
         status }), getLlamaLendAggregatedData({
-        loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
+        loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N, assetsData,
     })), { userBands });
 });
-export const getLlamaLendFullPositionData = (web3, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield getLlamaLendGlobalData(web3, network, selectedMarket);
+export const getLlamaLendFullPositionData = (web3, network, address, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const marketData = yield getLlamaLendGlobalData(web3, network, selectedMarket, defaultWeb3);
     const positionData = yield getLlamaLendUserData(web3, network, address, selectedMarket, marketData);
     return positionData;
 });

package/esm/markets/llamaLend/contractAddresses.js

@@ -7,9 +7,9 @@ const ethAddresses = {
         vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
     },
     [LlamaLendVersions.LLWstethCrvusd2]: {
-        controllerId: 11,
-        controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
-        vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+        controllerId: 13,
+        controllerAddress: '0x5756A035F276a8095A922931F224F4ed06149608',
+        vaultAddress: '0x21CF1c5Dc48C603b89907FE6a7AE83EA5e3709aF',
     },
     [LlamaLendVersions.LLSusdeCrvusd]: {
         controllerId: 7,
@@ -61,11 +61,12 @@ const ethAddresses = {
         controllerAddress: '0xcaD85b7fe52B1939DCEebEe9bCf0b2a5Aa0cE617',
         vaultAddress: '0xccd37EB6374Ae5b1f0b85ac97eFf14770e0D0063',
     },
-    [LlamaLendVersions.LLPufethCrvusd]: {
-        controllerId: 10,
-        controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
-        vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
-    },
+    // temp disabled
+    // [LlamaLendVersions.LLPufethCrvusd]: {
+    //   controllerId: 10,
+    //   controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
+    //   vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
+    // },
     [LlamaLendVersions.LLUsdeCrvusd]: {
         controllerId: 14,
         controllerAddress: '0x74f88Baa966407b50c10B393bBD789639EFfE78B',

package/esm/markets/llamaLend/index.d.ts

@@ -17,7 +17,6 @@ export declare const LLAMALEND_FXN_CRVUSD_MARKET: (networkId: NetworkNumber) =>
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_WBTC_CRVUSD_MARKET_2: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_USDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
-export declare const LLAMALEND_PUFETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LlamaLendMarkets: (networkId: NetworkNumber) => Record<LlamaLendVersionsType, LlamaLendMarketData>;
 export declare const getLlamaLendMarketData: (market: LlamaLendVersionsType, network?: NetworkNumber) => LlamaLendMarketData;
 export declare const getLlamaLendMarketFromControllerAddress: (controllerAddress: string, network: NetworkNumber) => LlamaLendMarketData;

package/esm/markets/llamaLend/index.js

@@ -18,7 +18,17 @@ export const LLAMALEND_FXN_CRVUSD_MARKET = (networkId) => (Object.assign({ chain
 export const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd)));
 export const LLAMALEND_WBTC_CRVUSD_MARKET_2 = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD #2', shortLabel: 'WBTC/crvUSD #2', value: LlamaLendVersions.LLWbtcCrvusd2, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd2' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd2)));
 export const LLAMALEND_USDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - USDe/crvUSD', shortLabel: 'USDe/crvUSD', value: LlamaLendVersions.LLUsdeCrvusd, collAsset: 'USDe', baseAsset: 'crvUSD', url: 'usdecrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLUsdeCrvusd)));
-export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - pufETH/crvUSD', shortLabel: 'pufETH/crvUSD', value: LlamaLendVersions.LLPufethCrvusd, collAsset: 'pufETH', baseAsset: 'crvUSD', url: 'pufethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd)));
+// temp disabled
+// export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+//   chainIds: [NetworkNumber.Eth],
+//   label: 'LlamaLend - pufETH/crvUSD',
+//   shortLabel: 'pufETH/crvUSD',
+//   value: LlamaLendVersions.LLPufethCrvusd,
+//   collAsset: 'pufETH',
+//   baseAsset: 'crvUSD',
+//   url: 'pufethcrvusd',
+//   ...getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd),
+// });
 export const LlamaLendMarkets = (networkId) => ({
     [LlamaLendVersions.LLWstethCrvusd]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLWstethCrvusd2]: LLAMALEND_WSTETH_CRVUSD_MARKET_2(networkId),
@@ -37,7 +47,7 @@ export const LlamaLendMarkets = (networkId) => ({
     [LlamaLendVersions.LLSusdeCrvusd]: LLAMALEND_SUSDE_CRVUSD_MARKET(networkId),
     [LlamaLendVersions.LLSusdeCrvusd2]: LLAMALEND_SUSDE_CRVUSD_MARKET_2(networkId),
     [LlamaLendVersions.LLUsdeCrvusd]: LLAMALEND_USDE_CRVUSD_MARKET(networkId),
-    [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId),
+    // [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId), // temp disabled
 });
 export const getLlamaLendMarketData = (market, network = 1) => LlamaLendMarkets(network)[market];
 export const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {

package/esm/staking/staking.js

@@ -81,7 +81,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return data.apy;
 });
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -102,6 +102,10 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
             return getApyFromDfsApi('osETH');
         if (asset === 'ETHx')
             return getApyFromDfsApi('ETHx');
+        if (asset === 'rsETH')
+            return getApyFromDfsApi('rsETH');
+        if (asset === 'pufETH')
+            return getApyFromDfsApi('pufETH');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/llamaLend.d.ts

@@ -6,7 +6,6 @@ export declare enum LLVersionsEth {
     LLSusdeCrvusd = "llamaLendsUSDecrvUSD",
     LLSusdeCrvusd2 = "llamaLendsUSDecrvUSD2",
     LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
-    LLPufethCrvusd = "llamaLendPufETHcrvUSD",
     LLUsdeCrvusd = "llamaLendUSDecrvUSD",
     LLWethCrvusd2 = "llamaLendWETHcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
@@ -24,7 +23,7 @@ export declare enum LLVersionsArb {
     LLWbtcCrvusd2 = "llamaLendWBTCcrvUSD2",
     LLCrvCrvusd = "llamaLendCRVcrvUSD",
     LLWethCrvusd = "llamaLendWETHcrvUSD",
-    LLWeth2Crvusd = "llamaLendWETHcrvUSD2"
+    LLWethCrvusd2 = "llamaLendWETHcrvUSD2"
 }
 export declare const LlamaLendVersions: {
     readonly LLArbCrvusd: LLVersionsArb.LLArbCrvusd;
@@ -34,14 +33,12 @@ export declare const LlamaLendVersions: {
     readonly LLWbtcCrvusd2: LLVersionsArb.LLWbtcCrvusd2;
     readonly LLCrvCrvusd: LLVersionsArb.LLCrvCrvusd;
     readonly LLWethCrvusd: LLVersionsArb.LLWethCrvusd;
-    readonly LLWeth2Crvusd: LLVersionsArb.LLWeth2Crvusd;
+    readonly LLWethCrvusd2: LLVersionsArb.LLWethCrvusd2;
     readonly LLWstethCrvusd: LLVersionsEth.LLWstethCrvusd;
     readonly LLWstethCrvusd2: LLVersionsEth.LLWstethCrvusd2;
     readonly LLSusdeCrvusd: LLVersionsEth.LLSusdeCrvusd;
     readonly LLSusdeCrvusd2: LLVersionsEth.LLSusdeCrvusd2;
-    readonly LLPufethCrvusd: LLVersionsEth.LLPufethCrvusd;
     readonly LLUsdeCrvusd: LLVersionsEth.LLUsdeCrvusd;
-    readonly LLWethCrvusd2: LLVersionsEth.LLWethCrvusd2;
     readonly LLCrvusdCrv: LLVersionsEth.LLCrvusdCrv;
     readonly LLTbtcCrvusd: LLVersionsEth.LLTbtcCrvusd;
     readonly LLCrvusdTbtc: LLVersionsEth.LLCrvusdTbtc;
@@ -116,6 +113,9 @@ export interface LlamaLendAggregatedPositionData {
     leveragedType: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
+    netApy: string;
+    incentiveUsd: string;
+    totalInterestUsd: string;
 }
 export interface LlamaLendUsedAsset {
     isSupplied: boolean;

package/esm/types/llamaLend.js

@@ -6,7 +6,7 @@ export var LLVersionsEth;
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
     LLVersionsEth["LLSusdeCrvusd2"] = "llamaLendsUSDecrvUSD2";
     LLVersionsEth["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
-    LLVersionsEth["LLPufethCrvusd"] = "llamaLendPufETHcrvUSD";
+    // LLPufethCrvusd = 'llamaLendPufETHcrvUSD', // temp disabled
     LLVersionsEth["LLUsdeCrvusd"] = "llamaLendUSDecrvUSD";
     LLVersionsEth["LLWethCrvusd2"] = "llamaLendWETHcrvUSD2";
     // long and short crv
@@ -29,7 +29,7 @@ export var LLVersionsArb;
     LLVersionsArb["LLWbtcCrvusd2"] = "llamaLendWBTCcrvUSD2";
     LLVersionsArb["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
     LLVersionsArb["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
-    LLVersionsArb["LLWeth2Crvusd"] = "llamaLendWETHcrvUSD2";
+    LLVersionsArb["LLWethCrvusd2"] = "llamaLendWETHcrvUSD2";
 })(LLVersionsArb || (LLVersionsArb = {}));
 export const LlamaLendVersions = Object.assign(Object.assign({}, LLVersionsEth), LLVersionsArb);
 export var LlamaLendStatus;

package/package.json

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

package/src/helpers/llamaLendHelpers/index.ts

@@ -1,13 +1,16 @@
 import Dec from 'decimal.js';
-import { LlamaLendAggregatedPositionData, LlamaLendMarketData, LlamaLendUsedAssets } from '../../types';
+import {
+  LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets,
+} from '../../types';
 import { MMUsedAssets, NetworkNumber } from '../../types/common';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { mapRange } from '../../services/utils';
+import { calculateNetApy } from '../../staking';
 
 export const getLlamaLendAggregatedData = ({
-  loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest
+  loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest
 }:{
-  loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string
+  loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string, assetsData: LlamaLendAssetsData,
 }): LlamaLendAggregatedPositionData => {
   const collAsset = selectedMarket.collAsset;
   const debtAsset = selectedMarket.baseAsset;
@@ -19,6 +22,11 @@ export const getLlamaLendAggregatedData = ({
   payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
   payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedForYield }: { suppliedForYield?: string }) => suppliedForYield || '0');
 
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData as any);
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
   payload.ratio = loanExists
     ? new Dec(payload.suppliedUsd)
       .dividedBy(payload.borrowedUsd)

package/src/llamaLend/index.ts

@@ -13,6 +13,7 @@ import { getLlamaLendAggregatedData } from '../helpers/llamaLendHelpers';
 import { getAbiItem, getEthAmountForDecimals, wethToEth } from '../services/utils';
 import { USD_QUOTE } from '../constants';
 import { getLlamaLendMarketFromControllerAddress } from '../markets/llamaLend';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 
 const getAndFormatBands = async (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData, _minBand: string, _maxBand: string) => {
   const contract = LlamaLendViewContract(web3, network);
@@ -52,7 +53,7 @@ const getAndFormatBands = async (web3: Web3, network: NetworkNumber, selectedMar
   }));
 };
 
-export const getLlamaLendGlobalData = async (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData): Promise<LlamaLendGlobalMarketData> => {
+export const getLlamaLendGlobalData = async (web3: Web3, network: NetworkNumber, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3): Promise<LlamaLendGlobalMarketData> => {
   const contract = LlamaLendViewContract(web3, network);
 
   const collAsset = selectedMarket.collAsset;
@@ -109,6 +110,12 @@ export const getLlamaLendGlobalData = async (web3: Web3, network: NetworkNumber,
     canBeSupplied: true,
     canBeBorrowed: false,
   };
+
+  if (STAKING_ASSETS.includes(collAsset)) {
+    assetsData[collAsset].incentiveSupplyApy = await getStakingApy(collAsset, defaultWeb3);
+    assetsData[collAsset].incentiveSupplyToken = collAsset;
+  }
+
   return {
     A: data.A,
     loanDiscount: data.loanDiscount,
@@ -255,14 +262,14 @@ export const getLlamaLendUserData = async (web3: Web3, network: NetworkNumber, a
     usedAssets,
     status,
     ...getLlamaLendAggregatedData({
-      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
+      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N, assetsData,
     }),
     userBands,
   };
 };
 
-export const getLlamaLendFullPositionData = async (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData): Promise<LlamaLendUserData> => {
-  const marketData = await getLlamaLendGlobalData(web3, network, selectedMarket);
+export const getLlamaLendFullPositionData = async (web3: Web3, network: NetworkNumber, address: string, selectedMarket: LlamaLendMarketData, defaultWeb3: Web3): Promise<LlamaLendUserData> => {
+  const marketData = await getLlamaLendGlobalData(web3, network, selectedMarket, defaultWeb3);
   const positionData = await getLlamaLendUserData(web3, network, address, selectedMarket, marketData);
   return positionData;
 };

package/src/markets/llamaLend/contractAddresses.ts

@@ -16,9 +16,9 @@ const ethAddresses: Record<LLVersionsEth, LLAddresses> = {
     vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
   },
   [LlamaLendVersions.LLWstethCrvusd2]: {
-    controllerId: 11,
-    controllerAddress: '0xB536FEa3a01c95Dd09932440eC802A75410139D6',
-    vaultAddress: '0x4a7999c55d3a93dAf72EA112985e57c2E3b9e95D',
+    controllerId: 13,
+    controllerAddress: '0x5756A035F276a8095A922931F224F4ed06149608',
+    vaultAddress: '0x21CF1c5Dc48C603b89907FE6a7AE83EA5e3709aF',
   },
   [LlamaLendVersions.LLSusdeCrvusd]: {
     controllerId: 7,
@@ -70,11 +70,12 @@ const ethAddresses: Record<LLVersionsEth, LLAddresses> = {
     controllerAddress: '0xcaD85b7fe52B1939DCEebEe9bCf0b2a5Aa0cE617',
     vaultAddress: '0xccd37EB6374Ae5b1f0b85ac97eFf14770e0D0063',
   },
-  [LlamaLendVersions.LLPufethCrvusd]: {
-    controllerId: 10,
-    controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
-    vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
-  },
+  // temp disabled
+  // [LlamaLendVersions.LLPufethCrvusd]: {
+  //   controllerId: 10,
+  //   controllerAddress: '0x4f87158350c296955966059C50263F711cE0817C',
+  //   vaultAddress: '0xff467c6E827ebbEa64DA1ab0425021E6c89Fbe0d',
+  // },
   [LlamaLendVersions.LLUsdeCrvusd]: {
     controllerId: 14,
     controllerAddress: '0x74f88Baa966407b50c10B393bBD789639EFfE78B',

package/src/markets/llamaLend/index.ts

@@ -190,16 +190,17 @@ export const LLAMALEND_USDE_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLen
   ...getLLamaLendAddresses(networkId, LlamaLendVersions.LLUsdeCrvusd),
 });
 
-export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'LlamaLend - pufETH/crvUSD',
-  shortLabel: 'pufETH/crvUSD',
-  value: LlamaLendVersions.LLPufethCrvusd,
-  collAsset: 'pufETH',
-  baseAsset: 'crvUSD',
-  url: 'pufethcrvusd',
-  ...getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd),
-});
+// temp disabled
+// export const LLAMALEND_PUFETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+//   chainIds: [NetworkNumber.Eth],
+//   label: 'LlamaLend - pufETH/crvUSD',
+//   shortLabel: 'pufETH/crvUSD',
+//   value: LlamaLendVersions.LLPufethCrvusd,
+//   collAsset: 'pufETH',
+//   baseAsset: 'crvUSD',
+//   url: 'pufethcrvusd',
+//   ...getLLamaLendAddresses(networkId, LlamaLendVersions.LLPufethCrvusd),
+// });
 
 export const LlamaLendMarkets = (networkId: NetworkNumber):Record<LlamaLendVersionsType, LlamaLendMarketData> => ({
   [LlamaLendVersions.LLWstethCrvusd]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
@@ -219,7 +220,7 @@ export const LlamaLendMarkets = (networkId: NetworkNumber):Record<LlamaLendVersi
   [LlamaLendVersions.LLSusdeCrvusd]: LLAMALEND_SUSDE_CRVUSD_MARKET(networkId),
   [LlamaLendVersions.LLSusdeCrvusd2]: LLAMALEND_SUSDE_CRVUSD_MARKET_2(networkId),
   [LlamaLendVersions.LLUsdeCrvusd]: LLAMALEND_USDE_CRVUSD_MARKET(networkId),
-  [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId),
+  // [LlamaLendVersions.LLPufethCrvusd]: LLAMALEND_PUFETH_CRVUSD_MARKET(networkId), // temp disabled
 }) as const;
 
 

package/src/staking/staking.ts

@@ -83,7 +83,7 @@ const getApyFromDfsApi = async (asset: string) => {
   return data.apy;
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH'];
 
 export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   try {
@@ -96,6 +96,8 @@ export const getStakingApy = (asset: string, web3: Web3, blockNumber: 'latest' |
     if (asset === 'ezETH') return getApyFromDfsApi('ezETH');
     if (asset === 'osETH') return getApyFromDfsApi('osETH');
     if (asset === 'ETHx') return getApyFromDfsApi('ETHx');
+    if (asset === 'rsETH') return getApyFromDfsApi('rsETH');
+    if (asset === 'pufETH') return getApyFromDfsApi('pufETH');
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
     return '0';

package/src/types/llamaLend.ts

@@ -8,7 +8,7 @@ export enum LLVersionsEth {
   LLSusdeCrvusd = 'llamaLendsUSDecrvUSD',
   LLSusdeCrvusd2 = 'llamaLendsUSDecrvUSD2',
   LLWbtcCrvusd = 'llamaLendWBTCcrvUSD',
-  LLPufethCrvusd = 'llamaLendPufETHcrvUSD',
+  // LLPufethCrvusd = 'llamaLendPufETHcrvUSD', // temp disabled
   LLUsdeCrvusd = 'llamaLendUSDecrvUSD',
   LLWethCrvusd2 = 'llamaLendWETHcrvUSD2',
   // long and short crv
@@ -31,7 +31,7 @@ export enum LLVersionsArb {
   LLWbtcCrvusd2 = 'llamaLendWBTCcrvUSD2',
   LLCrvCrvusd = 'llamaLendCRVcrvUSD',
   LLWethCrvusd = 'llamaLendWETHcrvUSD',
-  LLWeth2Crvusd = 'llamaLendWETHcrvUSD2',
+  LLWethCrvusd2 = 'llamaLendWETHcrvUSD2',
 }
 
 export const LlamaLendVersions = {
@@ -111,6 +111,9 @@ export interface LlamaLendAggregatedPositionData {
   leveragedType: string,
   leveragedAsset?: string,
   liquidationPrice?: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
 }
 
 export interface LlamaLendUsedAsset {