@1delta/margin-fetcher 0.0.79 → 0.0.81
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.
- package/dist/index.js +23 -21
- package/dist/index.js.map +1 -1
- package/dist/lending/aave-v3-type/publicCallParse.d.ts.map +1 -1
- package/dist/types/lender/aave-v3-types.d.ts +1 -1
- package/dist/types/lender/aave-v3-types.d.ts.map +1 -1
- package/dist/types/lenderTypes.d.ts +4 -4
- package/dist/types/lenderTypes.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -8396,16 +8396,17 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
|
|
|
8396
8396
|
// caps
|
|
8397
8397
|
borrowCap: Number(reserveCaps[0]?.toString()),
|
|
8398
8398
|
supplyCap: Number(reserveCaps[1]?.toString()),
|
|
8399
|
-
debtCeiling:
|
|
8400
|
-
|
|
8401
|
-
|
|
8399
|
+
debtCeiling: Number(
|
|
8400
|
+
parseRawAmount(
|
|
8401
|
+
debtCeiling?.toString(),
|
|
8402
|
+
Number(decimalsCeiling?.toString())
|
|
8403
|
+
)
|
|
8402
8404
|
)
|
|
8403
8405
|
};
|
|
8404
8406
|
}
|
|
8405
8407
|
return {
|
|
8406
8408
|
data: resultReserves,
|
|
8407
|
-
chainId
|
|
8408
|
-
eModes: eModeConfigs
|
|
8409
|
+
chainId
|
|
8409
8410
|
};
|
|
8410
8411
|
},
|
|
8411
8412
|
expectedNumberOfCalls
|
|
@@ -8698,16 +8699,17 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
|
|
|
8698
8699
|
// caps
|
|
8699
8700
|
borrowCap: Number(reserveCaps[0]?.toString()),
|
|
8700
8701
|
supplyCap: Number(reserveCaps[1]?.toString()),
|
|
8701
|
-
debtCeiling:
|
|
8702
|
-
|
|
8703
|
-
|
|
8702
|
+
debtCeiling: Number(
|
|
8703
|
+
parseRawAmount(
|
|
8704
|
+
debtCeiling?.toString(),
|
|
8705
|
+
Number(decimalsCeiling?.toString())
|
|
8706
|
+
)
|
|
8704
8707
|
)
|
|
8705
8708
|
};
|
|
8706
8709
|
}
|
|
8707
8710
|
return {
|
|
8708
8711
|
data: resultReserves,
|
|
8709
|
-
chainId
|
|
8710
|
-
eModes: eModeConfigs
|
|
8712
|
+
chainId
|
|
8711
8713
|
};
|
|
8712
8714
|
},
|
|
8713
8715
|
expectedNumberOfCalls
|
|
@@ -8818,7 +8820,7 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
|
|
|
8818
8820
|
}
|
|
8819
8821
|
});
|
|
8820
8822
|
});
|
|
8821
|
-
return { data: result,
|
|
8823
|
+
return { data: result, chainId };
|
|
8822
8824
|
},
|
|
8823
8825
|
expectedNumberOfCalls
|
|
8824
8826
|
];
|
|
@@ -10901,7 +10903,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
|
|
|
10901
10903
|
for (let i = 0; i < assetKeys.length; i++) {
|
|
10902
10904
|
const asset = assetKeys[i];
|
|
10903
10905
|
if (!lenderData?.[asset]) continue;
|
|
10904
|
-
const { depositsUSD, debtStableUSD, debtUSD,
|
|
10906
|
+
const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = payload.lendingPositions["0"][asset];
|
|
10905
10907
|
const {
|
|
10906
10908
|
depositRate,
|
|
10907
10909
|
stakingYield,
|
|
@@ -10926,7 +10928,7 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
|
|
|
10926
10928
|
);
|
|
10927
10929
|
stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
|
|
10928
10930
|
stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
|
|
10929
|
-
if (
|
|
10931
|
+
if (collateralEnabled) {
|
|
10930
10932
|
collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
|
|
10931
10933
|
borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
|
|
10932
10934
|
}
|
|
@@ -16638,7 +16640,7 @@ function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimabl
|
|
|
16638
16640
|
debtStableUSD: Number(currentStableDebt) * price,
|
|
16639
16641
|
debtUSD: Number(currentVariableDebt) * price,
|
|
16640
16642
|
stableBorrowRate: reserveData[5 /* stableBorrowRate */]?.toString(),
|
|
16641
|
-
|
|
16643
|
+
collateralEnabled: Boolean(
|
|
16642
16644
|
reserveData[8 /* usageAsCollateralEnabled */]
|
|
16643
16645
|
),
|
|
16644
16646
|
claimableRewards
|
|
@@ -16730,7 +16732,7 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
|
|
|
16730
16732
|
debtStableUSD: Number(currentStableDebt) * price,
|
|
16731
16733
|
debtUSD: Number(currentVariableDebt) * price,
|
|
16732
16734
|
stableBorrowRate: reserveData[5 /* stableBorrowRate */]?.toString() ?? "0",
|
|
16733
|
-
|
|
16735
|
+
collateralEnabled: Boolean(
|
|
16734
16736
|
reserveData[8 /* usageAsCollateralEnabled */]
|
|
16735
16737
|
),
|
|
16736
16738
|
claimableRewards: 0
|
|
@@ -16824,7 +16826,7 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
|
|
|
16824
16826
|
debtStableUSD: 0,
|
|
16825
16827
|
depositsUSD: price * Number(deposits),
|
|
16826
16828
|
debtUSD: price * Number(debt),
|
|
16827
|
-
|
|
16829
|
+
collateralEnabled: true,
|
|
16828
16830
|
isAllowed: entry.approved.toLowerCase() === brokerAddress.toLowerCase()
|
|
16829
16831
|
}
|
|
16830
16832
|
};
|
|
@@ -16887,7 +16889,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
|
|
|
16887
16889
|
debt: "0",
|
|
16888
16890
|
debtStable: "0",
|
|
16889
16891
|
debtUSD: 0,
|
|
16890
|
-
|
|
16892
|
+
collateralEnabled: true,
|
|
16891
16893
|
// user depos raw
|
|
16892
16894
|
depositsRaw: depositsRaw2
|
|
16893
16895
|
// flag for allowance
|
|
@@ -16915,7 +16917,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
|
|
|
16915
16917
|
// populate values for totals
|
|
16916
16918
|
debtStable: "0",
|
|
16917
16919
|
debtStableUSD: 0,
|
|
16918
|
-
|
|
16920
|
+
collateralEnabled: false,
|
|
16919
16921
|
// user depos raw
|
|
16920
16922
|
depositsRaw
|
|
16921
16923
|
// flag for allowance
|
|
@@ -17029,7 +17031,7 @@ function createAaveV3Entry2(i, data, chainId, asset, prices, pricesHist) {
|
|
|
17029
17031
|
debtStableUSD: 0,
|
|
17030
17032
|
debtUSD: Number(currentVariableDebt) * price,
|
|
17031
17033
|
stableBorrowRate: 0,
|
|
17032
|
-
|
|
17034
|
+
collateralEnabled: Boolean(
|
|
17033
17035
|
reserveData[4 /* usageAsCollateralEnabled */]
|
|
17034
17036
|
),
|
|
17035
17037
|
claimableRewards: 0
|
|
@@ -17222,7 +17224,7 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
|
|
|
17222
17224
|
debtStableUSD: 0,
|
|
17223
17225
|
debtUSD: Number(borrowDec) * priceLoan,
|
|
17224
17226
|
stableBorrowRate: "0",
|
|
17225
|
-
|
|
17227
|
+
collateralEnabled: false,
|
|
17226
17228
|
claimableRewards: 0
|
|
17227
17229
|
};
|
|
17228
17230
|
const key = toOracleKey(collateralAssetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
|
|
@@ -17239,7 +17241,7 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
|
|
|
17239
17241
|
debtStableUSD: 0,
|
|
17240
17242
|
debtUSD: 0,
|
|
17241
17243
|
stableBorrowRate: "0",
|
|
17242
|
-
|
|
17244
|
+
collateralEnabled: true,
|
|
17243
17245
|
claimableRewards: 0
|
|
17244
17246
|
};
|
|
17245
17247
|
return {
|