npm - @1delta/margin-fetcher - Versions diffs - 0.0.10 → 0.0.11 - Mend

@1delta/margin-fetcher 0.0.10 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/lending/compound-v3/publicCallParse.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
-import { Lender } from "@1delta/asset-registry";
-import { AdditionalYields } from "../../types";
-import { CompoundV3GeneralPublicResponse } from "./types";
-import { GenericTokenList } from "../types";
+import { Lender } from '@1delta/asset-registry';
+import { AdditionalYields } from '../../types';
+import { CompoundV3GeneralPublicResponse } from './types';
+import { GenericTokenList } from '../types';
 export declare const getCompoundV3ReservesDataConverter: (lender: Lender, chainId: string, prices: {
     [asset: string]: number;
 }, additionalYields: AdditionalYields, tokenList?: GenericTokenList) => [(data: any[]) => CompoundV3GeneralPublicResponse | undefined, number];

package/dist/lending/compound-v3/publicCallParse.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,~~EAA4B~~,+BAA+B,~~EAAE~~,MAAM,SAAS,CAAA;~~AAInF~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,+BAA+B,GAAG,SAAS,EAAE,MAAM,~~CA8HvE~~,CAAA"}
1	+ {"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAEL,+BAA+B,EAChC,MAAM,SAAS,CAAA;AAUhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,+BAA+B,GAAG,SAAS,EAAE,MAAM,CA8KvE,CAAA"}

package/dist/lending/compound-v3/publicCallParse.js CHANGED Viewed

@@ -1,14 +1,14 @@
-import { CometInterestRateIndexes } from "./types";
-import { getAssetMeta, getCompoundV3Assets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets";
-import { getCompoundV3BaseAsset } from "../addresses/compoundV3";
-import { calculateRateForCompound, parseRawAmount } from "../../utils/parsing";
+import { CometInterestRateIndexes, } from './types';
+import { getAssetMeta, getCompoundV3Assets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey, } from '../../assets';
+import { getCompoundV3BaseAsset } from '../addresses/compoundV3';
+import { calculateRateForCompound, parseRawAmount } from '../../utils/parsing';
 const COMET_RISK_DECIMALS = 18;
 const SECONDS_PER_DAY = 3600 * 24;
 const DAYS_IN_YEAR = 365;
 export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
     const assetsToQuery = getCompoundV3Assets(chainId, lender);
     const baseAssetData = getCompoundV3BaseAsset(lender, chainId);
-    const tokensNoBase = assetsToQuery.filter(a => a !== baseAssetData.baseAsset);
+    const tokensNoBase = assetsToQuery.filter((a) => a !== baseAssetData.baseAsset);
     const baseLength = tokensNoBase.length * 2;
     const expectedNumberOfCalls = baseLength + 6;
     return [
@@ -21,10 +21,14 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                 const asset = tokensNoBase[i];
                 const resultsAssetInfo = data[i * 2];
                 const resultsTotals = data[i * 2 + 1];
-                const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset };
+                const assetMeta = tokenList[asset] ?? {
+                    ...getAssetMeta(chainId, asset),
+                    address: asset,
+                };
                 const decimals = assetMeta?.decimals ?? 18;
                 const totals = parseRawAmount(resultsTotals[0], decimals);
-                const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
+                const oracleKey = toOracleKey(assetMeta?.assetGroup) ??
+                    toGenericPriceKey(asset, chainId);
                 result[asset] = {
                     poolId: asset,
                     underlying: asset,
@@ -35,8 +39,8 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                             // collateral factors
                             borrowCollateralFactor: parseRawAmount(resultsAssetInfo.borrowCollateralFactor.toString(), COMET_RISK_DECIMALS),
                             collateralFactor: parseRawAmount(resultsAssetInfo.liquidateCollateralFactor.toString(), COMET_RISK_DECIMALS),
-                            borrowFactor: 1
-                        }
+                            borrowFactor: 1,
+                        },
                     },
                     supplyCap: parseRawAmount(resultsAssetInfo.supplyCap.toString(), decimals),
                     // interest rates
