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

package/esm/helpers/morphoBlueHelpers/index.js

@@ -107,73 +107,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     return { borrowRate, supplyRate };
 });
 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/esm/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/esm/markets/morphoBlue/index.js

@@ -271,6 +271,21 @@ export const MORPHO_BLUE_SUSDE_USDC_915 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0x85c7f4374f3a403b36d54cc284983b2b02bbd8581ee0f3c36494447b87d9fcab',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_SYRUPUSDC_USDC_915 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'syrupUSDC/USDC',
+    value: MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915,
+    url: 'syrupusdc-729badf2',
+    loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    collateralToken: '0x80ac24aA929eaF5013f6436cdA2a7ba190f5Cc0b',
+    oracle: '0x80032f4cb6e3573b9ed61e888af658e48fb790cc',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870ac11d48b15db9a138cf899d20f13f79ba00bc',
+    lltv: 0.915,
+    marketId: '729badf297ee9f2f6b3f717b96fd355fc6ec00422284ce1968e76647b258cf44',
+    protocolName: 'morpho-blue',
+});
 // ezETH/ETH
 export const MORPHO_BLUE_EZETH_ETH_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
@@ -531,6 +546,22 @@ export const MORPHO_BLUE_USR_USDC_915 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0x8e7cc042d739a365c43d0a52d5f24160fa7ae9b7e7c9a479bd02a56041d4cf77',
     protocolName: 'morpho-blue',
 });
+// Pendle
+export const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho',
+    shortLabel: 'Pt syrupUSDC Aug/USDC',
+    value: MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860,
+    url: 'ptsyrupusdcaug-a3819a7d',
+    loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    collateralToken: '0xCcE7D12f683c6dAe700154f0BAdf779C0bA1F89A',
+    oracle: '0x3b74c5fd1005cd98f349d5d9df78ec8b15131fa5',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870ac11d48b15db9a138cf899d20f13f79ba00bc',
+    lltv: 0.860,
+    marketId: 'a3819a7d2aee958ca0e7404137d012b51ea47d051db69d94656956eff8c80c23',
+    protocolName: 'morpho-blue',
+});
 // ###### BASE ########
 export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Base],
@@ -828,6 +859,7 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueSUSDeUSDC_915]: MORPHO_BLUE_SUSDE_USDC_915(networkId),
     [MorphoBlueVersions.MorphoBlueLBTCWBTC_945]: MORPHO_BLUE_LBTC_WBTC_945(networkId),
     [MorphoBlueVersions.MorphoBlueUSRUSDC_915]: MORPHO_BLUE_USR_USDC_915(networkId),
+    [MorphoBlueVersions.MorphoBlueSyrupUSDCUSDC_915]: MORPHO_BLUE_SYRUPUSDC_USDC_915(networkId),
     // wstETH/WETH
     [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
@@ -842,6 +874,8 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
+    // Pendle
+    [MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860]: MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860(networkId),
     // Base
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: MORPHO_BLUE_CBETH_USDC_860_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base_1c21c59d]: MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d(networkId),

package/esm/morphoBlue/index.js

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

package/esm/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/esm/types/morphoBlue.js

@@ -22,6 +22,7 @@ export 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";
@@ -42,6 +43,8 @@ export 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/package.json

@@ -1,54 +1,54 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "1.0.19",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.6.7",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@types/lodash": "^4.17.15",
-    "@types/memoizee": "^0.4.12",
-    "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.17"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "nock": "^14.0.0",
-    "ts-node": "^10.9.2",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "1.0.21-dev-1",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.6.11",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "nock": "^14.0.0",
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}