@defisaver/positions-sdk 2.1.42 → 2.1.43-dev-stats-test-dev

package/.mocharc.json

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

package/.nvmrc

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

package/README.md

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

package/cjs/aaveV3/index.js

@@ -59,6 +59,7 @@ exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
+        console.log('Fetched addresses');
         const isL2 = (0, utils_1.isLayer2Network)(network);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
@@ -73,6 +74,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             (0, merkl_1.getMerkleCampaigns)(network),
             (0, merit_1.getMeritCampaigns)(network, market.value),
         ]);
+        console.log('Fetched tokens, emodes, campaigns, incentives');
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
         for (let i = 0; i < eModesInfo.length; i++) {
@@ -90,6 +92,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 collateralAssets: [],
             };
         }
+        console.log('Parsed e modes info');
         if (networksWithIncentives.includes(network) && rewardInfo) {
             rewardInfo = rewardInfo.reduce((all, _market) => {
                 // eslint-disable-next-line no-param-reassign
@@ -97,6 +100,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 return all;
             }, {});
         }
+        console.log('Parsed reward info');
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
@@ -158,6 +162,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 borrowIncentives: [],
             });
         })));
+        console.log('Parsed assets data');
         // Get incentives data
         yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -165,8 +170,10 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             const isStakingAsset = staking_1.STAKING_ASSETS.includes(_market.symbol);
+            console.log('Processing market', _market.symbol);
             if (isStakingAsset) {
                 const yieldApy = yield (0, staking_1.getStakingApy)(_market.symbol, network);
+                console.log('Got yield apy', yieldApy);
                 _market.supplyIncentives.push({
                     apy: yieldApy,
                     token: _market.symbol,
@@ -194,6 +201,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
+            console.log('Processed merkle a incentives');
             const vTokenAddress = _market.vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
             if ((_b = merkleRewardsMap[vTokenAddress]) === null || _b === void 0 ? void 0 : _b.borrow) {
                 const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[vTokenAddress].borrow;
@@ -205,6 +213,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
+            console.log('Processed merkle v incentives');
             if (meritRewardsMap.supply[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
                 _market.supplyIncentives.push({
@@ -214,6 +223,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
+            console.log('Processed merit supply incentives');
             if (meritRewardsMap.borrow[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
                 _market.borrowIncentives.push({
@@ -223,8 +233,10 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
+            console.log('Processed merit borrow incentives');
             if (!rewardForMarket)
                 return;
+            console.log('Reward for market', rewardForMarket);
             // @ts-ignore
             rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
                 if (supplyRewardData) {
@@ -291,6 +303,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
         };
+        console.log('Parsed payload');
         return { assetsData: payload, eModeCategoriesData };
     });
 }

package/cjs/aaveV3/merit.js

@@ -68,6 +68,7 @@ const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, function*
 exports.fetchMeritRewardsData = fetchMeritRewardsData;
 const getMeritCampaigns = (chainId, market) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    console.log('Fetching Merit campaigns');
     const meritData = yield (0, exports.fetchMeritRewardsData)();
     const relevantCampaigns = {
         supply: {},

package/cjs/aaveV3/merkl.js

@@ -39,6 +39,7 @@ const formatAaveAsset = (_symbol) => {
 };
 exports.formatAaveAsset = formatAaveAsset;
 const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('Fetching Merkle campaigns');
     try {
         const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),

package/cjs/helpers/morphoBlueHelpers/index.js

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

package/cjs/savings/morphoVaults/index.js

@@ -54,23 +54,23 @@ const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/aaveV3/index.js

@@ -48,6 +48,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
+        console.log('Fetched addresses');
         const isL2 = isLayer2Network(network);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
@@ -62,6 +63,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             getMerkleCampaigns(network),
             getMeritCampaigns(network, market.value),
         ]);
+        console.log('Fetched tokens, emodes, campaigns, incentives');
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
         for (let i = 0; i < eModesInfo.length; i++) {
@@ -79,6 +81,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 collateralAssets: [],
             };
         }
+        console.log('Parsed e modes info');
         if (networksWithIncentives.includes(network) && rewardInfo) {
             rewardInfo = rewardInfo.reduce((all, _market) => {
                 // eslint-disable-next-line no-param-reassign
@@ -86,6 +89,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 return all;
             }, {});
         }
+        console.log('Parsed reward info');
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
@@ -147,6 +151,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 borrowIncentives: [],
             });
         })));
+        console.log('Parsed assets data');
         // Get incentives data
         yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -154,8 +159,10 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             const isStakingAsset = STAKING_ASSETS.includes(_market.symbol);
+            console.log('Processing market', _market.symbol);
             if (isStakingAsset) {
                 const yieldApy = yield getStakingApy(_market.symbol, network);
+                console.log('Got yield apy', yieldApy);
                 _market.supplyIncentives.push({
                     apy: yieldApy,
                     token: _market.symbol,
@@ -183,6 +190,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
+            console.log('Processed merkle a incentives');
             const vTokenAddress = _market.vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
             if ((_b = merkleRewardsMap[vTokenAddress]) === null || _b === void 0 ? void 0 : _b.borrow) {
                 const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[vTokenAddress].borrow;
@@ -194,6 +202,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
+            console.log('Processed merkle v incentives');
             if (meritRewardsMap.supply[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
                 _market.supplyIncentives.push({
@@ -203,6 +212,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
+            console.log('Processed merit supply incentives');
             if (meritRewardsMap.borrow[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
                 _market.borrowIncentives.push({
@@ -212,8 +222,10 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
+            console.log('Processed merit borrow incentives');
             if (!rewardForMarket)
                 return;
+            console.log('Reward for market', rewardForMarket);
             // @ts-ignore
             rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
                 if (supplyRewardData) {
@@ -280,6 +292,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
         };
+        console.log('Parsed payload');
         return { assetsData: payload, eModeCategoriesData };
     });
 }

package/esm/aaveV3/merit.js

@@ -64,6 +64,7 @@ export const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, fun
 });
 export const getMeritCampaigns = (chainId, market) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    console.log('Fetching Merit campaigns');
     const meritData = yield fetchMeritRewardsData();
     const relevantCampaigns = {
         supply: {},

package/esm/aaveV3/merkl.js

@@ -34,6 +34,7 @@ export const formatAaveAsset = (_symbol) => {
     return _symbol;
 };
 export const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('Fetching Merkle campaigns');
     try {
         const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(DEFAULT_TIMEOUT),