@defisaver/positions-sdk 1.0.21-dev-2 → 1.0.21-dev-3

package/cjs/aaveV3/index.js

@@ -198,7 +198,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
-                    incentiveKind: 'staking',
+                    incentiveKind: common_1.IncentiveKind.Staking,
                 });
             }
             if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
@@ -210,7 +210,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.borrowIncentives.push({
                     apy: _market.incentiveBorrowApy,
                     token: _market.incentiveBorrowToken,
-                    incentiveKind: 'reward',
+                    incentiveKind: common_1.IncentiveKind.Reward,
                 });
             }
             if (!rewardForMarket)
@@ -240,7 +240,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.supplyIncentives.push({
                         token: supplyRewardData.rewardTokenSymbol,
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: common_1.IncentiveKind.Reward,
                     });
                 }
             });
@@ -268,7 +268,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.borrowIncentives.push({
                         token: borrowRewardData.rewardTokenSymbol,
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: common_1.IncentiveKind.Reward,
                     });
                 }
             });

package/cjs/index.d.ts

@@ -21,5 +21,6 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
+import * as rewards from './rewards';
 export * from './types';
-export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, };
+export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, rewards, };

package/cjs/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.rewards = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
 const fluid = __importStar(require("./fluid"));
 exports.fluid = fluid;
@@ -72,4 +72,6 @@ const llamaLend = __importStar(require("./llamaLend"));
 exports.llamaLend = llamaLend;
 const eulerV2 = __importStar(require("./eulerV2"));
 exports.eulerV2 = eulerV2;
+const rewards = __importStar(require("./rewards"));
+exports.rewards = rewards;
 __exportStar(require("./types"), exports);

package/cjs/markets/morphoBlue/index.js

@@ -590,7 +590,7 @@ exports.MORPHO_BLUE_USR_USDC_915 = MORPHO_BLUE_USR_USDC_915;
 const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
-    shortLabel: 'Pt syrupUSDC Aug/USDC',
+    shortLabel: 'PT syrupUSDC Aug/USDC',
     value: types_1.MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860,
     url: 'ptsyrupusdcaug-a3819a7d',
     loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',

package/cjs/morphoBlue/index.js

@@ -22,7 +22,9 @@ const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
 const priceService_1 = require("../services/priceService");
+const rewards_1 = require("../rewards");
 function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
@@ -56,15 +58,13 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
         }
         let morphoSupplyApy = '0';
         let morphoBorrowApy = '0';
-        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);
-            }
+        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);
@@ -84,10 +84,20 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            incentiveSupplyApy: morphoSupplyApy,
-            incentiveBorrowApy: morphoBorrowApy,
-            incentiveSupplyToken: 'MORPHO',
-            incentiveBorrowToken: 'MORPHO',
+            supplyIncentives: [
+                {
+                    token: 'MORPHO',
+                    apy: morphoSupplyApy,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                },
+            ],
+            borrowIncentives: [
+                {
+                    token: 'MORPHO',
+                    apy: morphoBorrowApy,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                },
+            ],
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
@@ -97,10 +107,20 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             borrowRate: '0',
             canBeSupplied: true,
             canBeBorrowed: false,
+            supplyIncentives: [],
         };
         if (staking_1.STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
-            assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3);
-            assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+            assetsData[collateralTokenInfo.symbol].supplyIncentives = [
+                ...assetsData[collateralTokenInfo.symbol].supplyIncentives,
+                {
+                    token: collateralTokenInfo.symbol,
+                    apy: yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3),
+                    incentiveKind: common_1.IncentiveKind.Staking,
+                },
+            ];
+        }
+        if (rewards_1.REWARD_ASSETS.includes(collateralTokenInfo.symbol)) {
+            (_a = assetsData[collateralTokenInfo.symbol].supplyIncentives) === null || _a === void 0 ? void 0 : _a.push(yield (0, rewards_1.getReward)(collateralTokenInfo.symbol));
         }
         return {
             id: marketInfo.id,

package/cjs/rewards/index.d.ts

@@ -0,0 +1 @@
+export * from './rewards';

package/cjs/rewards/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./rewards"), exports);

package/cjs/rewards/rewards.d.ts

@@ -0,0 +1,12 @@
+import memoize from 'memoizee';
+import { IncentiveKind } from '../types/common';
+export declare const REWARD_ASSETS: string[];
+export declare const getReward: ((asset: string) => Promise<{
+    token: string;
+    apy: string;
+    incentiveKind: IncentiveKind;
+}>) & memoize.Memoized<(asset: string) => Promise<{
+    token: string;
+    apy: string;
+    incentiveKind: IncentiveKind;
+}>>;

package/cjs/rewards/rewards.js

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getReward = exports.REWARD_ASSETS = void 0;
+const memoizee_1 = __importDefault(require("memoizee"));
+const common_1 = require("../types/common");
+exports.REWARD_ASSETS = [
+    'syrupUSDC',
+];
+const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`https://fe.defisaver.com/api/rewards/apy?asset=${asset}`);
+    if (!res.ok)
+        throw new Error(`Failed to fetch APY for ${asset}`);
+    const data = yield res.json();
+    return String(data.apy);
+});
+exports.getReward = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (asset === 'syrupUSDC') {
+            return {
+                token: '$MAPLE',
+                apy: yield getApyFromDfsApi(asset),
+                incentiveKind: common_1.IncentiveKind.Reward,
+            };
+        }
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+    }
+    return {
+        token: '?',
+        apy: '0',
+        incentiveKind: common_1.IncentiveKind.Reward,
+    };
+}), { promise: true, maxAge: 2 * 60 * 1000 });

