@defisaver/positions-sdk 2.1.118-lend-dev → 2.1.119-dev-13004-dev

package/esm/morphoBlue/index.js

@@ -17,6 +17,7 @@ import { isMainnetNetwork, wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate, } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
@@ -27,12 +28,12 @@ export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
         const morphoBlueViewContract = MorphoBlueViewContractViem(provider, network);
         let marketInfo;
         let loanTokenPrice;
-        const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
+        const isHardcodedUsdStable = ['USDA', 'RLUSD'].includes(loanTokenInfo.symbol);
         const isMainnet = isMainnetNetwork(network);
         if (isMainnet) {
             const feedRegistryContract = FeedRegistryContractViem(provider, NetworkNumber.Eth);
             const [_loanTokenPrice, _marketInfo] = yield Promise.all([
-                isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
+                isHardcodedUsdStable ? Promise.resolve(HARDCODED_USD_STABLE_PRICE) : feedRegistryContract.read.latestAnswer([loanTokenFeedAddress, USD_QUOTE]),
                 morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
             ]);
             marketInfo = _marketInfo;
@@ -42,7 +43,7 @@ export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             // Currently only base network is supported
             const feedRegistryContract = DFSFeedRegistryContractViem(provider, network);
             const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
-                isTokenUSDA ? Promise.resolve([0, '100000000']) // Normalize to match the expected object structure
+                isHardcodedUsdStable ? Promise.resolve([0, HARDCODED_USD_STABLE_PRICE]) // Normalize to match the expected object structure
                     : feedRegistryContract.read.latestRoundData([loanTokenFeedAddress, USD_QUOTE]),
                 morphoBlueViewContract.read.getMarketInfoNotTuple([loanToken, collateralToken, oracle, irm, BigInt(lltvInWei)]),
             ]);

package/esm/types/morphoBlue.d.ts

@@ -50,6 +50,35 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
     MorphoBlueUSDeDAI_777 = "morphoblueusdedai_777",
     MorphoBlueMORPHOUSDC_625 = "morphobluemorphousdc_625",
