@aurigami/sdk 0.4.0 → 0.4.5

package/dist/types.d.ts

@@ -52,6 +52,14 @@ export declare type PlyAuroraPoolDetails = {
     totalStakedLiquidity: TokenAmount;
     apy: string;
 };
+export declare enum MarketAction {
+    Deposit = 0,
+    Borrow = 1,
+    Withdraw = 2,
+    Repay = 3,
+    EnableCollateral = 4,
+    DisableCollateral = 5
+}
 export declare type HypotheticalStats = {
     newBorrowLimit: CurrencyAmount;
     newBorrowUtilization: number;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.4.0",
+  "version": "0.4.5",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/MoneyMarket.ts

@@ -7,13 +7,13 @@ import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.
 import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
 import { AuErc20, AuETH, AuriLens, Comptroller } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
-import { networkAddresses, ETHAddress, ONE_YEAR } from "./constants";
+import { networkAddresses, ETHAddress, ONE_YEAR, INF } from "./constants";
 import BigNumber from "bignumber.js";
 import { decimalFactor, isSameAddress, calcLMRewardApr } from './helpers';
 import { Token, PLYToken } from './token';
 import { TokenAmount } from './tokenAmount';
 import { getDecimal, validateAndParseAddress } from './helpers';
-import { fetchPrice, fetchValuation } from "./priceFetcher";
+import { fetchPrice, calcValuation } from "./priceFetcher";
 
 
 type RewardSpeeds = {
@@ -138,24 +138,22 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     await Promise.all(promises);
     
     var borrowPlyApy = calcLMRewardApr(
-      await fetchValuation(
+      await calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardBorrowSpeed.toString()
         ), 
-        this._networkConnection.provider, 
         plyPrice!
       ),
       underlyingPrice!.multipliedBy(totalBorrowed!.formattedAmount()), 
       ONE_YEAR
     );
     var depositPlyApy = calcLMRewardApr(
-      await fetchValuation(
+      await calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardSupplySpeed.toString()
         ), 
-        this._networkConnection.provider, 
         plyPrice!
       ),
       underlyingPrice!.multipliedBy(totalDeposited!.formattedAmount()), 
@@ -205,6 +203,9 @@ export class MoneyMarketReadWrite extends MoneyMarketRead {
     return this.auToken.connect(this._networkConnection.signer!).borrow(amount.rawAmount());
   }
   public async withdraw(amount: TokenAmount): Promise<TransactionResponse> {
+    if (new BigNumber(amount.rawAmount()).lt(0)) {
+      return this.auToken.connect(this._networkConnection.signer!).redeemUnderlying(INF);
+    }
     return this.auToken.connect(this._networkConnection.signer!).redeemUnderlying(amount.rawAmount());
   }
   public async repay(amount: TokenAmount): Promise<TransactionResponse> {

package/src/SDK.ts

@@ -7,14 +7,15 @@ import {
   UserMarketDetails,
   Address,
   CurrencyAmount,
-  HypotheticalStats
+  HypotheticalStats,
+  MarketAction
 } from './types';
-import { AVAX_DEFAULT_PROVIDER_URL, networkAddresses, BORROW_LIMIT_BUFFER, DECIMAL_PRECISION, REWARDCLAIMSTART, ONE_DAY, AurPlyPid } from './constants';
+import { networkAddresses, BORROW_LIMIT_BUFFER, DECIMAL_PRECISION, REWARDCLAIMSTART, ONE_DAY, AurPlyPid } from './constants';
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import { Contract, BigNumber as BN, ethers, providers } from 'ethers';
 import { isSameAddress, decimalFactor, getCurrentTimestamp, calcLMRewardApr } from './helpers';
 import { MoneyMarketRead } from './MoneyMarket';
-import { fetchValuation, fetchPrice } from './priceFetcher';
+import { fetchValuation, fetchPrice, calcValuation } from './priceFetcher';
 import { AuriFairLaunch, Comptroller, TokenLock, AuriLens } from '@aurigami/contracts/typechain';
 import { TokenAmount } from './tokenAmount';
 import { AURPLYToken, PLYToken, Token } from './token';
@@ -79,8 +80,7 @@ export class SdkRead extends BlockchainEntityRead {
     
     await Promise.all(promises);
     var underlyingPrices = await Promise.all(pricePromises);
-    var depositValuationPromises = [];
-
+    var depositValues = []
     for (var i = 0; i < marketCount; i ++) {
       const auToken = networkAddresses.auTokens[i];
       if (assetsIn!.find((auAddress: Address) => isSameAddress(auToken.address, auAddress)) !== undefined) {
@@ -88,10 +88,9 @@ export class SdkRead extends BlockchainEntityRead {
       } else {
         userMarketDetails[i].isCollateral = false;
       }
-      depositValuationPromises.push(fetchValuation(userMarketDetails[i].depositBalance, this._networkConnection.provider, underlyingPrices[i]));
+      depositValues.push(calcValuation(userMarketDetails[i].depositBalance,  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(userMarketDetails[index].collateralRatio));
       return p;
@@ -104,7 +103,12 @@ export class SdkRead extends BlockchainEntityRead {
     promises.push(this._tokenLock.lockedAmounts(userAddress));
     var values = await Promise.all(promises);
     accountLiquidity = values[0]; rewardBalancesMetadata = values[1]; lockedAmount = values[2];
-    const borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[1].toString()).div(decimalFactor(18)));
+    var borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[1].toString()).div(decimalFactor(18)));
+
+    if (borrowedvaluation.lt("0.00001")) { // Igore dust, dust could be the result of network delay causing collateral valuation calc to be different on vs off chain
+      borrowedvaluation = new BigNumber(0);
+    } 
+    
     const bufferedBorrowLimit: BigNumber = totalBorrowLimit.multipliedBy(BORROW_LIMIT_BUFFER);
     const minimumBorrowLimitAllowed = borrowedvaluation.div(BORROW_LIMIT_BUFFER);
 
@@ -191,15 +195,45 @@ export class SdkRead extends BlockchainEntityRead {
     )
   }
 
-  public calcHypotheticalStats(args: {userMarketDetail: UserMarketDetails, currentBorrowLimit: CurrencyAmount, currentBorrowValuation: CurrencyAmount, isEnable: boolean}): HypotheticalStats {
-    const deltaBorrowLimit = new BigNumber(args.userMarketDetail.depositBalance.formattedAmount()).multipliedBy(args.userMarketDetail.underlyingPrice).multipliedBy(args.userMarketDetail.collateralRatio).multipliedBy(BORROW_LIMIT_BUFFER);
-    const newBorrowLimit = args.isEnable ? new BigNumber(args.currentBorrowLimit.amount).plus(deltaBorrowLimit) : new BigNumber(args.currentBorrowLimit.amount).minus(deltaBorrowLimit);
+  public calcHypotheticalStats({
+    userMarketDetail, 
+    currentBorrowLimit,
+    currentBorrowValuation,
+    action,
+    tokenAmount
+  }: {
+    userMarketDetail: UserMarketDetails,
+    currentBorrowLimit: CurrencyAmount, 
+    currentBorrowValuation: CurrencyAmount, 
+    action: MarketAction,
+    tokenAmount?: TokenAmount
+  }): HypotheticalStats {
+    var newBorrowLimit = new BigNumber(currentBorrowLimit.amount), newBorrowValuation = new BigNumber(currentBorrowValuation.amount);
+    switch (action) {
+      case MarketAction.EnableCollateral:
+      case MarketAction.DisableCollateral:
+        var deltaBorrowLimit = calcValuation(userMarketDetail.depositBalance, new BigNumber(userMarketDetail.underlyingPrice)).multipliedBy(userMarketDetail.collateralRatio).multipliedBy(BORROW_LIMIT_BUFFER);
+        newBorrowLimit = action == MarketAction.EnableCollateral ? newBorrowLimit.plus(deltaBorrowLimit) : newBorrowLimit.minus(deltaBorrowLimit);
+        break;
+
+      case MarketAction.Deposit:
+      case MarketAction.Withdraw:
+        deltaBorrowLimit = calcValuation(tokenAmount!, new BigNumber(userMarketDetail.underlyingPrice)).multipliedBy(userMarketDetail.collateralRatio).multipliedBy(BORROW_LIMIT_BUFFER);
+        newBorrowLimit = action == MarketAction.Deposit ? newBorrowLimit.plus(deltaBorrowLimit) : newBorrowLimit.minus(deltaBorrowLimit);
+        break;
+
+      case MarketAction.Borrow:
+      case MarketAction.Repay:
+        var deltaBorrowValuation = calcValuation(tokenAmount!, new BigNumber(userMarketDetail.underlyingPrice));
+        newBorrowValuation = action == MarketAction.Borrow ? newBorrowValuation.plus(deltaBorrowValuation) : newBorrowValuation.minus(deltaBorrowValuation);
+        break;
+    }
     return {
       newBorrowLimit: {
-        amount: newBorrowLimit.toFixed(DECIMAL_PRECISION),
+        amount: newBorrowLimit!.toFixed(DECIMAL_PRECISION),
         currency: "USD"
       },
-      newBorrowUtilization: new BigNumber(args.currentBorrowValuation.amount).div(newBorrowLimit).toNumber()
+      newBorrowUtilization: newBorrowValuation!.div(newBorrowLimit!).toNumber()
     }
   }
 }
@@ -228,7 +262,7 @@ export class SDK extends BlockchainEntity {
     return new SdkRead(networkConnection);
   }
 
-  public static defaultProvider(): providers.Provider {
-    return new ethers.providers.JsonRpcProvider(AVAX_DEFAULT_PROVIDER_URL);
+  public readWrite(networkConnection: NetworkConnection): SdkReadWrite {
+    return new SdkReadWrite(networkConnection);
   }
 }

package/src/constants.ts

@@ -1,32 +1,11 @@
 import BigNumber from 'bignumber.js';
-// import ethers from 'ethers';
-const ethers = require('ethers');
-import { Signer } from 'ethers';
-import * as dotenv from "dotenv";
-dotenv.config();
-
-export const AVAX_DEFAULT_PROVIDER_URL =
-  'https://api.avax.network/ext/bc/C/rpc';
-
-export const AVAX_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
-  AVAX_DEFAULT_PROVIDER_URL
-);
-
-export const AURORA_DEFAULT_PROVIDER_URL = `https://mainnet.aurora.dev/${process.env.AURORA_API_KEY}`;
-
-export const AURORA_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
-  AURORA_DEFAULT_PROVIDER_URL
-);
+import { ethers, Signer, BigNumber as BN} from 'ethers';
 export const dummyAddress: string = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 export const ETHAddress: string = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