package/cjs/staking/staking.js

@@ -113,7 +113,29 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return String(data.apy);
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug'];
+exports.STAKING_ASSETS = [
+    'cbETH',
+    'wstETH',
+    'cbETH',
+    'rETH',
+    'sDAI',
+    'weETH',
+    'sUSDe',
+    'osETH',
+    'ezETH',
+    'ETHx',
+    'rsETH',
+    'pufETH',
+    'wrsETH',
+    'wsuperOETHb',
+    'sUSDS',
+    'PT eUSDe May',
+    'PT sUSDe July',
+    'PT USDe July',
+    'PT eUSDe Aug',
+    'PT syrupUSDC Aug',
+    'syrupUSDC',
+];
 exports.getStakingApy = (0, memoizee_1.default)((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -150,6 +172,10 @@ exports.getStakingApy = (0, memoizee_1.default)((asset, web3, blockNumber = 'lat
             return yield getApyFromDfsApi('PT USDe July');
         if (asset === 'PT eUSDe Aug')
             return yield getApyFromDfsApi('PT eUSDe Aug');
+        if (asset === 'PT syrupUSDC Aug')
+            return yield getApyFromDfsApi('PT syrupUSDC Aug');
+        if (asset === 'syrupUSDC')
+            return yield getApyFromDfsApi('syrupUSDC');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);
@@ -183,7 +209,15 @@ const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
                 : assetData.supplyRate;
             const supplyInterest = (0, exports.calculateInterestEarned)(amount, rate, 'year', true);
             acc.supplyInterest = new decimal_js_1.default(acc.supplyInterest).add(supplyInterest.toString()).toString();
-            if (assetData.incentiveSupplyApy) {
+            if (assetData.supplyIncentives && assetData.supplyIncentives.length > 0) {
+                let totalApy = '0';
+                for (const incentive of assetData.supplyIncentives || []) {
+                    totalApy = new decimal_js_1.default(totalApy).add(incentive.apy).toString();
+                }
+                const incentiveInterest = (0, exports.calculateInterestEarned)(amount, totalApy, 'year', true);
+                acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+            }
+            else if (assetData.incentiveSupplyApy) {
                 // take COMP/AAVE yield into account
                 const incentiveInterest = (0, exports.calculateInterestEarned)(amount, assetData.incentiveSupplyApy, 'year', true);
                 acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
@@ -199,7 +233,15 @@ const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
                     : ((usedAsset === null || usedAsset === void 0 ? void 0 : usedAsset.interestMode) === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
             const borrowInterest = (0, exports.calculateInterestEarned)(amount, rate, 'year', true);
             acc.borrowInterest = new decimal_js_1.default(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-            if (assetData.incentiveBorrowApy) {
+            if (assetData.borrowIncentives && assetData.borrowIncentives.length > 0) {
+                let totalApy = '0';
+                for (const incentive of assetData.borrowIncentives || []) {
+                    totalApy = new decimal_js_1.default(totalApy).add(incentive.apy).toString();
+                }
+                const incentiveInterest = (0, exports.calculateInterestEarned)(amount, totalApy, 'year', true);
+                acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).sub(incentiveInterest).toString();
+            }
+            else if (assetData.incentiveBorrowApy) {
                 // take COMP/AAVE yield into account
                 const incentiveInterest = (0, exports.calculateInterestEarned)(amount, assetData.incentiveBorrowApy, 'year', true);
                 acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).sub(incentiveInterest).toString();

package/cjs/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 import { IUiIncentiveDataProviderV3 } from './contracts/generated/AaveUiIncentiveDataProviderV3';
 export declare enum AaveVersions {
     AaveV1 = "v1",
@@ -73,11 +73,6 @@ export interface AaveV2AssetData extends AaveAssetData {
 }
 export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 }
-export interface IncentiveData {
-    token: string;
-    apy: string;
-    incentiveKind?: 'staking' | 'reward';
-}
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;
     isSiloed: boolean;

package/cjs/types/common.d.ts

@@ -9,6 +9,15 @@ export declare enum NetworkNumber {
     Base = 8453
 }
 export type Networkish = string | NetworkNumber;
+export declare enum IncentiveKind {
+    Staking = "staking",
+    Reward = "reward"
+}
+export interface IncentiveData {
+    token: string;
+    apy: string;
+    incentiveKind?: IncentiveKind;
+}
 export interface MMAssetData {
     symbol: string;
     supplyRate: string;
@@ -29,6 +38,8 @@ export interface MMAssetData {
     incentiveSupplyToken?: string;
     borrowRateP2P?: string;
     supplyRateP2P?: string;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export interface MMAssetsData {
     [token: string]: MMAssetData;

package/cjs/types/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkNumber = void 0;
+exports.IncentiveKind = exports.NetworkNumber = void 0;
 var NetworkNumber;
 (function (NetworkNumber) {
     NetworkNumber[NetworkNumber["Eth"] = 1] = "Eth";
@@ -8,3 +8,8 @@ var NetworkNumber;
     NetworkNumber[NetworkNumber["Arb"] = 42161] = "Arb";
     NetworkNumber[NetworkNumber["Base"] = 8453] = "Base";
 })(NetworkNumber || (exports.NetworkNumber = NetworkNumber = {}));
+var IncentiveKind;
+(function (IncentiveKind) {
+    IncentiveKind["Staking"] = "staking";
+    IncentiveKind["Reward"] = "reward";
+})(IncentiveKind || (exports.IncentiveKind = IncentiveKind = {}));

package/cjs/types/morphoBlue.d.ts

@@ -1,4 +1,4 @@
-import { MMUsedAssets, NetworkNumber } from './common';
+import { IncentiveData, MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
     MorphoBlueWstEthUSDC = "morphobluewstethusdc",
     MorphoBlueSDAIUSDC = "morphobluesdaiusdc",
@@ -83,14 +83,12 @@ export interface MorphoBlueAssetData {
     price: string;
     supplyRate: string;
     borrowRate: string;
-    incentiveSupplyApy?: string;
-    incentiveSupplyToken?: string;
-    incentiveBorrowApy?: string;
-    incentiveBorrowToken?: string;
     totalSupply?: string;
     totalBorrow?: string;
     canBeSupplied?: boolean;
     canBeBorrowed?: boolean;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export type MorphoBlueAssetsData = {
     [key: string]: MorphoBlueAssetData;

package/cjs/types/spark.d.ts

@@ -1,5 +1,4 @@
-import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
-import { IncentiveData } from './aave';
+import { IncentiveData, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
 }

package/esm/aaveV3/index.js

@@ -17,7 +17,7 @@ import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { multicall } from '../multicall';
 import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { NetworkNumber, } from '../types/common';
+import { IncentiveKind, NetworkNumber, } from '../types/common';
 export const test = (web3, network) => {
     const contract = AaveV3ViewContract(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();
@@ -189,7 +189,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
-                    incentiveKind: 'staking',
+                    incentiveKind: IncentiveKind.Staking,
                 });
             }
             if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
@@ -201,7 +201,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.borrowIncentives.push({
                     apy: _market.incentiveBorrowApy,
                     token: _market.incentiveBorrowToken,
-                    incentiveKind: 'reward',
+                    incentiveKind: IncentiveKind.Reward,
                 });
             }
             if (!rewardForMarket)
@@ -231,7 +231,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.supplyIncentives.push({
                         token: supplyRewardData.rewardTokenSymbol,
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: IncentiveKind.Reward,
                     });
                 }
             });
@@ -259,7 +259,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.borrowIncentives.push({
                         token: borrowRewardData.rewardTokenSymbol,
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: IncentiveKind.Reward,
                     });
                 }
             });

package/esm/index.d.ts

@@ -21,5 +21,6 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
+import * as rewards from './rewards';
 export * from './types';
-export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, };
+export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, rewards, };

package/esm/index.js

@@ -21,5 +21,6 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
+import * as rewards from './rewards';
 export * from './types';
-export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, };
+export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, rewards, };

package/esm/markets/morphoBlue/index.js

@@ -550,7 +550,7 @@ export const MORPHO_BLUE_USR_USDC_915 = (networkId = NetworkNumber.Eth) => ({
 export const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho',
-    shortLabel: 'Pt syrupUSDC Aug/USDC',
+    shortLabel: 'PT syrupUSDC Aug/USDC',
     value: MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860,
     url: 'ptsyrupusdcaug-a3819a7d',
     loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',

package/esm/morphoBlue/index.js

@@ -9,14 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { NetworkNumber, } from '../types/common';
+import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
 import { USD_QUOTE, WAD } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMainnetNetwork, wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate, } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
+import { getReward, REWARD_ASSETS } from '../rewards';
 export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
@@ -50,15 +52,13 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
         }
         let morphoSupplyApy = '0';
         let morphoBorrowApy = '0';
-        if (!collateralTokenInfo.isPendle) {
-            try {
-                const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield getRewardsForMarket(selectedMarket.marketId, network);
-                morphoSupplyApy = _morphoSupplyApy;
-                morphoBorrowApy = _morphoBorrowApy;
-            }
-            catch (e) {
-                console.error(e);
-            }
+        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);
@@ -78,10 +78,20 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            incentiveSupplyApy: morphoSupplyApy,
-            incentiveBorrowApy: morphoBorrowApy,
-            incentiveSupplyToken: 'MORPHO',
-            incentiveBorrowToken: 'MORPHO',
+            supplyIncentives: [
+                {
+                    token: 'MORPHO',
+                    apy: morphoSupplyApy,
+                    incentiveKind: IncentiveKind.Reward,
+                },
+            ],
+            borrowIncentives: [
+                {
+                    token: 'MORPHO',
+                    apy: morphoBorrowApy,
+                    incentiveKind: IncentiveKind.Reward,
+                },
+            ],
         };
         assetsData[wethToEth(collateralTokenInfo.symbol)] = {
             symbol: wethToEth(collateralTokenInfo.symbol),
@@ -91,10 +101,20 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             borrowRate: '0',
             canBeSupplied: true,
             canBeBorrowed: false,
+            supplyIncentives: [],
         };
         if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
