@defisaver/positions-sdk 1.0.19 → 1.0.21-dev-1

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,69 +1,69 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/fluid/index.d.ts

@@ -48,7 +48,7 @@ export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, tok
     withdrawRate: string;
 }>;
 export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
-    fTokenAddress: any;
+    fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
     totalDeposited: string;
@@ -59,6 +59,18 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
+export declare const getAllUserEarnPositionsWithFTokens: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
 export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
     marketData: FluidMarketData;
     userData: {

package/cjs/fluid/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserPositions = exports.getFluidDepositData = exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
+exports.getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -960,10 +960,7 @@ const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, vo
     };
 });
 exports.getFluidTokenData = getFluidTokenData;
-const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
-    const view = (0, contracts_1.FluidViewContract)(web3, network);
-    const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
-    const { fTokenData, userPosition } = yield view.methods.getUserEarnPositionWithFToken(fTokenAddress, address).call();
+const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
     const supplyRate = new decimal_js_1.default(fTokenData.supplyRate).div(100).toString();
     const rewardsRate = new decimal_js_1.default(fTokenData.rewardsRate).div(1e12).toString();
     const decimals = fTokenData.decimals;
@@ -981,8 +978,29 @@ const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0,
         deposited: (0, utils_1.getEthAmountForDecimals)(userPosition.underlyingAssets, decimals),
         depositedShares: (0, utils_1.getEthAmountForDecimals)(userPosition.fTokenShares, decimals),
     };
+};
+const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
+    const { fTokenData, userPosition } = yield view.methods.getUserEarnPositionWithFToken(fTokenAddress, address).call();
+    return parseFDepositTokenData(fTokenData, userPosition, fTokenAddress);
 });
 exports.getFluidDepositData = getFluidDepositData;
+const getAllUserEarnPositionsWithFTokens = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const { fTokensData, userPositions } = yield view.methods.getAllUserEarnPositionsWithFTokens(user).call();
+    const parsedRes = fTokensData.reduce((acc, fTokenData, i) => {
+        const userPosition = userPositions[i];
+        const deposited = userPosition === null || userPosition === void 0 ? void 0 : userPosition.underlyingAssets;
+        if (Number(deposited) > 0) {
+            const fTokenAddress = (0, markets_1.getFTokenAddress)(fTokenData.symbol, network);
+            acc.push(parseFDepositTokenData(fTokenData, userPosition, fTokenAddress));
+        }
+        return acc;
+    }, []);
+    return parsedRes;
+});
+exports.getAllUserEarnPositionsWithFTokens = getAllUserEarnPositionsWithFTokens;
 const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const data = yield view.methods.getUserPositions(user).call();

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -117,73 +117,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

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

@@ -18,6 +18,7 @@ export declare const MORPHO_BLUE_TBTC_USDC: (networkId?: NetworkNumber) => Morph
 export declare const MORPHO_BLUE_CBBTC_ETH_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_SYRUPUSDC_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_EZETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_EZETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WEETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -35,6 +36,7 @@ export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => Mo
 export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_RETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USR_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -79,6 +81,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluesusdeusdc_915: MorphoBlueMarketData;
     readonly morphobluelbtcwbtc_945: MorphoBlueMarketData;
     readonly morphoblueusrusdc_915: MorphoBlueMarketData;
+    readonly morphobluesyrupusdcusdc_915: MorphoBlueMarketData;
     readonly morphobluewstetheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -90,6 +93,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdedai_860: MorphoBlueMarketData;
     readonly morphoblueusdedai_915: MorphoBlueMarketData;
     readonly morphoblueusdedai_945: MorphoBlueMarketData;
+    readonly morphoblueptsyrupusdcaugusdc_860: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base_1c21c59d: MorphoBlueMarketData;
     readonly morphobluewstethusdc_860_base: MorphoBlueMarketData;

