@aurigami/sdk 0.3.1 → 0.3.5

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.1",
+  "version": "0.3.5",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "@aurigami/contracts": "^1.0.1",
+    "@aurigami/contracts": "^1.1.1",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.2",
     "ethers": "^5.0.0"

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

@@ -39,7 +39,6 @@ export class SdkRead extends BlockchainEntityRead {
   }
 
   public async getLockingDetails(): Promise<LockingDetails> {
-    console.log(this._networkConnection.provider)
     const currentTime = await getCurrentTimestamp(this._networkConnection.provider);
     const currentWeek = BN.from(currentTime - REWARDCLAIMSTART).div(7 * ONE_DAY).toNumber();
     const denominator = 10000;
@@ -59,7 +58,6 @@ export class SdkRead extends BlockchainEntityRead {
   public async getUserDetails(userAddress: string): Promise<UserDetails> {
     const marketCount = networkAddresses.auTokens.length;
     var userMarketDetails: UserMarketDetails[] = [], assetsIn: string[];
-    var collateralRatio: BigNumber[] = new Array(marketCount);
     var promises = [];
     var totalBorrowLimit = new BigNumber(0);
     var pricePromises = [];
@@ -70,7 +68,7 @@ export class SdkRead extends BlockchainEntityRead {
       const moneyMarket: MoneyMarketRead = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
       promises.push(moneyMarket.getUserDepositBalance(userAddress).then((res: TokenAmount) => {userMarketDetail.depositBalance = res}));
       promises.push(moneyMarket.getUserBorrowBalance(userAddress).then((res: TokenAmount) => {userMarketDetail.borrowBalance = res}));
-      promises.push(moneyMarket.getCollateralRatio().then((res: BigNumber) => {collateralRatio[i] = res}));
+      promises.push(moneyMarket.getCollateralRatio().then((res: BigNumber) => {userMarketDetail.collateralRatio = res.toNumber()}));
       pricePromises.push(fetchPrice(moneyMarket.underlying.address, this._networkConnection.provider));
     }
 
@@ -82,19 +80,19 @@ export class SdkRead extends BlockchainEntityRead {
 
     for (var i = 0; i < marketCount; i ++) {
       const auToken = networkAddresses.auTokens[i];
-      if (assetsIn!.filter((auAddress: Address) => {
-        isSameAddress(auToken.address, auAddress)
-      }).length > 0) {
+      if (assetsIn!.find((auAddress: Address) => isSameAddress(auToken.address, auAddress)) !== undefined) {
         userMarketDetails[i].isCollateral = true;
+      } else {
+        userMarketDetails[i].isCollateral = false;
       }
       depositValuationPromises.push(fetchValuation(userMarketDetails[i].depositBalance, this._networkConnection.provider, underlyingPrices[i]));
     }
 
     var depositValues = await Promise.all(depositValuationPromises);
     totalBorrowLimit = depositValues.reduce((p: BigNumber, v: BigNumber, index: number)=> {
-      if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(collateralRatio[index]));
+      if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
       return p;
-    })
+    }, new BigNumber(0))
 
     promises = [];
     var accountLiquidity: [BN, BN, BN], rewardBalancesMetadata, lockedAmount: BN;
@@ -105,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)) {
@@ -116,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);

package/src/types.ts

@@ -53,6 +53,7 @@ export type UserMarketDetails = {
   borrowBalance: TokenAmount;
   isCollateral: boolean;
   maxWithdrawableAmount: TokenAmount;
+  collateralRatio: number;
 };
 
 export type PlyAuroraPoolDetails = {