-            assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
-            assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+            assetsData[collateralTokenInfo.symbol].supplyIncentives = [
+                ...assetsData[collateralTokenInfo.symbol].supplyIncentives,
+                {
+                    token: collateralTokenInfo.symbol,
+                    apy: yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3),
+                    incentiveKind: IncentiveKind.Staking,
+                },
+            ];
+        }
+        if (REWARD_ASSETS.includes(collateralTokenInfo.symbol)) {
+            (_a = assetsData[collateralTokenInfo.symbol].supplyIncentives) === null || _a === void 0 ? void 0 : _a.push(yield getReward(collateralTokenInfo.symbol));
         }
         return {
             id: marketInfo.id,

package/esm/rewards/index.d.ts

@@ -0,0 +1 @@
+export * from './rewards';

package/esm/rewards/index.js

@@ -0,0 +1 @@
+export * from './rewards';

package/esm/rewards/rewards.d.ts

@@ -0,0 +1,12 @@
+import memoize from 'memoizee';
+import { IncentiveKind } from '../types/common';
+export declare const REWARD_ASSETS: string[];
+export declare const getReward: ((asset: string) => Promise<{
+    token: string;
+    apy: string;
+    incentiveKind: IncentiveKind;
+}>) & memoize.Memoized<(asset: string) => Promise<{
+    token: string;
+    apy: string;
+    incentiveKind: IncentiveKind;
+}>>;

package/esm/rewards/rewards.js

@@ -0,0 +1,40 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import memoize from 'memoizee';
+import { IncentiveKind } from '../types/common';
+export const REWARD_ASSETS = [
+    'syrupUSDC',
+];
+const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`https://fe.defisaver.com/api/rewards/apy?asset=${asset}`);
+    if (!res.ok)
+        throw new Error(`Failed to fetch APY for ${asset}`);
+    const data = yield res.json();
+    return String(data.apy);
+});
+export const getReward = memoize((asset) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        if (asset === 'syrupUSDC') {
+            return {
+                token: '$MAPLE',
+                apy: yield getApyFromDfsApi(asset),
+                incentiveKind: IncentiveKind.Reward,
+            };
+        }
+    }
+    catch (e) {
+        console.error(`Failed to fetch APY for ${asset}`);
+    }
+    return {
+        token: '?',
+        apy: '0',
+        incentiveKind: IncentiveKind.Reward,
+    };
+}), { promise: true, maxAge: 2 * 60 * 1000 });

