@defisaver/positions-sdk 0.0.147 → 0.0.148

package/cjs/aaveV3/index.js

@@ -136,7 +136,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         }
         const [{ 0: ghoDiscountedPerDiscountToken }, { 0: discountRate }, { 0: minDiscountTokenBalance }, { 0: minGhoBalanceForDiscount }, { 0: facilitatorsList },] = multiRes;
         let rewardInfo = null;
-        const networksWithIncentives = [common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
+        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
         if (networksWithIncentives.includes(network)) {
             rewardInfo = yield aaveIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
             rewardInfo = rewardInfo.reduce((all, _market) => {
@@ -202,6 +202,9 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 if (+supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
                     return;
                 _market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
+                // reward token is aave asset
+                if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
+                    _market.incentiveSupplyToken = _market.symbol;
                 const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals)).toString();
                 _market.incentiveSupplyApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
@@ -216,6 +219,8 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 if (+borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
                     return;
                 _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
+                if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
+                    _market.incentiveBorrowToken = _market.symbol;
                 const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals)).toString();
                 _market.incentiveBorrowApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)

package/cjs/markets/aave/marketAssets.js

@@ -9,9 +9,7 @@ exports.aaveV1AssetsDefaultMarket = [
 ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
-exports.morphoAaveV3AssetEthMarket = [
-    'ETH', 'wstETH', 'USDC', 'WBTC', 'rETH', 'cbETH', 'USDT',
-];
+exports.morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
 exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS'];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/cjs/markets/compound/marketsAssets.js

@@ -26,8 +26,8 @@ exports.v3USDCeCollAssets = {
     [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
 };
-exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
-exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'USDC', 'wrsETH', 'wstETH', 'weETH'];
+exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
+exports.v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
 exports.v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 exports.v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/esm/aaveV3/index.js

@@ -127,7 +127,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         }
         const [{ 0: ghoDiscountedPerDiscountToken }, { 0: discountRate }, { 0: minDiscountTokenBalance }, { 0: minGhoBalanceForDiscount }, { 0: facilitatorsList },] = multiRes;
         let rewardInfo = null;
-        const networksWithIncentives = [NetworkNumber.Arb, NetworkNumber.Opt];
+        const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt];
         if (networksWithIncentives.includes(network)) {
             rewardInfo = yield aaveIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
             rewardInfo = rewardInfo.reduce((all, _market) => {
@@ -193,6 +193,9 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 if (+supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
                     return;
                 _market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
+                // reward token is aave asset
+                if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
+                    _market.incentiveSupplyToken = _market.symbol;
                 const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
                 const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals)).toString();
                 _market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
@@ -207,6 +210,8 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 if (+borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
                     return;
                 _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
+                if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
+                    _market.incentiveBorrowToken = _market.symbol;
                 const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
                 const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals)).toString();
                 _market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)

package/esm/markets/aave/marketAssets.js

@@ -6,9 +6,7 @@ export const aaveV1AssetsDefaultMarket = [
 ].map((symbol) => getAssetInfo(symbol));
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
-export const morphoAaveV3AssetEthMarket = [
-    'ETH', 'wstETH', 'USDC', 'WBTC', 'rETH', 'cbETH', 'USDT',
-];
+export const morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
 export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS'];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/markets/compound/marketsAssets.js

@@ -23,8 +23,8 @@ export const v3USDCeCollAssets = {
     [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
     [NetworkNumber.Base]: [],
 };
-export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
-export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'USDC', 'wrsETH', 'wstETH', 'weETH'];
+export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
+export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
 export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.147",
+  "version": "0.0.148",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.json",
     "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
     "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
     "lint": "eslint src/ --fix",
     "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
+    "test": "mocha tests/* --require ts-node/register --extension ts",
     "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && mocha tests/*"
+    "build-test": "npm run build && npm run test"
   },
   "keywords": [],
   "author": "",
@@ -31,6 +31,7 @@
     "dotenv": "^16.3.1",
     "eslint": "^8.49.0",
     "mocha": "^10.2.0",
+    "ts-node": "^10.9.2",
     "typechain": "^8.3.1",
     "typechain-target-web3-v1-3mihai3": "^6.0.2",
     "typescript": "^5.2.2"

package/src/aaveV3/index.ts

@@ -178,7 +178,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
   ] = multiRes;
 
   let rewardInfo: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput[] | null = null;
-  const networksWithIncentives = [NetworkNumber.Arb, NetworkNumber.Opt];
+  const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt];
   if (networksWithIncentives.includes(network)) {
     rewardInfo = await aaveIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
     rewardInfo = rewardInfo.reduce((all: any, _market: AaveV3IncentiveData) => {
@@ -294,6 +294,8 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
     if (supplyRewardData) {
       if (+supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
       _market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
+      // reward token is aave asset
+      if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol)) _market.incentiveSupplyToken = _market.symbol;
       const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
       const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** +supplyRewardData.priceFeedDecimals).toString();
       _market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((10 ** +supplyRewardData.rewardTokenDecimals) / 100)
@@ -307,6 +309,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
     if (borrowRewardData) {
       if (+borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
       _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
+      if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol)) _market.incentiveBorrowToken = _market.symbol;
       const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
       const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** +borrowRewardData.priceFeedDecimals).toString();
       _market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((10 ** +borrowRewardData.rewardTokenDecimals) / 100)

package/src/markets/aave/marketAssets.ts

@@ -9,9 +9,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
 
-export const morphoAaveV3AssetEthMarket = [
-  'ETH', 'wstETH', 'USDC', 'WBTC', 'rETH', 'cbETH', 'USDT',
-];
+export const morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
 
 export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS'];
 export const aaveV3AssetsDefaultMarketOpt = [

package/src/markets/compound/marketsAssets.ts

@@ -29,8 +29,8 @@ export const v3USDCeCollAssets = {
   [NetworkNumber.Base]: [],
 } as const;
 
-export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH'];
-export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'USDC', 'wrsETH', 'wstETH', 'weETH'];
+export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH', 'rsETH', 'weETH', 'osETH', 'WBTC', 'ezETH', 'cbBTC', 'rswETH'];
+export const v3ETHCollAssetsBase = ['cbETH', 'ezETH', 'wstETH', 'USDC', 'weETH', 'wrsETH', 'cbBTC'];
 export const v3ETHCollAssetsArb = ['weETH', 'rETH', 'wstETH', 'WBTC', 'rsETH', 'ezETH', 'USDC', 'USDT'];
 export const v3ETHCollAssetsOpt = ['rETH', 'wstETH', 'WBTC', 'ezETH', 'USDC', 'USDT', 'weETH', 'wrsETH'];