@defisaver/positions-sdk 2.1.22-dev-savings-4 → 2.1.23-dev-sena

package/esm/contracts.js

@@ -45,22 +45,6 @@ export const createViemContractFromConfigFunc = (name, _address) => (client, net
         client,
     });
 };
-export const getMorphoVaultContractViem = (client, address) => {
-    const abi = getConfigContractAbi('MorphoVault');
-    return getContract({
-        address,
-        abi,
-        client,
-    });
-};
-export const getYearnVaultContractViem = (client, address) => {
-    const abi = getConfigContractAbi('YearnVault');
-    return getContract({
-        address,
-        abi,
-        client,
-    });
-};
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');
@@ -105,4 +89,3 @@ export const SparkRewardsControllerViem = createViemContractFromConfigFunc('Spar
 export const AaveRewardsControllerViem = createViemContractFromConfigFunc('AaveRewardsController');
 export const LiquityV2sBoldVaultViem = createViemContractFromConfigFunc('LiquityV2sBoldVault');
 export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
-export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');

package/esm/helpers/morphoBlueHelpers/index.js

@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     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/index.d.ts

@@ -19,6 +19,5 @@ import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
-import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/index.js

@@ -19,6 +19,5 @@ import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
-import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/portfolio/index.js

@@ -33,6 +33,7 @@ import { getCompoundV3Rewards } from '../claiming/compV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
 import { getKingRewards } from '../claiming/king';
+import { fetchEthenaAirdropRewards } from '../claiming/ethena';
 export function getPortfolioData(provider, network, defaultProvider, addresses, summerFiAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const isMainnet = network === NetworkNumber.Eth;
@@ -133,6 +134,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 spk: {},
                 king: {},
                 morpho: {},
+                ethena: {},
             };
         }
         yield Promise.allSettled([
@@ -389,6 +391,30 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     }
                 }
             }))(),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        return;
+                    }
+                    const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].ethena = {
+                            error: '',
+                            data: ethenaAirdropRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching Ethena Airdrop rewards data:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].ethena = {
+                            error: 'Error fetching Ethena Airdrop rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
         ]);
         yield Promise.all([
             ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {

package/esm/types/claiming.d.ts

@@ -15,7 +15,8 @@ export declare enum ClaimType {
     /** Spark Airdrop */
     SPARK_AIRDROP = "SPARK_AIRDROP",
     /** Spark Airdrop */
-    SPARK_WST_ETH_REWARDS = "SPARK_WST_ETH_REWARDS"
+    SPARK_WST_ETH_REWARDS = "SPARK_WST_ETH_REWARDS",// TODO: This will be removed once we fully refactor spark rewards
+    ETHENA_AIRDROP = "ETHENA_AIRDROP"
 }
 type _ClaimableTokenPartial = {
     symbol: string;
@@ -89,5 +90,8 @@ export type SparkAirdropClaimableToken = _ClaimableTokenPartial & {
 export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.SPARK_WST_ETH_REWARDS;
 };
-export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | MorphoClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken;
+export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.ETHENA_AIRDROP;
+};
+export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | MorphoClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/esm/types/claiming.js

@@ -16,6 +16,7 @@ export var ClaimType;
     ClaimType["SPARK_AIRDROP"] = "SPARK_AIRDROP";
     /** Spark Airdrop */
     ClaimType["SPARK_WST_ETH_REWARDS"] = "SPARK_WST_ETH_REWARDS";
+    ClaimType["ETHENA_AIRDROP"] = "ETHENA_AIRDROP";
 })(ClaimType || (ClaimType = {}));
 export var SparkAirdropType;
 (function (SparkAirdropType) {

package/esm/types/index.d.ts

@@ -12,4 +12,3 @@ export * from './fluid';
 export * from './portfolio';
 export * from './merit';
 export * from './merkl';
-export * from './savings';

package/esm/types/index.js

@@ -12,4 +12,3 @@ export * from './fluid';
 export * from './portfolio';
 export * from './merit';
 export * from './merkl';
-export * from './savings';

package/package.json

@@ -1,48 +1,47 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "2.1.22-dev-savings-4",
-  "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 build:cjs && npm run build:esm",
-    "dev": "tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.7.10",
-    "@types/lodash": "^4.17.15",
-    "@types/memoizee": "^0.4.12",
-    "decimal.js": "^10.6.0",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.17",
-    "viem": "^2.37.9",
-    "graphql-request": "^1.8.2"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@metamask/eth-json-rpc-middleware": "^15.0.1",
-    "@metamask/eth-json-rpc-provider": "^4.1.6",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "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",
-    "typescript": "^5.2.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "2.1.23-dev-sena",
+  "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 build:cjs && npm run build:esm",
+    "dev": "tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "1.7.12-dev-sena",
+    "@types/lodash": "^4.17.15",
+    "@types/memoizee": "^0.4.12",
+    "decimal.js": "^10.6.0",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.17",
+    "viem": "^2.37.9"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@metamask/eth-json-rpc-middleware": "^15.0.1",
+    "@metamask/eth-json-rpc-provider": "^4.1.6",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "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",
+    "typescript": "^5.2.2"
+  }
+}