@aurigami/sdk 0.4.2 → 0.5.1

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.2",
+  "version": "0.5.1",
   "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()), 
@@ -189,7 +187,6 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       totalDeposit.toString()
     )
   }
-
   
 }
 
@@ -205,13 +202,22 @@ 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> {
+    var repayAmount: BN;
+    if (new BigNumber(amount.rawAmount()).lt(0)) {
+      repayAmount = INF;
+    } else {
+      repayAmount = BN.from(amount.rawAmount());
+    }
     if (isSameAddress(amount.token.address, ETHAddress)) {
-      return (this.auToken as AuETH).connect(this._networkConnection.signer!).repayBorrow({value: amount.rawAmount()});
+      return (this.auToken as AuETH).connect(this._networkConnection.signer!).repayBorrow({value: repayAmount});
     } else {
-      return (this.auToken as AuErc20).connect(this._networkConnection.signer!).repayBorrow(amount.rawAmount());
+      return (this.auToken as AuErc20).connect(this._networkConnection.signer!).repayBorrow(repayAmount);
     }
   }
   public async enableCollateral(): Promise<TransactionResponse> {

package/src/SDK.ts

@@ -7,14 +7,15 @@ import {
   UserMarketDetails,
   Address,
   CurrencyAmount,
-  HypotheticalStats
+  HypotheticalStats,
+  MarketAction
 } from './types';
 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';
@@ -23,6 +24,7 @@ import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/Au
 import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
 import TokenLockABI from "@aurigami/contracts/artifacts/contracts/TokenLock.sol/TokenLock.json";
 import AuriFairLaunchABI from "@aurigami/contracts/artifacts/contracts/AuriFairLaunch.sol/AuriFairLaunch.json";
+import FaucetABI from "./abis/dummy.json"; //To-do
 
 export class SdkRead extends BlockchainEntityRead {
 
@@ -79,8 +81,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 +89,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;
@@ -196,15 +196,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()
     }
   }
 }
