@defisaver/positions-sdk 2.1.24-dev-savings-2 → 2.1.24-dev-savings-4

package/cjs/fluid/index.js

@@ -1146,11 +1146,23 @@ exports._getAllFluidMarketDataChunked = _getAllFluidMarketDataChunked;
 const getAllFluidMarketDataChunked = (network, provider) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataChunked)(network, (0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } })); });
 exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
 const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
-    const data = yield view.read.getFTokenData([fTokenAddress]);
-    const supplyRate = new decimal_js_1.default(data.supplyRate).div(100).toString();
-    const rewardsRate = new decimal_js_1.default(data.rewardsRate).div(1e12).toString();
+    const [data, rewardsApiResponse,] = yield Promise.all([
+        yield view.read.getFTokenData([fTokenAddress]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
+    ]);
+    let rewardsData = { rewards: [] };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
+    const supplyRate = new decimal_js_1.default((rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.supplyRate) || '0').div(100).toString();
+    const rewardRates = ((_a = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.rewards) === null || _a === void 0 ? void 0 : _a.reduce((acc, item) => acc.add(new decimal_js_1.default(item.rate || '0').div(100)), new decimal_js_1.default(0))) || '0';
+    const stakeRate = new decimal_js_1.default(((_b = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.asset) === null || _b === void 0 ? void 0 : _b.stakingApr) || '0').div(100).toString();
     const decimals = data.decimals.toString();
     const depositRate = new decimal_js_1.default((0, utils_1.getEthAmountForDecimals)(data.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new decimal_js_1.default((0, utils_1.getEthAmountForDecimals)(data.convertToAssets.toString(), decimals)).toString();
@@ -1160,7 +1172,7 @@ const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void
         decimals,
         totalDeposited: (0, utils_1.getEthAmountForDecimals)(data.totalAssets.toString(), decimals),
         withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable.toString(), decimals),
-        apy: new decimal_js_1.default(supplyRate).add(rewardsRate).toString(),
+        apy: new decimal_js_1.default(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
         depositRate,
         withdrawRate,
     };

package/cjs/savings/morphoVaults/options.js

@@ -6,7 +6,7 @@ exports.MORPHO_VAULT_FLAGSHIP_ETH = {
     type: types_1.MorphoVaultType.MorphoVaultFlagshipEth,
     name: 'Flagship ETH',
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 18927491,
 };
 exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = {
@@ -27,21 +27,21 @@ exports.MORPHO_VAULT_RE7_WETH = {
     type: types_1.MorphoVaultType.MorphoVaultRe7Weth,
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19121118,
 };
 exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletWETHCore,
     name: 'Gauntlet WETH Core',
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19541126,
 };
 exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletWETHPrime,
     name: 'Gauntlet WETH Prime',
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19372149,
 };
 exports.MORPHO_VAULT_BOOSTED_USDC = {

package/esm/fluid/index.js

@@ -1130,11 +1130,23 @@ export const _getAllFluidMarketDataChunked = (network, provider) => __awaiter(vo
 });
 export const getAllFluidMarketDataChunked = (network, provider) => __awaiter(void 0, void 0, void 0, function* () { return _getAllFluidMarketDataChunked(network, getViemProvider(provider, network, { batch: { multicall: true } })); });
 export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const view = FluidViewContractViem(provider, network);
     const fTokenAddress = getFTokenAddress(token, network);
-    const data = yield view.read.getFTokenData([fTokenAddress]);
-    const supplyRate = new Dec(data.supplyRate).div(100).toString();
-    const rewardsRate = new Dec(data.rewardsRate).div(1e12).toString();
+    const [data, rewardsApiResponse,] = yield Promise.all([
+        yield view.read.getFTokenData([fTokenAddress]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
+    ]);
+    let rewardsData = { rewards: [] };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
+    const supplyRate = new Dec((rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.supplyRate) || '0').div(100).toString();
+    const rewardRates = ((_a = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.rewards) === null || _a === void 0 ? void 0 : _a.reduce((acc, item) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0))) || '0';
+    const stakeRate = new Dec(((_b = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.asset) === null || _b === void 0 ? void 0 : _b.stakingApr) || '0').div(100).toString();
     const decimals = data.decimals.toString();
     const depositRate = new Dec(getEthAmountForDecimals(data.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new Dec(getEthAmountForDecimals(data.convertToAssets.toString(), decimals)).toString();
@@ -1144,7 +1156,7 @@ export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0
         decimals,
         totalDeposited: getEthAmountForDecimals(data.totalAssets.toString(), decimals),
         withdrawable: getEthAmountForDecimals(data.withdrawable.toString(), decimals),
-        apy: new Dec(supplyRate).add(rewardsRate).toString(),
+        apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
         depositRate,
         withdrawRate,
     };

package/esm/savings/morphoVaults/options.js

@@ -3,7 +3,7 @@ export const MORPHO_VAULT_FLAGSHIP_ETH = {
     type: MorphoVaultType.MorphoVaultFlagshipEth,
     name: 'Flagship ETH',
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 18927491,
 };
 export const MORPHO_VAULT_GAUNTLET_USDC_CORE = {
@@ -24,21 +24,21 @@ export const MORPHO_VAULT_RE7_WETH = {
     type: MorphoVaultType.MorphoVaultRe7Weth,
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19121118,
 };
 export const MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     type: MorphoVaultType.MorphoVaultGauntletWETHCore,
     name: 'Gauntlet WETH Core',
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19541126,
 };
 export const MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     type: MorphoVaultType.MorphoVaultGauntletWETHPrime,
     name: 'Gauntlet WETH Prime',
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
-    asset: 'ETH',
+    asset: 'WETH',
     deploymentBlock: 19372149,
 };
 export const MORPHO_VAULT_BOOSTED_USDC = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.24-dev-savings-2",
+  "version": "2.1.24-dev-savings-4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/fluid/index.ts

@@ -1526,9 +1526,22 @@ export const getAllFluidMarketDataChunked = async (
 export const _getFluidTokenData = async (provider: Client, network: NetworkNumber, token: string) => {
   const view = FluidViewContractViem(provider, network);
   const fTokenAddress = getFTokenAddress(token, network);
-  const data = await view.read.getFTokenData([fTokenAddress]);
-  const supplyRate = new Dec(data.supplyRate).div(100).toString();
-  const rewardsRate = new Dec(data.rewardsRate).div(1e12).toString();
+  const [
+    data,
+    rewardsApiResponse,
+  ] = await Promise.all([
+    await view.read.getFTokenData([fTokenAddress]),
+    fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
+  ]);
+  let rewardsData = { rewards: [] } as any;
+  if (!rewardsApiResponse.ok) {
+    console.log('External API Failure: Failed to fetch fluid rewards APY');
+  } else {
+    rewardsData = await rewardsApiResponse.json();
+  }
+  const supplyRate = new Dec(rewardsData?.supplyRate || '0').div(100).toString();
+  const rewardRates = rewardsData?.rewards?.reduce((acc: Dec, item: any) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0)) || '0';
+  const stakeRate = new Dec(rewardsData?.asset?.stakingApr || '0').div(100).toString();
   const decimals = data.decimals.toString();
 
   const depositRate = new Dec(getEthAmountForDecimals(data.convertToShares.toString(), decimals)).toString();
@@ -1540,7 +1553,7 @@ export const _getFluidTokenData = async (provider: Client, network: NetworkNumbe
     decimals,
     totalDeposited: getEthAmountForDecimals(data.totalAssets.toString(), decimals),
     withdrawable: getEthAmountForDecimals(data.withdrawable.toString(), decimals),
-    apy: new Dec(supplyRate).add(rewardsRate).toString(),
+    apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
     depositRate,
     withdrawRate,
   };

package/src/savings/morphoVaults/options.ts

@@ -4,7 +4,7 @@ export const MORPHO_VAULT_FLAGSHIP_ETH: MorphoVault = {
   type: MorphoVaultType.MorphoVaultFlagshipEth,
   name: 'Flagship ETH',
   address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
-  asset: 'ETH',
+  asset: 'WETH',
   deploymentBlock: 18927491,
 };
 
@@ -28,7 +28,7 @@ export const MORPHO_VAULT_RE7_WETH: MorphoVault = {
   type: MorphoVaultType.MorphoVaultRe7Weth,
   name: 'RE7 WETH',
   address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
-  asset: 'ETH',
+  asset: 'WETH',
   deploymentBlock: 19121118,
 };
 
@@ -36,7 +36,7 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE: MorphoVault = {
   type: MorphoVaultType.MorphoVaultGauntletWETHCore,
   name: 'Gauntlet WETH Core',
   address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
-  asset: 'ETH',
+  asset: 'WETH',
   deploymentBlock: 19541126,
 };
 
@@ -44,7 +44,7 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME: MorphoVault = {
   type: MorphoVaultType.MorphoVaultGauntletWETHPrime,
   name: 'Gauntlet WETH Prime',
   address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
-  asset: 'ETH',
+  asset: 'WETH',
   deploymentBlock: 19372149,
 };