package/cjs/markets/morphoBlue/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MORPHO_BLUE_LBTC_WBTC_945 = exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE_13c42741 = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_USR_USDC_915 = exports.MORPHO_BLUE_RETH_ETH_945 = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_860 = exports.MORPHO_BLUE_EZETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_860 = exports.MORPHO_BLUE_SUSDE_USDC_915 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
-exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_CBBTC_EURC_860_BASE = exports.MORPHO_BLUE_WSTETH_EURC_860_BASE = exports.MORPHO_BLUE_LBTC_CBBTC_945_BASE = void 0;
+exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE_13c42741 = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = exports.MORPHO_BLUE_USR_USDC_915 = exports.MORPHO_BLUE_RETH_ETH_945 = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_860 = exports.MORPHO_BLUE_EZETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_860 = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915 = exports.MORPHO_BLUE_SUSDE_USDC_915 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
+exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_CBBTC_EURC_860_BASE = exports.MORPHO_BLUE_WSTETH_EURC_860_BASE = exports.MORPHO_BLUE_LBTC_CBBTC_945_BASE = exports.MORPHO_BLUE_LBTC_WBTC_945 = exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = void 0;
 const utils_1 = require("../../services/utils");
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
@@ -293,6 +293,22 @@ const MORPHO_BLUE_SUSDE_USDC_915 = (networkId = common_1.NetworkNumber.Eth) => (
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_SUSDE_USDC_915 = MORPHO_BLUE_SUSDE_USDC_915;
+const MORPHO_BLUE_SYRUPUSDC_USDC_915 = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'syrupUSDC/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915,
+    url: 'syrupusdc-729badf2',
+    loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    collateralToken: '0x80ac24aA929eaF5013f6436cdA2a7ba190f5Cc0b',
+    oracle: '0x80032f4cb6e3573b9ed61e888af658e48fb790cc',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870ac11d48b15db9a138cf899d20f13f79ba00bc',
+    lltv: 0.915,
+    marketId: '729badf297ee9f2f6b3f717b96fd355fc6ec00422284ce1968e76647b258cf44',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_SYRUPUSDC_USDC_915 = MORPHO_BLUE_SYRUPUSDC_USDC_915;
 // ezETH/ETH
 const MORPHO_BLUE_EZETH_ETH_860 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
@@ -570,6 +586,23 @@ const MORPHO_BLUE_USR_USDC_915 = (networkId = common_1.NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_USR_USDC_915 = MORPHO_BLUE_USR_USDC_915;
+// Pendle
+const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'Pt syrupUSDC Aug/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860,
+    url: 'ptsyrupusdcaug-a3819a7d',
+    loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    collateralToken: '0xCcE7D12f683c6dAe700154f0BAdf779C0bA1F89A',
+    oracle: '0x3b74c5fd1005cd98f349d5d9df78ec8b15131fa5',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870ac11d48b15db9a138cf899d20f13f79ba00bc',
+    lltv: 0.860,
+    marketId: 'a3819a7d2aee958ca0e7404137d012b51ea47d051db69d94656956eff8c80c23',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860;
 // ###### BASE ########
 const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
@@ -885,6 +918,7 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueSUSDeUSDC_915]: (0, exports.MORPHO_BLUE_SUSDE_USDC_915)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueLBTCWBTC_945]: (0, exports.MORPHO_BLUE_LBTC_WBTC_945)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueUSRUSDC_915]: (0, exports.MORPHO_BLUE_USR_USDC_915)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915]: (0, exports.MORPHO_BLUE_SYRUPUSDC_USDC_915)(networkId),
     // wstETH/WETH
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE)(networkId),
@@ -899,6 +933,8 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_860]: (0, exports.MORPHO_BLUE_USDE_DAI_860)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_915]: (0, exports.MORPHO_BLUE_USDE_DAI_915)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_945]: (0, exports.MORPHO_BLUE_USDE_DAI_945)(networkId),
+    // Pendle
+    [types_1.MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860]: (0, exports.MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860)(networkId),
     // Base
     [types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: (0, exports.MORPHO_BLUE_CBETH_USDC_860_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base_1c21c59d]: (0, exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d)(networkId),

package/cjs/morphoBlue/index.js

@@ -56,13 +56,15 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
         }
         let morphoSupplyApy = '0';
         let morphoBorrowApy = '0';