package/esm/staking/staking.js

@@ -107,7 +107,29 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return String(data.apy);
 });
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug'];
+export const STAKING_ASSETS = [
+    'cbETH',
+    'wstETH',
+    'cbETH',
+    'rETH',
+    'sDAI',
+    'weETH',
+    'sUSDe',
+    'osETH',
+    'ezETH',
+    'ETHx',
+    'rsETH',
+    'pufETH',
+    'wrsETH',
+    'wsuperOETHb',
+    'sUSDS',
+    'PT eUSDe May',
+    'PT sUSDe July',
+    'PT USDe July',
+    'PT eUSDe Aug',
+    'PT syrupUSDC Aug',
+    'syrupUSDC',
+];
 export const getStakingApy = memoize((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -144,6 +166,10 @@ export const getStakingApy = memoize((asset, web3, blockNumber = 'latest', fromB
             return yield getApyFromDfsApi('PT USDe July');
         if (asset === 'PT eUSDe Aug')
             return yield getApyFromDfsApi('PT eUSDe Aug');
+        if (asset === 'PT syrupUSDC Aug')
+            return yield getApyFromDfsApi('PT syrupUSDC Aug');
+        if (asset === 'syrupUSDC')
+            return yield getApyFromDfsApi('syrupUSDC');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);
@@ -176,7 +202,15 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) =>
                 : assetData.supplyRate;
             const supplyInterest = calculateInterestEarned(amount, rate, 'year', true);
             acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
-            if (assetData.incentiveSupplyApy) {
+            if (assetData.supplyIncentives && assetData.supplyIncentives.length > 0) {
+                let totalApy = '0';
+                for (const incentive of assetData.supplyIncentives || []) {
+                    totalApy = new Dec(totalApy).add(incentive.apy).toString();
+                }
+                const incentiveInterest = calculateInterestEarned(amount, totalApy, 'year', true);
+                acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+            }
+            else if (assetData.incentiveSupplyApy) {
                 // take COMP/AAVE yield into account
                 const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
                 acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
@@ -192,7 +226,15 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) =>
                     : ((usedAsset === null || usedAsset === void 0 ? void 0 : usedAsset.interestMode) === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
             const borrowInterest = calculateInterestEarned(amount, rate, 'year', true);
             acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-            if (assetData.incentiveBorrowApy) {
+            if (assetData.borrowIncentives && assetData.borrowIncentives.length > 0) {
+                let totalApy = '0';
+                for (const incentive of assetData.borrowIncentives || []) {
+                    totalApy = new Dec(totalApy).add(incentive.apy).toString();
+                }
+                const incentiveInterest = calculateInterestEarned(amount, totalApy, 'year', true);
+                acc.incentiveUsd = new Dec(acc.incentiveUsd).sub(incentiveInterest).toString();
+            }
+            else if (assetData.incentiveBorrowApy) {
                 // take COMP/AAVE yield into account
                 const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveBorrowApy, 'year', true);
                 acc.incentiveUsd = new Dec(acc.incentiveUsd).sub(incentiveInterest).toString();

package/esm/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 import { IUiIncentiveDataProviderV3 } from './contracts/generated/AaveUiIncentiveDataProviderV3';
 export declare enum AaveVersions {
     AaveV1 = "v1",
@@ -73,11 +73,6 @@ export interface AaveV2AssetData extends AaveAssetData {
 }
 export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 }
-export interface IncentiveData {
-    token: string;
-    apy: string;
-    incentiveKind?: 'staking' | 'reward';
-}
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;
     isSiloed: boolean;

package/esm/types/common.d.ts

@@ -9,6 +9,15 @@ export declare enum NetworkNumber {
     Base = 8453
 }
 export type Networkish = string | NetworkNumber;
+export declare enum IncentiveKind {
+    Staking = "staking",
+    Reward = "reward"
+}
+export interface IncentiveData {
+    token: string;
+    apy: string;
+    incentiveKind?: IncentiveKind;
+}
 export interface MMAssetData {
     symbol: string;
     supplyRate: string;
@@ -29,6 +38,8 @@ export interface MMAssetData {
     incentiveSupplyToken?: string;
     borrowRateP2P?: string;
     supplyRateP2P?: string;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export interface MMAssetsData {
     [token: string]: MMAssetData;

package/esm/types/common.js

@@ -5,3 +5,8 @@ export var NetworkNumber;
     NetworkNumber[NetworkNumber["Arb"] = 42161] = "Arb";
     NetworkNumber[NetworkNumber["Base"] = 8453] = "Base";
 })(NetworkNumber || (NetworkNumber = {}));
+export var IncentiveKind;
+(function (IncentiveKind) {
+    IncentiveKind["Staking"] = "staking";
+    IncentiveKind["Reward"] = "reward";
+})(IncentiveKind || (IncentiveKind = {}));

package/esm/types/morphoBlue.d.ts

@@ -1,4 +1,4 @@
-import { MMUsedAssets, NetworkNumber } from './common';
+import { IncentiveData, MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
     MorphoBlueWstEthUSDC = "morphobluewstethusdc",
     MorphoBlueSDAIUSDC = "morphobluesdaiusdc",
@@ -83,14 +83,12 @@ export interface MorphoBlueAssetData {
     price: string;
     supplyRate: string;
     borrowRate: string;
-    incentiveSupplyApy?: string;
-    incentiveSupplyToken?: string;
-    incentiveBorrowApy?: string;
-    incentiveBorrowToken?: string;
     totalSupply?: string;
     totalBorrow?: string;
     canBeSupplied?: boolean;
     canBeBorrowed?: boolean;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export type MorphoBlueAssetsData = {
     [key: string]: MorphoBlueAssetData;

package/esm/types/spark.d.ts

@@ -1,5 +1,4 @@
-import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
-import { IncentiveData } from './aave';
+import { IncentiveData, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.21-dev-2",
+  "version": "1.0.21-dev-3",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -13,7 +13,7 @@
     "lint": "eslint src/ --fix",
     "lint-check": "eslint src/",
     "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
+    "test": "mocha tests/morphoBlue.ts",
     "test-single": "mocha ./tests/$npm_config_name.ts",
     "test:debugger": "mocha --inspect-brk tests/*",
     "build-test": "npm run build && npm run test",

package/src/aaveV3/index.ts

@@ -32,7 +32,7 @@ import {
   EModeCategoryDataMapping,
 } from '../types/aave';
 import {
-  Blockish, EthAddress, NetworkNumber, PositionBalances,
+  Blockish, EthAddress, IncentiveKind, NetworkNumber, PositionBalances,
 } from '../types/common';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 
@@ -286,7 +286,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       _market.supplyIncentives.push({
         apy: _market.incentiveSupplyApy || '0',
         token: _market.symbol,
-        incentiveKind: 'staking',
+        incentiveKind: IncentiveKind.Staking,
       });
     }
 
@@ -299,7 +299,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       _market.borrowIncentives.push({
         apy: _market.incentiveBorrowApy,
         token: _market.incentiveBorrowToken!!,
-        incentiveKind: 'reward',
+        incentiveKind: IncentiveKind.Reward,
       });
     }
 
@@ -328,7 +328,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         _market.supplyIncentives.push({
           token: supplyRewardData.rewardTokenSymbol,
           apy: rewardApy,
-          incentiveKind: 'reward',
+          incentiveKind: IncentiveKind.Reward,
         });
       }
     });
@@ -355,7 +355,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         _market.borrowIncentives.push({
           token: borrowRewardData.rewardTokenSymbol,
           apy: rewardApy,
-          incentiveKind: 'reward',
+          incentiveKind: IncentiveKind.Reward,
         });
       }
     });

package/src/index.ts

@@ -23,6 +23,7 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
+import * as rewards from './rewards';
 
 export * from './types';
 
@@ -49,4 +50,5 @@ export {
   llamaLend,
   eulerV2,
   fluid,
+  rewards,
 };

package/src/markets/morphoBlue/index.ts

@@ -558,7 +558,7 @@ export const MORPHO_BLUE_USR_USDC_915 = (networkId: NetworkNumber = NetworkNumbe
 export const MORPHO_BLUE_PTSYRUPUSDCAUG_USDC_860 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
   chainIds: [1],
   label: 'Morpho',
-  shortLabel: 'Pt syrupUSDC Aug/USDC',
+  shortLabel: 'PT syrupUSDC Aug/USDC',
   value: MorphoBlueVersions.MorphoBluePTsyrupUSDCAugUSDC_860,
   url: 'ptsyrupusdcaug-a3819a7d',
   loanToken: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',

package/src/morphoBlue/index.ts

@@ -2,7 +2,7 @@ import Web3 from 'web3';
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import {
-  Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
+  Blockish, EthAddress, IncentiveKind, MMUsedAssets, NetworkNumber, PositionBalances,
 } from '../types/common';
 import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
 import {
@@ -15,6 +15,7 @@ import {
   getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
 } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
+import { getReward, REWARD_ASSETS } from '../rewards';
 
 export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
   const {
@@ -56,14 +57,12 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
 
   let morphoSupplyApy = '0';
   let morphoBorrowApy = '0';
-  if (!collateralTokenInfo.isPendle) {
-    try {
-      const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
-      morphoSupplyApy = _morphoSupplyApy;
-      morphoBorrowApy = _morphoBorrowApy;
-    } catch (e) {
-      console.error(e);
-    }
+  try {
+    const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
+    morphoSupplyApy = _morphoSupplyApy;
+    morphoBorrowApy = _morphoBorrowApy;
+  } catch (e) {
+    console.error(e);
   }
 
   const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
@@ -87,10 +86,20 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
     canBeSupplied: true,
     canBeBorrowed: true,
-    incentiveSupplyApy: morphoSupplyApy,
-    incentiveBorrowApy: morphoBorrowApy,
-    incentiveSupplyToken: 'MORPHO',
-    incentiveBorrowToken: 'MORPHO',
+    supplyIncentives: [
+      {
+        token: 'MORPHO',
+        apy: morphoSupplyApy,
+        incentiveKind: IncentiveKind.Reward,
+      },
+    ],
+    borrowIncentives: [
+      {
+        token: 'MORPHO',
+        apy: morphoBorrowApy,
+        incentiveKind: IncentiveKind.Reward,
+      },
+    ],
   };
 
   assetsData[wethToEth(collateralTokenInfo.symbol)] = {
@@ -101,10 +110,21 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     borrowRate: '0',
     canBeSupplied: true,
     canBeBorrowed: false,
+    supplyIncentives: [],
   };
   if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
-    assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
-    assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+    assetsData[collateralTokenInfo.symbol].supplyIncentives = [
+      ...assetsData[collateralTokenInfo.symbol].supplyIncentives!,
+      {
+        token: collateralTokenInfo.symbol,
+        apy: await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3),
+        incentiveKind: IncentiveKind.Staking,
+      },
+    ];
+  }
+
+  if (REWARD_ASSETS.includes(collateralTokenInfo.symbol)) {
+    assetsData[collateralTokenInfo.symbol].supplyIncentives?.push(await getReward(collateralTokenInfo.symbol));
   }
 
   return {

package/src/rewards/index.ts

@@ -0,0 +1 @@
+export * from './rewards';

package/src/rewards/rewards.ts

@@ -0,0 +1,32 @@
+import memoize from 'memoizee';
+import { IncentiveKind } from '../types/common';
+
+export const REWARD_ASSETS = [
+  'syrupUSDC',
+];
+
+const getApyFromDfsApi = async (asset: string) => {
+  const res = await fetch(`https://fe.defisaver.com/api/rewards/apy?asset=${asset}`);
+  if (!res.ok) throw new Error(`Failed to fetch APY for ${asset}`);
+  const data = await res.json();
+  return String(data.apy);
+};
+
+export const getReward = memoize(async (asset: string) => {
+  try {
+    if (asset === 'syrupUSDC') {
+      return {
+        token: '$MAPLE',
+        apy: await getApyFromDfsApi(asset),
+        incentiveKind: IncentiveKind.Reward,
+      };
+    }
+  } catch (e) {
+    console.error(`Failed to fetch APY for ${asset}`);
+  }
+  return {
+    token: '?',
+    apy: '0',
+    incentiveKind: IncentiveKind.Reward,
+  };
+}, { promise: true, maxAge: 2 * 60 * 1000 });

package/src/staking/staking.ts

@@ -109,7 +109,29 @@ const getApyFromDfsApi = async (asset: string) => {
   return String(data.apy);
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug'];
+export const STAKING_ASSETS = [
+  'cbETH',
+  'wstETH',
+  'cbETH',
+  'rETH',
+  'sDAI',
+  'weETH',
+  'sUSDe',
+  'osETH',
+  'ezETH',
+  'ETHx',
+  'rsETH',
+  'pufETH',
+  'wrsETH',
+  'wsuperOETHb',
+  'sUSDS',
+  'PT eUSDe May',
+  'PT sUSDe July',
+  'PT USDe July',
+  'PT eUSDe Aug',
+  'PT syrupUSDC Aug',
+  'syrupUSDC',
+];
 
 export const getStakingApy = memoize(async (asset: string, web3: Web3, blockNumber: 'latest' | number = 'latest', fromBlock: number | undefined = undefined) => {
   try {
@@ -130,6 +152,8 @@ export const getStakingApy = memoize(async (asset: string, web3: Web3, blockNumb
     if (asset === 'PT sUSDe July') return await getApyFromDfsApi('PT sUSDe July');
     if (asset === 'PT USDe July') return await getApyFromDfsApi('PT USDe July');
     if (asset === 'PT eUSDe Aug') return await getApyFromDfsApi('PT eUSDe Aug');
+    if (asset === 'PT syrupUSDC Aug') return await getApyFromDfsApi('PT syrupUSDC Aug');
+    if (asset === 'syrupUSDC') return await getApyFromDfsApi('syrupUSDC');
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
   }
@@ -165,7 +189,14 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }: {
         : assetData.supplyRate;
       const supplyInterest = calculateInterestEarned(amount, rate as string, 'year', true);
       acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
-      if (assetData.incentiveSupplyApy) {
+      if (assetData.supplyIncentives && assetData.supplyIncentives.length > 0) {
+        let totalApy = '0';
+        for (const incentive of assetData.supplyIncentives || []) {
+          totalApy = new Dec(totalApy).add(incentive.apy).toString();
+        }
+        const incentiveInterest = calculateInterestEarned(amount, totalApy, 'year', true);
+        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+      } else if (assetData.incentiveSupplyApy) {
         // take COMP/AAVE yield into account
         const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
         acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
@@ -182,7 +213,14 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }: {
           : (usedAsset?.interestMode === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
       const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
       acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-      if (assetData.incentiveBorrowApy) {
+      if (assetData.borrowIncentives && assetData.borrowIncentives.length > 0) {
+        let totalApy = '0';
+        for (const incentive of assetData.borrowIncentives || []) {
+          totalApy = new Dec(totalApy).add(incentive.apy).toString();
+        }
+        const incentiveInterest = calculateInterestEarned(amount, totalApy, 'year', true);
+        acc.incentiveUsd = new Dec(acc.incentiveUsd).sub(incentiveInterest).toString();
+      } else if (assetData.incentiveBorrowApy) {
         // take COMP/AAVE yield into account
         const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveBorrowApy, 'year', true);
         acc.incentiveUsd = new Dec(acc.incentiveUsd).sub(incentiveInterest).toString();

package/src/types/aave.ts

@@ -1,4 +1,5 @@
 import {
+  IncentiveData,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
 } from './common';
 
@@ -84,12 +85,6 @@ export interface AaveV2AssetData extends AaveAssetData {
 export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 }
 
-export interface IncentiveData {
-  token: string,
-  apy: string,
-  incentiveKind?: 'staking' | 'reward';
-}
-
 export interface AaveV3AssetData extends AaveAssetData {
   isIsolated: boolean,
   isSiloed: boolean,

package/src/types/common.ts

@@ -12,6 +12,17 @@ export enum NetworkNumber {
 }
 export type Networkish = string | NetworkNumber;
 
+export enum IncentiveKind {
+  Staking = 'staking',
+  Reward = 'reward',
+}
+
+export interface IncentiveData {
+  token: string,
+  apy: string,
+  incentiveKind?: IncentiveKind;
+}
+
 // Common
 export interface MMAssetData {
   symbol: string,
@@ -33,6 +44,8 @@ export interface MMAssetData {
   incentiveSupplyToken?: string,
   borrowRateP2P?: string,
   supplyRateP2P?: string,
+  supplyIncentives?: IncentiveData[];
+  borrowIncentives?: IncentiveData[];
 }
 
 export interface MMAssetsData {
@@ -81,4 +94,4 @@ export interface PositionBalances {
   debt?: Balances,
   selling?: Balances,
   deposited?: Balances,
-}
+}

package/src/types/morphoBlue.ts

@@ -1,4 +1,4 @@
-import { MMUsedAssets, NetworkNumber } from './common';
+import { IncentiveData, MMUsedAssets, NetworkNumber } from './common';
 
 export enum MorphoBlueVersions {
   // MAINNET
@@ -97,14 +97,12 @@ export interface MorphoBlueAssetData {
   price: string,
   supplyRate: string,
   borrowRate: string,
-  incentiveSupplyApy?: string,
-  incentiveSupplyToken?: string,
-  incentiveBorrowApy?: string,
-  incentiveBorrowToken?: string,
   totalSupply?: string,
   totalBorrow?: string,
   canBeSupplied?: boolean,
   canBeBorrowed?: boolean,
+  supplyIncentives?: IncentiveData[];
+  borrowIncentives?: IncentiveData[];
 }
 
 export type MorphoBlueAssetsData = { [key: string]: MorphoBlueAssetData };

package/src/types/spark.ts

@@ -1,7 +1,7 @@
 import {
+  IncentiveData,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
 } from './common';
-import { IncentiveData } from './aave';
 
 export enum SparkVersions {
   SparkV1 = 'v1default',