+    MorphoBluePRIMEPYUSD_860 = "morphoblueprimepyusd_860",// PRIME/PYUSD 0.86
+    MorphoBlueKBTCRLUSD_860 = "morphobluekbtcrlusd_860",// kBTC/RLUSD 0.86
+    MorphoBlueKBTCPYUSD_860 = "morphobluekbtcpyusd_860",// kBTC/PYUSD 0.86
+    MorphoBlueWstEthUSDC_860 = "morphobluewstethusdc_860",// wstETH/USDC 0.86
+    MorphoBlueSyrupUSDCPYUSD_915 = "morphobluesyrupusdcpyusd_915",// syrupUSDC/PYUSD 0.915
+    MorphoBlueWBTCUSDC_860 = "morphobluewbtcusdc_860",// WBTC/USDC 0.86
+    MorphoBlueCbBTCUSDC_860_bc99de6a = "morphobluecbbtcusdc_860_bc99de6a",// cbBTC/USDC 0.86
+    MorphoBlueWeEthRLUSD_860 = "morphoblueweethrlusd_860",// weETH/RLUSD 0.86
+    MorphoBlueWeEthPYUSD_860 = "morphoblueweethpyusd_860",// weETH/PYUSD 0.86
+    MorphoBlueCbBTCUSDT_860 = "morphobluecbbtcusdt_860",// cbBTC/USDT 0.86
+    MorphoBlueLBTCPYUSD_860 = "morphobluelbtcpyusd_860",// LBTC/PYUSD 0.86
+    MorphoBlueSUSDePYUSD_915 = "morphobluesusdepyusd_915",// sUSDe/PYUSD 0.915
+    MorphoBlueWBTCUSDT_860 = "morphobluewbtcusdt_860",// WBTC/USDT 0.86
+    MorphoBlueWstEthUSDT_860 = "morphobluewstethusdt_860",// wstETH/USDT 0.86
+    MorphoBlueSyrupUSDCRLUSD_915 = "morphobluesyrupusdcrlusd_915",// syrupUSDC/RLUSD 0.915
+    MorphoBlueWeEthUSDC_770 = "morphoblueweethusdc_770",// weETH/USDC 0.77
+    MorphoBlueEthUSDC_860_94b823e6 = "morphoblueethusdc_860_94b823e6",// ETH/USDC 0.86
+    MorphoBlueUSD3USDC_915 = "morphoblueusd3usdc_915",// USD3/USDC 0.915
+    MorphoBlueStUSDSUSDC_860 = "morphobluestusdsusdc_860",// stUSDS/USDC 0.86
+    MorphoBlueCbBTCRLUSD_860 = "morphobluecbbtcrlusd_860",// cbBTC/RLUSD 0.86
+    MorphoBlueWBTCEth_915 = "morphobluewbtceth_915",// WBTC/ETH 0.915
+    MorphoBlueCbBTCEth_915_12dbf493 = "morphobluecbbtceth_915_12dbf493",// cbBTC/ETH 0.915
+    MorphoBlueWeEthUSDT_860 = "morphoblueweethusdt_860",// weETH/USDT 0.86
+    MorphoBlueSyrupUSDTUSDT_915 = "morphobluesyrupusdtusdt_915",// syrupUSDT/USDT 0.915
+    MorphoBlueCbBTCPYUSD_860 = "morphobluecbbtcpyusd_860",// cbBTC/PYUSD 0.86
+    MorphoBlueWeEthUSDT_770 = "morphoblueweethusdt_770",// weETH/USDT 0.77
+    MorphoBlueEthUSDT_860 = "morphoblueethusdt_860",// ETH/USDT 0.86
+    MorphoBlueWBTCRLUSD_860 = "morphobluewbtcrlusd_860",// WBTC/RLUSD 0.86
+    MorphoBlueWBTCPYUSD_860 = "morphobluewbtcpyusd_860",// WBTC/PYUSD 0.86
     MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
     MorphoBlueCbEthUSDC_860_Base_1c21c59d = "morphobluecbethusdc_860_base_1c21c59d",
     MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",