-        try {
-            const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
-            morphoSupplyApy = _morphoSupplyApy;
-            morphoBorrowApy = _morphoBorrowApy;
-        }
-        catch (e) {
-            console.error(e);
+        if (!collateralTokenInfo.isPendle) {
+            try {
+                const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+                morphoSupplyApy = _morphoSupplyApy;
+                morphoBorrowApy = _morphoBorrowApy;
+            }
+            catch (e) {
+                console.error(e);
+            }
         }
         const supplyRate = (0, morphoBlueHelpers_1.getSupplyRate)(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = (0, morphoBlueHelpers_1.getBorrowRate)(marketInfo.borrowRate, marketInfo.totalBorrowShares);

package/cjs/types/morphoBlue.d.ts

@@ -21,6 +21,7 @@ export declare enum MorphoBlueVersions {
     MorphoBlueSUSDeUSDC_915 = "morphobluesusdeusdc_915",
     MorphoBlueLBTCWBTC_945 = "morphobluelbtcwbtc_945",
     MorphoBlueUSRUSDC_915 = "morphoblueusrusdc_915",
+    MorphoBlueSyrupUSDCUSDC_915 = "morphobluesyrupusdcusdc_915",
     MorphoBlueEzEthEth_860 = "morphoblueezetheth_860",
     MorphoBlueEzEthEth_945 = "morphoblueezetheth_945",
     MorphoBlueWeEthEth_860 = "morphoblueweetheth_860",
@@ -36,6 +37,7 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_860 = "morphoblueusdedai_860",
     MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
+    MorphoBluePTsyrupUSDCAugUSDC_860 = "morphoblueptsyrupusdcaugusdc_860",
     MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
     MorphoBlueCbEthUSDC_860_Base_1c21c59d = "morphobluecbethusdc_860_base_1c21c59d",
     MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",

package/cjs/types/morphoBlue.js

@@ -25,6 +25,7 @@ var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueSUSDeUSDC_915"] = "morphobluesusdeusdc_915";
     MorphoBlueVersions["MorphoBlueLBTCWBTC_945"] = "morphobluelbtcwbtc_945";
     MorphoBlueVersions["MorphoBlueUSRUSDC_915"] = "morphoblueusrusdc_915";
+    MorphoBlueVersions["MorphoBlueSyrupUSDCUSDC_915"] = "morphobluesyrupusdcusdc_915";
     // ezETH/ETH
     MorphoBlueVersions["MorphoBlueEzEthEth_860"] = "morphoblueezetheth_860";
     MorphoBlueVersions["MorphoBlueEzEthEth_945"] = "morphoblueezetheth_945";
@@ -45,6 +46,8 @@ var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_860"] = "morphoblueusdedai_860";
     MorphoBlueVersions["MorphoBlueUSDeDAI_915"] = "morphoblueusdedai_915";
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
+    // Pendle
+    MorphoBlueVersions["MorphoBluePTsyrupUSDCAugUSDC_860"] = "morphoblueptsyrupusdcaugusdc_860";
     // BASE
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base_1c21c59d"] = "morphobluecbethusdc_860_base_1c21c59d";

package/esm/fluid/index.d.ts

@@ -48,7 +48,7 @@ export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, tok
     withdrawRate: string;
 }>;
 export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
-    fTokenAddress: any;
+    fTokenAddress: string | undefined;
     fTokenSymbol: string;
     decimals: string;
     totalDeposited: string;
@@ -59,6 +59,18 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
+export declare const getAllUserEarnPositionsWithFTokens: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
 export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
     marketData: FluidMarketData;
     userData: {

package/esm/fluid/index.js

@@ -948,10 +948,7 @@ export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, voi
         withdrawRate,
     };
 });
-export const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
-    const view = FluidViewContract(web3, network);
-    const fTokenAddress = getFTokenAddress(token, network);
-    const { fTokenData, userPosition } = yield view.methods.getUserEarnPositionWithFToken(fTokenAddress, address).call();
+const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
     const supplyRate = new Dec(fTokenData.supplyRate).div(100).toString();
     const rewardsRate = new Dec(fTokenData.rewardsRate).div(1e12).toString();
     const decimals = fTokenData.decimals;
@@ -969,6 +966,26 @@ export const getFluidDepositData = (web3, network, token, address) => __awaiter(
         deposited: getEthAmountForDecimals(userPosition.underlyingAssets, decimals),
         depositedShares: getEthAmountForDecimals(userPosition.fTokenShares, decimals),
     };
+};
+export const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const fTokenAddress = getFTokenAddress(token, network);
+    const { fTokenData, userPosition } = yield view.methods.getUserEarnPositionWithFToken(fTokenAddress, address).call();
+    return parseFDepositTokenData(fTokenData, userPosition, fTokenAddress);
+});
+export const getAllUserEarnPositionsWithFTokens = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const { fTokensData, userPositions } = yield view.methods.getAllUserEarnPositionsWithFTokens(user).call();
+    const parsedRes = fTokensData.reduce((acc, fTokenData, i) => {
+        const userPosition = userPositions[i];
+        const deposited = userPosition === null || userPosition === void 0 ? void 0 : userPosition.underlyingAssets;
+        if (Number(deposited) > 0) {
+            const fTokenAddress = getFTokenAddress(fTokenData.symbol, network);
+            acc.push(parseFDepositTokenData(fTokenData, userPosition, fTokenAddress));
+        }
+        return acc;
+    }, []);
+    return parsedRes;
 });
 export const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);