@@ -55,10 +59,13 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                     totalDepositsUSD: Number(totals) * (prices[oracleKey] ?? 1),
                     // rewards
                     rewards: {},
-                    borrowingEnabled: false
+                    borrowingEnabled: false,
                 };
             }
-            const baseMeta = getAssetMeta(chainId, baseAssetData.baseAsset);
+            const baseMeta = tokenList[baseAssetData.baseAsset] ?? {
+                ...getAssetMeta(chainId, baseAssetData.baseAsset),
+                address: baseAssetData.baseAsset,
+            };
             // parse data for rewards calculation
             const decimals = baseMeta?.decimals ?? 18;
             const resultsSupplyRewards = Number(data[baseLength]?.toString());
@@ -66,17 +73,19 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
             const resultsIndexScale = data[baseLength + 2]?.toString();
             const resultsSupply = parseRawAmount(data[baseLength + 3]?.toString(), decimals);
             const resultsBorrow = parseRawAmount(data[baseLength + 4]?.toString(), decimals);
-            const compToSuppliersPerDay = resultsSupplyRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
-            const compToBorrowersPerDay = resultsBorrowRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
+            const compToSuppliersPerDay = (resultsSupplyRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY;
+            const compToBorrowersPerDay = (resultsBorrowRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY;
             const resultsInterest = data[baseLength + 5];
-            const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ?? toGenericPriceKey(baseAssetData.baseAsset, chainId);
+            const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ??
+                toGenericPriceKey(baseAssetData.baseAsset, chainId);
             const price = prices[oracleKeyBase] ?? 1;
             const liquidity = Number(resultsSupply) - Number(resultsBorrow);
-            const compPrice = prices["COMP"];
+            const compPrice = prices['COMP'];
             const baseData = {
                 [baseAssetData.baseAsset]: {
                     poolId: baseAssetData.baseAsset,
                     underlying: baseAssetData.baseAsset,
+                    asset: baseMeta,
                     // collateral factots
                     borrowCollateralFactor: 0,
                     collateralFactor: 0,
@@ -87,8 +96,8 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                             // collateral factors
                             borrowCollateralFactor: 0,
                             collateralFactor: 0,
-                            borrowFactor: 1
-                        }
+                            borrowFactor: 1,
+                        },
                     },
                     // interest rates
                     variableBorrowRate: calculateRateForCompound(resultsInterest[CometInterestRateIndexes.borrowRate].toString(), chainId, lender),
@@ -104,17 +113,23 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                     // rewards
                     rewards: {
                         COMP: {
-                            depositRate: (compPrice * compToSuppliersPerDay / Number(resultsSupply)) * DAYS_IN_YEAR * 100 / price,
-                            variableBorrowRate: (compPrice * compToBorrowersPerDay / Number(resultsBorrow)) * DAYS_IN_YEAR * 100 / price,
+                            depositRate: (((compPrice * compToSuppliersPerDay) / Number(resultsSupply)) *
+                                DAYS_IN_YEAR *
+                                100) /
+                                price,
+                            variableBorrowRate: (((compPrice * compToBorrowersPerDay) / Number(resultsBorrow)) *
+                                DAYS_IN_YEAR *
+                                100) /
+                                price,
                             stableBorrowRate: 0,
-                        }
+                        },
                     },
                     borrowingEnabled: true,
                     stakingYield: additionalYields.intrinsicYields[oracleKeyBase] ?? 0,
-                }
+                },
             };
             return { data: { ...result, ...baseData }, chainId };
         },
-        expectedNumberOfCalls
+        expectedNumberOfCalls,
     ];
 };

package/dist/lending/user-data/compound-v3/userCallParse.js CHANGED Viewed

