@aurigami/sdk 0.3.4 → 0.3.5

package/src/MoneyMarket.ts

@@ -32,7 +32,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
   constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address) {
     super(networkConnection);
     if (isSameAddress(underlyingAsset, ETHAddress)) {
-      this.auToken = new Contract(auToken, AuETHABI.abi, networkConnection.provider) as AuETH
+      this.auToken = new Contract(auToken, AuETHABI.abi, networkConnection.provider) as AuETH;
     } else {
       this.auToken = new Contract(auToken, AuErc20ABI.abi, networkConnection.provider) as AuErc20;
     }

package/src/SDK.ts

@@ -103,6 +103,7 @@ export class SdkRead extends BlockchainEntityRead {
     accountLiquidity = values[0]; rewardBalancesMetadata = values[1]; lockedAmount = values[2];
     const borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[1].toString()).div(decimalFactor(18)));
     const bufferedBorrowLimit: BigNumber = totalBorrowLimit.multipliedBy(BORROW_LIMIT_BUFFER);
+    const minimumBorrowLimitAllowed = borrowedvaluation.div(BORROW_LIMIT_BUFFER);
 
     var borrowableAmount: BigNumber;
     if (bufferedBorrowLimit.lte(borrowedvaluation)) {
@@ -114,10 +115,17 @@ export class SdkRead extends BlockchainEntityRead {
     for (var i = 0; i < marketCount; i ++) {
       const auToken = networkAddresses.auTokens[i];
       const moneyMarket: MoneyMarketRead = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
-      userMarketDetails[i].maxWithdrawableAmount = new TokenAmount(
-        moneyMarket.underlying,
-        borrowableAmount.div(underlyingPrices[i]).toFixed(18)
-      )
+      const maxWithdrawCap: BigNumber = (totalBorrowLimit.minus(minimumBorrowLimitAllowed)).div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
+      userMarketDetails[i].maxWithdrawableAmount = userMarketDetails[i].isCollateral && maxWithdrawCap.lt(userMarketDetails[i].depositBalance.formattedAmount()) 
+      ?  new TokenAmount(
+          moneyMarket.underlying,
+          maxWithdrawCap.toFixed(24),
+          false
+        )
+      : new TokenAmount(
+          moneyMarket.underlying,
+          userMarketDetails[i].depositBalance.rawAmount()
+        );
     }
 
     return {

package/src/dummy.ts

@@ -39,4 +39,5 @@ export const dummyUserMarketDetails: UserMarketDetails = {
   borrowBalance: dummyZeroTokenAmount,
   isCollateral: true,
   maxWithdrawableAmount: dummyTokenAmount,
+  collateralRatio: 0.5
 };

package/src/priceFetcher.ts

@@ -7,7 +7,7 @@ import { PriceOracle } from "@aurigami/contracts/typechain";
 import { TokenAmount } from "./tokenAmount";
 import { Address } from "./types";
 import IUniswapV2PairABI from './abis/IUniswapV2Pair.json';
-import dummyABI from "./abis/dummy.json";
+import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
 
 const axios = require('axios')
 
@@ -78,8 +78,11 @@ export async function fetchPriceFromOracle(auTokenAddress: Address, underlyingDe
     return processPriceFromOracle(rawPrice, underlyingDecimal)
 }
 
-export async function fetchUnderlyingTokensPrices(provider: providers.Provider) {
-    const auriLens: Contract = new Contract(networkAddresses.misc.AURILENS, dummyABI.abi, provider);
+export async function fetchUnderlyingTokensPrices(provider: providers.Provider): Promise<{
+    auToken: string,
+    underlyingPrice: BigNumber
+}[]> {
+    const auriLens: Contract = new Contract(networkAddresses.misc.AURILENS, AuriLensABI.abi, provider);
     const auTokenAddresses = networkAddresses.auTokens.map((auToken) => auToken.address);
     const underlyingDecimals = networkAddresses.auTokens.map((auToken) => getDecimal(auToken.underlying));
     const rawPrices = await auriLens.auTokenUnderlyingPriceAll(auTokenAddresses);