-const dummyPrivateKey =
-  '1111111111111111111111111111111111111111111111111111111111111111';
-export const AURORA_DEFAULT_SIGNER: Signer = new ethers.Wallet(dummyPrivateKey, AURORA_DEFAULT_PROVIDER);
-
 export const AURORA_CHAINID = 1313161554;
 
-export const DECIMAL_PRECISION = 6;
+export const DECIMAL_PRECISION = 10;
 
 export type NetworkAddresses = {
   auTokens: {
@@ -94,4 +73,6 @@ export const ONE_DAY = 86400;
 export const ONE_YEAR = ONE_DAY * 365;
 
 export const AurPlyPid = 0;
+export const INF = BN.from(2).pow(256).sub(1)
+
 

package/src/dummy.ts

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

package/src/priceFetcher.ts

@@ -105,9 +105,11 @@ export async function fetchPrice(address: Address, provider: providers.Provider)
         return fetchPriceFromCoingecko(address);
     }
 }
-export async function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider, price?: BigNumber): Promise<BigNumber> {
-    if (price === null) {
-        price = await fetchPrice(tokenAmount.token.address, provider);
-    }
-    return new BigNumber(tokenAmount.formattedAmount()).multipliedBy(price!);
+export async function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider): Promise<BigNumber> {
+    var price = await fetchPrice(tokenAmount.token.address, provider);
+    return calcValuation(tokenAmount, price);
+}
+
+export function calcValuation(tokenAmount: TokenAmount, price: BigNumber) {
+    return new BigNumber(tokenAmount.formattedAmount()).multipliedBy(price);
 }

package/src/types.ts

@@ -62,6 +62,14 @@ export type PlyAuroraPoolDetails = {
   apy: string;
 };
 
+export enum MarketAction {
+  Deposit = 0,
+  Borrow,
+  Withdraw,
+  Repay,
+  EnableCollateral,
+  DisableCollateral
+}
 export type HypotheticalStats = {
   newBorrowLimit: CurrencyAmount;
   newBorrowUtilization: number;