@@ -36,7 +36,7 @@ export const getCompoundV3UserDataConverter = (lender, chainId, account, prices,
                     deposits,
                     depositsUSD: Number(deposits) * price,
                     debtStableUSD: 0,
-                    debt: 0,
+                    debt: "0",
                     debtUSD: 0,
                     collateralActive: true,
                     // user depos raw
@@ -66,7 +66,7 @@ export const getCompoundV3UserDataConverter = (lender, chainId, account, prices,
                     depositsUSD: Number(deposits) * priceBase,
                     debtUSD: Number(debt) * priceBase,
                     // populate values for totals
-                    debtStable: 0,
+                    debtStable: "0",
                     debtStableUSD: 0,
                     collateralActive: true,
                     // user depos raw

package/dist/lending/user-data/init/userCallParse.js CHANGED Viewed

@@ -60,7 +60,7 @@ export const getInitUserDataConverter = (lender, chainId, account, prices, price
                                     deposits: deposits,
                                     depositsRaw,
                                     debt: debt,
-                                    debtStable: 0,
+                                    debtStable: "0",
                                     debtStableUSD: 0,
                                     depositsUSD: price * Number(deposits),
                                     debtUSD: price * Number(debt),

package/dist/lending/user-data/types.d.ts CHANGED Viewed

@@ -196,7 +196,7 @@ export interface InitUserReserveResponse {
                 debt: number;
                 depositsUSD: number;
                 debtUSD: number;
-                debtStable: 0;
+                debtStable: "0";
                 debtStableUSD: 0;
                 collateralActive: boolean;
                 isAllowed: boolean;

package/dist/lending/user-data/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAE9D,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAA;AACxC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAA;AAErC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,0BAA0B,EAAE,MAAM,CAAA;IAClC,wBAAwB,EAAE,MAAM,CAAA;CACjC;AAED,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IAExD,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAElB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IAErB,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAErG,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE;QAChB,CAAC,MAAM,EAAE,MAAM,GAAG;YAChB,CAAC,WAAW,EAAE,MAAM,GAAG,mBAAmB,CAAA;SAC3C,CAAA;KACF,CAAA;IACD,OAAO,EAAE,eAAe,CAAA;CACzB;AAGD,oBAAY,4BAA4B;IACtC,oBAAoB,IAAI;IACxB,iBAAiB,IAAA;IACjB,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,qBAAqB,IAAA;IACrB,wBAAwB,IAAA;CACzB;AAGD,oBAAY,4BAA4B;IACtC,oBAAoB,IAAI;IACxB,iBAAiB,IAAA;IACjB,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,qBAAqB,IAAA;IACrB,wBAAwB,IAAA;CACzB;AAGD,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE;QAChB,CAAC,EAAE,EAAE,MAAM,GAAG;YACZ,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,CAAA;SAC5C,CAAA;KACF,CAAC;IACF,OAAO,EAAE,eAAe,CAAA;CACzB;AAED,UAAU,oBAAqB,SAAQ,aAAa;IAElD,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAElB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IAErB,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE;QAChB,CAAC,EAAE,EAAE,MAAM,GAAG;YACZ,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,CAAA;SAC5C,CAAA;KACF,CAAA;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE;QAChB,CAAC,EAAE,EAAE,MAAM,GAAG;YACZ,CAAC,WAAW,EAAE,MAAM,GAAG;gBAErB,QAAQ,EAAE,MAAM,CAAA;gBAChB,IAAI,EAAE,MAAM,CAAA;gBACZ,UAAU,EAAE,MAAM,CAAA;gBAElB,WAAW,EAAE,MAAM,CAAA;gBACnB,OAAO,EAAE,MAAM,CAAA;gBACf,aAAa,EAAE,MAAM,CAAA;gBAErB,gBAAgB,EAAE,OAAO,CAAA;gBAEzB,WAAW,EAAE,mBAAmB,CAAC;gBACjC,SAAS,EAAE,OAAO,CAAA;aACnB,CAAA;SACF,CAAA;KACF,CAAC;IACF,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IAEpD,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAG5B,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAIlB,KAAK,CAAC,EAAE,SAAS,CAAA;IAGjB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IAEjB,MAAM,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAA;CAC/C;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,YAAY,EAAE,kBAAkB;IAGxE,gBAAgB,EAAE,OAAO,CAAA;IAEzB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,MAAM,WAAW,YAAa,SAAQ,UAAU;IAE9C,YAAY,EAAE,MAAM,CAAA;IAGpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,kBAAkB;IAEjC,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IAEvB,aAAa,EAAE,MAAM,CAAA;IAErB,cAAc,EAAE,MAAM,CAAA;IAEtB,iBAAiB;IAGjB,YAAY,EAAE,MAAM,CAAA;IACpB,kBAAkB,EAAE,MAAM,CAAA;IAE1B,gBAAgB,EAAE,MAAM,CAAA;IAExB,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAA;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,SAAU,SAAQ,QAAQ;IACzC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IAEpD,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAG5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;IAGnB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE;QAEhB,CAAC,KAAK,EAAE,MAAM,GAAG;YACf,IAAI,EAAE,GAAG,CAAC;YACV,CAAC,WAAW,EAAE,MAAM,GAAG;gBACrB,QAAQ,EAAE,MAAM,CAAA;gBAChB,IAAI,EAAE,MAAM,CAAC;gBACb,WAAW,EAAE,MAAM,CAAA;gBACnB,OAAO,EAAE,MAAM,CAAC;gBAChB,UAAU,EAAE,~~CAAC~~,CAAC;~~gBACd~~,aAAa,EAAE,CAAC,CAAC;gBACjB,gBAAgB,EAAE,OAAO,CAAA;gBACzB,SAAS,EAAE,OAAO,CAAA;aACnB,CAAA;SACF,CAAA;KACF,CAAA;IACD,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAElD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAGnC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CAEnB"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/lending/compound-v3/publicCallParse.ts CHANGED Viewed

@@ -1,10 +1,19 @@
-import { Lender } from "@1delta/asset-registry"
-import { AdditionalYields } from "../../types"
-import { CometInterestRateIndexes, CompoundV3GeneralPublicResponse } from "./types"
-import { getAssetMeta, getCompoundV3Assets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets"
-import { getCompoundV3BaseAsset } from "../addresses/compoundV3"
-import { calculateRateForCompound, parseRawAmount } from "../../utils/parsing"
-import { GenericTokenList } from "../types"
+import { Lender } from '@1delta/asset-registry'
+import { AdditionalYields } from '../../types'
+import {
+  CometInterestRateIndexes,
+  CompoundV3GeneralPublicResponse,
+} from './types'
+import {
+  getAssetMeta,
+  getCompoundV3Assets,
+  LENDER_MODE_NO_MODE,
+  toGenericPriceKey,
+  toOracleKey,
+} from '../../assets'
+import { getCompoundV3BaseAsset } from '../addresses/compoundV3'
+import { calculateRateForCompound, parseRawAmount } from '../../utils/parsing'
+import { GenericTokenList } from '../types'
 const COMET_RISK_DECIMALS = 18
 const SECONDS_PER_DAY = 3600 * 24
@@ -15,12 +24,13 @@ export const getCompoundV3ReservesDataConverter = (
   chainId: string,
   prices: { [asset: string]: number },
   additionalYields: AdditionalYields,
-  tokenList: GenericTokenList = {}
+  tokenList: GenericTokenList = {},
 ): [(data: any[]) => CompoundV3GeneralPublicResponse | undefined, number] => {
   const assetsToQuery = getCompoundV3Assets(chainId, lender)
   const baseAssetData = getCompoundV3BaseAsset(lender, chainId)
-  const tokensNoBase = assetsToQuery.filter(a => a !== baseAssetData.baseAsset)
+  const tokensNoBase = assetsToQuery.filter(
+    (a) => a !== baseAssetData.baseAsset,
+  )
   const baseLength = tokensNoBase.length * 2
   const expectedNumberOfCalls = baseLength + 6
@@ -34,10 +44,15 @@ export const getCompoundV3ReservesDataConverter = (
         const asset = tokensNoBase[i]
         const resultsAssetInfo = data[i * 2]
         const resultsTotals = data[i * 2 + 1]
-        const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset }
+        const assetMeta = tokenList[asset] ?? {
+          ...getAssetMeta(chainId, asset),
+          address: asset,
+        }
         const decimals = assetMeta?.decimals ?? 18
         const totals = parseRawAmount(resultsTotals[0], decimals)
-        const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
+        const oracleKey =
+          toOracleKey(assetMeta?.assetGroup) ??
+          toGenericPriceKey(asset, chainId)
         result[asset] = {
           poolId: asset,
           underlying: asset,
@@ -46,12 +61,21 @@ export const getCompoundV3ReservesDataConverter = (
             [LENDER_MODE_NO_MODE]: {
               category: LENDER_MODE_NO_MODE,
               // collateral factors
-              borrowCollateralFactor: parseRawAmount(resultsAssetInfo.borrowCollateralFactor.toString(), COMET_RISK_DECIMALS),
-              collateralFactor: parseRawAmount(resultsAssetInfo.liquidateCollateralFactor.toString(), COMET_RISK_DECIMALS),
-              borrowFactor: 1
-            }
+              borrowCollateralFactor: parseRawAmount(
+                resultsAssetInfo.borrowCollateralFactor.toString(),
+                COMET_RISK_DECIMALS,
+              ),
+              collateralFactor: parseRawAmount(
+                resultsAssetInfo.liquidateCollateralFactor.toString(),
+                COMET_RISK_DECIMALS,
+              ),
+              borrowFactor: 1,
+            },
           },
-          supplyCap: parseRawAmount(resultsAssetInfo.supplyCap.toString(), decimals),
+          supplyCap: parseRawAmount(
+            resultsAssetInfo.supplyCap.toString(),
+            decimals,
+          ),
           // interest rates
           variableBorrowRate: 0,
@@ -70,34 +94,48 @@ export const getCompoundV3ReservesDataConverter = (
           totalDepositsUSD: Number(totals) * (prices[oracleKey] ?? 1),
           // rewards
           rewards: {},
-          borrowingEnabled: false
+          borrowingEnabled: false,
         }
       }
-      const baseMeta = getAssetMeta(chainId, baseAssetData.baseAsset)
+      const baseMeta = tokenList[baseAssetData.baseAsset] ?? {
+        ...getAssetMeta(chainId, baseAssetData.baseAsset),
+        address: baseAssetData.baseAsset,
+      }
       // parse data for rewards calculation
       const decimals = baseMeta?.decimals ?? 18
       const resultsSupplyRewards = Number(data[baseLength]?.toString())
       const resultsBorrowRewards = Number(data[baseLength + 1]?.toString())
       const resultsIndexScale = data[baseLength + 2]?.toString()
-      const resultsSupply = parseRawAmount(data[baseLength + 3]?.toString(), decimals)
-      const resultsBorrow = parseRawAmount(data[baseLength + 4]?.toString(), decimals)
-      const compToSuppliersPerDay = resultsSupplyRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
-      const compToBorrowersPerDay = resultsBorrowRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
+      const resultsSupply = parseRawAmount(
+        data[baseLength + 3]?.toString(),
+        decimals,
+      )
+      const resultsBorrow = parseRawAmount(
+        data[baseLength + 4]?.toString(),
+        decimals,
+      )
+      const compToSuppliersPerDay =
+        (resultsSupplyRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY
+      const compToBorrowersPerDay =
+        (resultsBorrowRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY
       const resultsInterest = data[baseLength + 5]
-      const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ?? toGenericPriceKey(baseAssetData.baseAsset, chainId)
+      const oracleKeyBase =
+        toOracleKey(baseMeta?.assetGroup) ??
+        toGenericPriceKey(baseAssetData.baseAsset, chainId)
       const price = prices[oracleKeyBase] ?? 1
       const liquidity = Number(resultsSupply) - Number(resultsBorrow)
-      const compPrice = prices["COMP"]
+      const compPrice = prices['COMP']
       const baseData = {
         [baseAssetData.baseAsset]: {
           poolId: baseAssetData.baseAsset,
           underlying: baseAssetData.baseAsset,
+          asset: baseMeta,
           // collateral factots
           borrowCollateralFactor: 0,
           collateralFactor: 0,
@@ -109,14 +147,25 @@ export const getCompoundV3ReservesDataConverter = (
               // collateral factors
               borrowCollateralFactor: 0,
               collateralFactor: 0,
-              borrowFactor: 1
-            }
+              borrowFactor: 1,
+            },
           },
           // interest rates
-          variableBorrowRate: calculateRateForCompound(resultsInterest[CometInterestRateIndexes.borrowRate].toString(), chainId, lender),
-          depositRate: calculateRateForCompound(resultsInterest[CometInterestRateIndexes.supplyRate].toString(), chainId, lender),
+          variableBorrowRate: calculateRateForCompound(
+            resultsInterest[CometInterestRateIndexes.borrowRate].toString(),
+            chainId,
+            lender,
+          ),
+          depositRate: calculateRateForCompound(
+            resultsInterest[CometInterestRateIndexes.supplyRate].toString(),
+            chainId,
+            lender,
+          ),
           stableBorrowRate: 0,
-          utilization: parseRawAmount(resultsInterest[CometInterestRateIndexes.utilization].toString(), COMET_RISK_DECIMALS),
+          utilization: parseRawAmount(
+            resultsInterest[CometInterestRateIndexes.utilization].toString(),
+            COMET_RISK_DECIMALS,
+          ),
           totalLiquidity: liquidity,
           totalLiquidityUSD: liquidity * price,
@@ -129,18 +178,25 @@ export const getCompoundV3ReservesDataConverter = (
           // rewards
           rewards: {
             COMP: {
-              depositRate: (compPrice * compToSuppliersPerDay / Number(resultsSupply)) * DAYS_IN_YEAR * 100 / price,
-              variableBorrowRate: (compPrice * compToBorrowersPerDay / Number(resultsBorrow)) * DAYS_IN_YEAR * 100 / price,
+              depositRate:
+                (((compPrice * compToSuppliersPerDay) / Number(resultsSupply)) *
+                  DAYS_IN_YEAR *
+                  100) /
+                price,
+              variableBorrowRate:
+                (((compPrice * compToBorrowersPerDay) / Number(resultsBorrow)) *
+                  DAYS_IN_YEAR *
+                  100) /
+                price,
               stableBorrowRate: 0,
-            }
+            },
           },
           borrowingEnabled: true,
           stakingYield: additionalYields.intrinsicYields[oracleKeyBase] ?? 0,
-        }
+        },
       }
       return { data: { ...result, ...baseData }, chainId }
     },
-    expectedNumberOfCalls
+    expectedNumberOfCalls,
   ]
 }

package/src/lending/user-data/compound-v3/userCallParse.ts CHANGED Viewed

@@ -52,7 +52,7 @@ export const getCompoundV3UserDataConverter = (
           deposits,
           depositsUSD: Number(deposits) * price,
           debtStableUSD: 0,
-          debt: 0,
+          debt: "0",
           debtUSD: 0,
           collateralActive: true,
           // user depos raw
@@ -85,7 +85,7 @@ export const getCompoundV3UserDataConverter = (
           depositsUSD: Number(deposits) * priceBase,
           debtUSD: Number(debt) * priceBase,
           // populate values for totals
-          debtStable: 0,
+          debtStable: "0",
           debtStableUSD: 0,
           collateralActive: true,
           // user depos raw

package/src/lending/user-data/init/userCallParse.ts CHANGED Viewed

@@ -79,7 +79,7 @@ export const getInitUserDataConverter = (
                     deposits: deposits,
                     depositsRaw,
                     debt: debt,
-                    debtStable: 0,
+                    debtStable: "0",
                     debtStableUSD: 0,
                     depositsUSD: price * Number(deposits),
                     debtUSD: price * Number(debt),

package/src/lending/user-data/types.ts CHANGED Viewed

@@ -255,7 +255,7 @@ export interface InitUserReserveResponse {
         debt: number,
         depositsUSD: number
         debtUSD: number,
-        debtStable: 0,
+        debtStable: "0",
         debtStableUSD: 0,
         collateralActive: boolean
         isAllowed: boolean