@@ -223,6 +253,10 @@ export class SdkReadWrite extends SdkRead {
   public async unstake(amount: TokenAmount): Promise<TransactionResponse> {
     return this._auriFairLaunch.connect(this._networkConnection.signer!).withdraw(AurPlyPid, amount.rawAmount());
   }
+  public async faucetDrip(): Promise<TransactionResponse> {
+    const faucet = new Contract(networkAddresses.misc.FAUCET, FaucetABI.abi, this._networkConnection.provider);
+    return faucet.connect(this._networkConnection.signer!).drip();
+  }
 }
 
 export class SDK extends BlockchainEntity {

package/src/constants.ts

@@ -1,11 +1,11 @@
 import BigNumber from 'bignumber.js';
-import { ethers, Signer} from 'ethers';
+import { ethers, Signer, BigNumber as BN} from 'ethers';
 export const dummyAddress: string = "0xDEADbeEfEEeEEEeEEEeEEeeeeeEeEEeeeeEEEEeE";
 export const ETHAddress: string = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
 export const AURORA_CHAINID = 1313161554;
 
-export const DECIMAL_PRECISION = 6;
+export const DECIMAL_PRECISION = 10;
 
 export type NetworkAddresses = {
   auTokens: {
@@ -18,49 +18,37 @@ export type NetworkAddresses = {
 export const networkAddresses: NetworkAddresses = {
   auTokens: [
     {
-      address: '0x2dEf6eb801757655AD227110d65C80DB595bBc60'.toLowerCase(),
+      address: '0x8bA0b797F3A965C12EF49d924d154B71d63316b5'.toLowerCase(),
       underlying: '0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
     },
     {
-      address: '0x7b47690b04494A628151Dbb86B4cC95CF2629B14'.toLowerCase(),
+      address: '0xA2926acb1BEdBC827000FCA08D4279aC3Bb6a443'.toLowerCase(),
       underlying: ETHAddress.toLowerCase()
     },
     {
-      address: '0xFB0e4680B8b1c7B69fb6a3988029c74fea871DD9'.toLowerCase(),
+      address: '0x4176c37161E1873FA08C8301c45D4cC02293AF44'.toLowerCase(),
       underlying: '0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
     },
     {
-      address: '0x6bB82009b316A9098C23E3962b4371E879c8D23D'.toLowerCase(),
+      address: '0xaE1B4372e6881f69Caeb44D0793ed710bb345278'.toLowerCase(),
       underlying: '0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
     },
     {
-      address: '0xBf43057c634868251e65e39b4f27662f644454b4'.toLowerCase(),
+      address: '0x3d3b76B7E62a1f1bB08684933F63215e0582a149'.toLowerCase(),
       underlying: '0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
-    },
-    {
-      address: '0x83Ae17f197C1F1260543d4D5A710772761535066'.toLowerCase(),
-      underlying: '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79'.toLowerCase()
-    },
-    {
-      address: '0xcC5CA0156317C1FF2A96E0f45659625081352071'.toLowerCase(),
-      underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase(),
-    },
-    {
-      address: '0x173Bf18675D52B4887C5d40E935C3ab1192aFb4C'.toLowerCase(),
-      underlying: '0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0x3b416D37A85F7aD941e36258d4Da660A1898E181".toLowerCase(),
-    oracle: "0x08A74ca75BAE803e92752f8d7A5cD718b1cA6509".toLowerCase(),
-    AURIFAIRLAUNCH: "0xeed0433Cbc81F25061bb739Ff8f1D5736b16d038".toLowerCase(),
-    AURILENS: '0xb11820C3d8ae1f6C31047644C59190280651C9da'.toLowerCase(),
-    TOKENLOCK: '0x537754515509A83Ce2D076c0982292AC5289b408'.toLowerCase()
+    COMPTROLLER: "0x448717B7Be11C3fb7AA7f0284f28B399D0004fE1".toLowerCase(),
+    oracle: "0xfD47837a18ad6a72F564903a7E5162286E059224".toLowerCase(),
+    AURIFAIRLAUNCH: "0x986e3ac1bC3C02714C9Bfd73Cd6a206F10600b4c".toLowerCase(),
+    AURILENS: '0xE770e5f08251622F368Bf1a449E072627Ff6cB62'.toLowerCase(),
+    TOKENLOCK: '0xE130E307eF5b5c157FB233320b7ebD08f2fD320A'.toLowerCase()
   },
   tokens: {
-    AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
-    PLY: "0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be".toLowerCase(),
-    AURPLY: "0x822E871518C22E8570cFbEa43FddbBFF963d4bdE".toLowerCase()
+    AURORA: "0x8BEc47865aDe3B172A928df8f990Bc7f2A3b9f79".toLowerCase(),
+    PLY: "0x706bd3b9473126D2E7dCA097d7AAc5dB74918E6c".toLowerCase(),
+    AURPLY: "0x95890d73F2995E621F6A66EF9b71413926845542".toLowerCase()
   }
 }
 
@@ -73,4 +61,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/decimals.ts

@@ -1,19 +1,15 @@
 export const decimalRecords: Record<string, number> = {
     '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-    '0xb9b8d9e5557381bf025f1a59b602ad3f19a4e4be': 18,
-    '0x83ae17f197c1f1260543d4d5a710772761535066': 8,
+    '0x4176c37161e1873fa08c8301c45d4cc02293af44': 8,
+    '0x95890d73f2995e621f6a66ef9b71413926845542': 18,
+    '0x3d3b76b7e62a1f1bb08684933f63215e0582a149': 8,
     '0xf4eb217ba2454613b15dbdea6e5f22276410e89e': 8,
-    '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
-    '0xfb0e4680b8b1c7b69fb6a3988029c74fea871dd9': 8,
+    '0x8ba0b797f3a965c12ef49d924d154b71d63316b5': 8,
     '0xb12bfca5a55806aaf64e99521918a4bf0fc40802': 6,
-    '0xbf43057c634868251e65e39b4f27662f644454b4': 8,
-    '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24,
-    '0x7b47690b04494a628151dbb86b4cc95cf2629b14': 8,
-    '0x822e871518c22e8570cfbea43fddbbff963d4bde': 18,
-    '0x2def6eb801757655ad227110d65c80db595bbc60': 8,
-    '0x6bb82009b316a9098c23e3962b4371e879c8d23d': 8,
+    '0x706bd3b9473126d2e7dca097d7aac5db74918e6c': 18,
     '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
-    '0xcc5ca0156317c1ff2a96e0f45659625081352071': 8,
-    '0xe3520349f477a5f6eb06107066048508498a291b': 18,
-    '0x173bf18675d52b4887c5d40e935c3ab1192afb4c': 8
-}
+    '0xae1b4372e6881f69caeb44d0793ed710bb345278': 8,
+    '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
+    '0xa2926acb1bedbc827000fca08d4279ac3bb6a443': 8,
+    '0xe3520349f477a5f6eb06107066048508498a291b': 18
+  }

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 === undefined) {
-        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;