@@ -76,11 +105,20 @@ export declare enum MorphoBlueVersions {
     MorphoBlueEzEthUsdc_777_Base = "morphoblueezethusdc_777_base",// ezETH/USDC
     MorphoBlueEzEthEth_777_Base = "morphoblueezetheth_777_base",// ezETH/ETH
     MorphoBlueBsdEthEth_860_Base = "morphobluebsdetheth_860_base",// bsdETH/ETH
+    MorphoBlueUSDeUSDC_915_Base = "morphoblueusdeusdc_915_base",// USDe/USDC 0.915
+    MorphoBlueCbEthUSDC_770_Base = "morphobluecbethusdc_770_base",// cbETH/USDC 0.77
+    MorphoBlueCbXRPUSDC_625_Base = "morphobluecbxrpusdc_625_base",// cbXRP/USDC 0.625
     MorphoBlueSyrupUSDCUSDC_915_Arb = "morphobluesyrupusdcusdc_915_arb",// syrupUSDC/USDC
     MorphoBlueWBTCUSDC_860_Arb = "morphobluewbtcusdc_860_arb",// WBTC/USDC
     MorphoBlueWstEthUSDC_860_Arb = "morphobluewstethusdc_860_arb",// wstETH/USDC
     MorphoBlueEthUSDC_860_Arb = "morphoblueethusdc_860_arb",// ETH/USDC
-    MorphoBluesUSDSUSDC_945_Arb = "morphobluesusdsusdc_945_arb"
+    MorphoBluesUSDSUSDC_945_Arb = "morphobluesusdsusdc_945_arb",// sUSDS/USDC
+    MorphoBlueWeEthUSDC_860_Arb = "morphoblueweethusdc_860_arb",// weETH/USDC 0.86
+    MorphoBluesUSDSUSDT0_945_Arb = "morphobluesusdsusdt0_945_arb",// sUSDS/USDT0 0.945
+    MorphoBlueWeEthUSDT0_860_Arb = "morphoblueweethusdt0_860_arb",// weETH/USDT0 0.86
+    MorphoBlueEthUSDT0_860_Arb = "morphoblueethusdt0_860_arb",// ETH/USDT0 0.86
+    MorphoBlueWstEthUSDT0_860_Arb = "morphobluewstethusdt0_860_arb",// wstETH/USDT0 0.86
+    MorphoBlueWBTCUSDT0_860_Arb = "morphobluewbtcusdt0_860_arb"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",

package/esm/types/morphoBlue.js

@@ -56,6 +56,35 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
     MorphoBlueVersions["MorphoBlueUSDeDAI_777"] = "morphoblueusdedai_777";
     MorphoBlueVersions["MorphoBlueMORPHOUSDC_625"] = "morphobluemorphousdc_625";
+    MorphoBlueVersions["MorphoBluePRIMEPYUSD_860"] = "morphoblueprimepyusd_860";
+    MorphoBlueVersions["MorphoBlueKBTCRLUSD_860"] = "morphobluekbtcrlusd_860";
+    MorphoBlueVersions["MorphoBlueKBTCPYUSD_860"] = "morphobluekbtcpyusd_860";
+    MorphoBlueVersions["MorphoBlueWstEthUSDC_860"] = "morphobluewstethusdc_860";
+    MorphoBlueVersions["MorphoBlueSyrupUSDCPYUSD_915"] = "morphobluesyrupusdcpyusd_915";
+    MorphoBlueVersions["MorphoBlueWBTCUSDC_860"] = "morphobluewbtcusdc_860";
+    MorphoBlueVersions["MorphoBlueCbBTCUSDC_860_bc99de6a"] = "morphobluecbbtcusdc_860_bc99de6a";
+    MorphoBlueVersions["MorphoBlueWeEthRLUSD_860"] = "morphoblueweethrlusd_860";
+    MorphoBlueVersions["MorphoBlueWeEthPYUSD_860"] = "morphoblueweethpyusd_860";
+    MorphoBlueVersions["MorphoBlueCbBTCUSDT_860"] = "morphobluecbbtcusdt_860";
+    MorphoBlueVersions["MorphoBlueLBTCPYUSD_860"] = "morphobluelbtcpyusd_860";
+    MorphoBlueVersions["MorphoBlueSUSDePYUSD_915"] = "morphobluesusdepyusd_915";
+    MorphoBlueVersions["MorphoBlueWBTCUSDT_860"] = "morphobluewbtcusdt_860";
+    MorphoBlueVersions["MorphoBlueWstEthUSDT_860"] = "morphobluewstethusdt_860";
+    MorphoBlueVersions["MorphoBlueSyrupUSDCRLUSD_915"] = "morphobluesyrupusdcrlusd_915";
+    MorphoBlueVersions["MorphoBlueWeEthUSDC_770"] = "morphoblueweethusdc_770";
+    MorphoBlueVersions["MorphoBlueEthUSDC_860_94b823e6"] = "morphoblueethusdc_860_94b823e6";
+    MorphoBlueVersions["MorphoBlueUSD3USDC_915"] = "morphoblueusd3usdc_915";
+    MorphoBlueVersions["MorphoBlueStUSDSUSDC_860"] = "morphobluestusdsusdc_860";
+    MorphoBlueVersions["MorphoBlueCbBTCRLUSD_860"] = "morphobluecbbtcrlusd_860";
+    MorphoBlueVersions["MorphoBlueWBTCEth_915"] = "morphobluewbtceth_915";
+    MorphoBlueVersions["MorphoBlueCbBTCEth_915_12dbf493"] = "morphobluecbbtceth_915_12dbf493";
+    MorphoBlueVersions["MorphoBlueWeEthUSDT_860"] = "morphoblueweethusdt_860";
+    MorphoBlueVersions["MorphoBlueSyrupUSDTUSDT_915"] = "morphobluesyrupusdtusdt_915";
+    MorphoBlueVersions["MorphoBlueCbBTCPYUSD_860"] = "morphobluecbbtcpyusd_860";
+    MorphoBlueVersions["MorphoBlueWeEthUSDT_770"] = "morphoblueweethusdt_770";
+    MorphoBlueVersions["MorphoBlueEthUSDT_860"] = "morphoblueethusdt_860";
+    MorphoBlueVersions["MorphoBlueWBTCRLUSD_860"] = "morphobluewbtcrlusd_860";
+    MorphoBlueVersions["MorphoBlueWBTCPYUSD_860"] = "morphobluewbtcpyusd_860";
     // BASE
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base_1c21c59d"] = "morphobluecbethusdc_860_base_1c21c59d";
@@ -83,12 +112,21 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueEzEthUsdc_777_Base"] = "morphoblueezethusdc_777_base";
     MorphoBlueVersions["MorphoBlueEzEthEth_777_Base"] = "morphoblueezetheth_777_base";
     MorphoBlueVersions["MorphoBlueBsdEthEth_860_Base"] = "morphobluebsdetheth_860_base";
+    MorphoBlueVersions["MorphoBlueUSDeUSDC_915_Base"] = "morphoblueusdeusdc_915_base";
+    MorphoBlueVersions["MorphoBlueCbEthUSDC_770_Base"] = "morphobluecbethusdc_770_base";
+    MorphoBlueVersions["MorphoBlueCbXRPUSDC_625_Base"] = "morphobluecbxrpusdc_625_base";
     // ARBITRUM
     MorphoBlueVersions["MorphoBlueSyrupUSDCUSDC_915_Arb"] = "morphobluesyrupusdcusdc_915_arb";
     MorphoBlueVersions["MorphoBlueWBTCUSDC_860_Arb"] = "morphobluewbtcusdc_860_arb";
     MorphoBlueVersions["MorphoBlueWstEthUSDC_860_Arb"] = "morphobluewstethusdc_860_arb";
     MorphoBlueVersions["MorphoBlueEthUSDC_860_Arb"] = "morphoblueethusdc_860_arb";
     MorphoBlueVersions["MorphoBluesUSDSUSDC_945_Arb"] = "morphobluesusdsusdc_945_arb";
+    MorphoBlueVersions["MorphoBlueWeEthUSDC_860_Arb"] = "morphoblueweethusdc_860_arb";
+    MorphoBlueVersions["MorphoBluesUSDSUSDT0_945_Arb"] = "morphobluesusdsusdt0_945_arb";
+    MorphoBlueVersions["MorphoBlueWeEthUSDT0_860_Arb"] = "morphoblueweethusdt0_860_arb";
+    MorphoBlueVersions["MorphoBlueEthUSDT0_860_Arb"] = "morphoblueethusdt0_860_arb";
+    MorphoBlueVersions["MorphoBlueWstEthUSDT0_860_Arb"] = "morphobluewstethusdt0_860_arb";
+    MorphoBlueVersions["MorphoBlueWBTCUSDT0_860_Arb"] = "morphobluewbtcusdt0_860_arb";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));
 export var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.118-lend-dev",
+  "version": "2.1.119-dev-13004-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.39",
+    "@defisaver/tokens": "1.7.39-dev-13004-dev",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV4/lend.ts

@@ -51,7 +51,7 @@ export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
 
   USDC_PAXOS: '0x4131E0B2E7AFeCEAf3d3b4225aA61a3B2B7535b8',
   USDT_PAXOS: '0x8Dabe53E8cB991c57f0307F6f419E6D469b0deAA',
-  PT_USDG_SEP_PAXOS: '0x27eF1140364948A0E30E248297FfDFE5a4091ec4',
+  PT_USDG_Sep_PAXOS: '0x27eF1140364948A0E30E248297FfDFE5a4091ec4',
 };
 
 export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>> = {
@@ -85,7 +85,7 @@ export const aaveV4GetTokenizedVaultKey = (
   const hubKey = aaveV4GetTokenizedHubKey(hubNameOrKey);
   if (!hubKey) return null;
 
-  const normalizedSymbol = symbol.trim().replace(/-/g, '_');
+  const normalizedSymbol = symbol.trim().replace(/[-\s]+/g, '_');
 
   return `${normalizedSymbol}_${hubKey}`;
 };