@aurigami/sdk 0.2.6 → 0.3.0

package/src/MoneyMarket.ts

@@ -4,20 +4,31 @@ import { Contract, BigNumber as BN } from 'ethers';
 import AuErc20ABI from '@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuErc20.json';
 import AuETHABI from '@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json';
 import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
-import { AuErc20, AuETH, Comptroller } from "@aurigami/contracts/typechain";
+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 } from "./constants";
+import { networkAddresses, ETHAddress, ONE_YEAR } from "./constants";
 import BigNumber from "bignumber.js";
-import { decimalFactor, isSameAddress } from './helpers';
-import { Token } from './token';
+import { decimalFactor, isSameAddress, calcLMRewardApr } from './helpers';
+import { Token, PLYToken } from './token';
 import { TokenAmount } from './tokenAmount';
 import { getDecimal, validateAndParseAddress } from './helpers';
-import { calcLMRewardApr, DECIMAL_PRECISION, fetchPrice, fetchPriceFromCoingecko, ONE_YEAR, PLYToken } from '.';
+import { fetchPrice, fetchValuation } from "./priceFetcher";
+
+
+type RewardSpeeds = {
+  plyRewardSupplySpeed: BN;
+  plyRewardBorrowSpeed: BN;
+  auroraRewardSupplySpeed: BN;
+  auroraRewardBorrowSpeed: BN;
+}
 
 export class MoneyMarketRead extends BlockchainEntityRead {
   public underlying: Token;
   public auToken: AuErc20 | AuETH;
   protected _comptroller: Comptroller;
+
+  protected _auriLens: AuriLens;
   constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address) {
     super(networkConnection);
     if (isSameAddress(underlyingAsset, ETHAddress)) {
@@ -30,8 +41,19 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       getDecimal(underlyingAsset),
     );
     this._comptroller = new Contract(networkAddresses.misc.COMPTROLLER, ComptrollerABI.abi, networkConnection.provider) as Comptroller;
+    this._auriLens = new Contract(networkAddresses.misc.AURILENS, AuriLensABI.abi, networkConnection.provider) as AuriLens;
   }
 
+  protected async getRewardSpeeds(): Promise<RewardSpeeds> {
+    var promises = [];
+    var speeds = {} as RewardSpeeds;
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, true).then((res: BN) => {speeds.plyRewardSupplySpeed = res}));
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, false).then((res: BN) => {speeds.plyRewardBorrowSpeed = res}));
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.AURORA, this.auToken.address, true).then((res: BN) => {speeds.auroraRewardSupplySpeed = res}));
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.AURORA, this.auToken.address, false).then((res: BN) => {speeds.auroraRewardBorrowSpeed = res}));
+    await Promise.all(promises);
+    return speeds;
+  }
   public async getTotalTokenBorrowed(): Promise<TokenAmount> {
     return new TokenAmount(
       this.underlying,
@@ -77,7 +99,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     var promises = [];
     var totalBorrowed: TokenAmount, rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
     promises.push(this.getTotalTokenBorrowed().then((res: TokenAmount) => {totalBorrowed = res}));
-    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, false).then((res) => {
       rewardSpeed = new TokenAmount(
         PLYToken,
         res.toString()
@@ -94,7 +116,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     var promises = [];
     var totalDeposited: TokenAmount, rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
     promises.push(this.getTotalTokenDeposited().then((res: TokenAmount) => {totalDeposited = res}));
-    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
+    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address, true).then((res) => {
       rewardSpeed = new TokenAmount(
         PLYToken,
         res.toString()
@@ -114,22 +136,37 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     promises.push(this.getBorrowAPY().then((res: BigNumber) => {borrowAPY = res.toNumber()}));
     promises.push(this.getCollateralRatio().then((res: BigNumber) => {collateralRatio = res.toNumber()}));
     
-    var rewardSpeed: TokenAmount, plyPrice: BigNumber, underlyingPrice: BigNumber;
-    promises.push(this._comptroller.rewardSpeeds(ComptrollerRewardType.PLY, this.auToken.address).then((res) => {
-      rewardSpeed = new TokenAmount(
-        PLYToken,
-        res.toString()
-      )
-    }));
+    var plyPrice: BigNumber, underlyingPrice: BigNumber, rewardSpeeds: RewardSpeeds;
+    promises.push(this.getRewardSpeeds().then((res) => {rewardSpeeds = res}));
     promises.push(fetchPrice(networkAddresses.tokens.PLY, this._networkConnection.provider).then((res) => {plyPrice = res}));
     promises.push(fetchPrice(this.underlying.address, this._networkConnection.provider).then((res) => {underlyingPrice = res}));
     
     await Promise.all(promises);
     
-    var borrowPlyApy = calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
-      underlyingPrice!.multipliedBy(totalBorrowed!.formattedAmount()), ONE_YEAR);
-    var depositPlyApy = calcLMRewardApr(plyPrice!.multipliedBy(rewardSpeed!.formattedAmount()),
-      underlyingPrice!.multipliedBy(totalDeposited!.formattedAmount()), ONE_YEAR);
+    var borrowPlyApy = calcLMRewardApr(
+      await fetchValuation(
+        new TokenAmount(
+          PLYToken,
+          rewardSpeeds!.plyRewardBorrowSpeed.toString()
+        ), 
+        this._networkConnection.provider, 
+        plyPrice!
+      ),
+      underlyingPrice!.multipliedBy(totalBorrowed!.formattedAmount()), 
+      ONE_YEAR
+    );
+    var depositPlyApy = calcLMRewardApr(
+      await fetchValuation(
+        new TokenAmount(
+          PLYToken,
+          rewardSpeeds!.plyRewardSupplySpeed.toString()
+        ), 
+        this._networkConnection.provider, 
+        plyPrice!
+      ),
+      underlyingPrice!.multipliedBy(totalDeposited!.formattedAmount()), 
+      ONE_YEAR
+    );
 
     return {
       auTokenAddress: this.auToken.address,

package/src/SDK.ts

@@ -14,11 +14,11 @@ 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 { AuriFairLaunch, Comptroller, TokenLock } from '@aurigami/contracts/typechain';
+import { AuriFairLaunch, Comptroller, TokenLock, AuriLens } from '@aurigami/contracts/typechain';
 import { TokenAmount } from './tokenAmount';
 import { AURPLYToken, PLYToken, Token } from './token';
 import BigNumber from 'bignumber.js';
-import IERC20 from '@aurigami/contracts/artifacts/contracts/EIP20Interface.sol/EIP20Interface.json';
+import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
 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";
@@ -35,10 +35,11 @@ export class SdkRead extends BlockchainEntityRead {
     this._comptroller = new Contract(networkAddresses.misc.COMPTROLLER, ComptrollerABI.abi, networkConnection.provider) as Comptroller;
     this._tokenLock = new Contract(networkAddresses.misc.TOKENLOCK, TokenLockABI.abi, networkConnection.provider) as TokenLock;
     this._auriFairLaunch = new Contract(networkAddresses.misc.AURIFAIRLAUNCH, AuriFairLaunchABI.abi, networkConnection.provider) as AuriFairLaunch;
-    this._auriLens = new Contract(networkAddresses.misc.AURILENS, dummyABI.abi, networkConnection.provider); //To-do
+    this._auriLens = new Contract(networkAddresses.misc.AURILENS, AuriLensABI.abi, networkConnection.provider) as AuriLens;
   }
 
   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;
@@ -50,15 +51,15 @@ export class SdkRead extends BlockchainEntityRead {
     });
     return {
       vestingStart: REWARDCLAIMSTART, // 10 Jan 2023
-      currentUnlockPortion: new BigNumber(values[0]).div(denominator).toNumber(),
-      nextUnlockPortion: new BigNumber(values[1]).div(denominator).toNumber(),
+      currentUnlockPortion: (new BigNumber(denominator).minus(values[0])).div(denominator).toNumber(),
+      nextUnlockPortion: (new BigNumber(denominator).minus(values[1])).div(denominator).toNumber(),
     };
   }
 
   public async getUserDetails(userAddress: string): Promise<UserDetails> {
     const marketCount = networkAddresses.auTokens.length;
     var userMarketDetails: UserMarketDetails[] = [], assetsIn: string[];
-    var collateralRatio: BigNumber[];
+    var collateralRatio: BigNumber[] = new Array(marketCount);
     var promises = [];
     var totalBorrowLimit = new BigNumber(0);
     var pricePromises = [];
@@ -98,7 +99,7 @@ export class SdkRead extends BlockchainEntityRead {
     promises = [];
     var accountLiquidity: [BN, BN, BN], rewardBalancesMetadata, lockedAmount: BN;
     promises.push(this._comptroller.getAccountLiquidity(userAddress));
-    promises.push(this._auriLens.getRewardBalancesMetadata(this._comptroller.address, userAddress));
+    promises.push(this._auriLens.callStatic.getRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, userAddress, [AurPlyPid]));
     promises.push(this._tokenLock.lockedAmounts(userAddress));
     var values = await Promise.all(promises);
     accountLiquidity = values[0]; rewardBalancesMetadata = values[1]; lockedAmount = values[2];
@@ -140,6 +141,7 @@ export class SdkRead extends BlockchainEntityRead {
     var stakedLiquidity: BN, rewardPerSecond: BN; 
     var promises = [];
     promises.push(this._auriFairLaunch.getPoolInfo(AurPlyPid).then((res) => {
+      console.log(res)
       stakedLiquidity =  res.totalStake;
       rewardPerSecond = res.rewardPerSecond;  
     }));
@@ -155,6 +157,7 @@ export class SdkRead extends BlockchainEntityRead {
       AURPLYToken,
       stakedLiquidity!.toString()
     ), this._networkConnection.provider).then((res) => totalStakeValuation = res));
+    await Promise.all(promises);
 
     return {
       totalStakedLiquidity: new TokenAmount(
@@ -186,7 +189,6 @@ export class SdkReadWrite extends SdkRead {
     return this._auriLens.connect(this._networkConnection.signer!).claimRewards(
       this._comptroller.address,
       this._auriFairLaunch.address,
-      await this._networkConnection.signer!.getAddress(),
       [AurPlyPid]
     );
   }

package/src/constants.ts

@@ -19,7 +19,7 @@ export const ETHAddress: string = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
 const dummyPrivateKey =
   '1111111111111111111111111111111111111111111111111111111111111111';
-export const AVAX_DEFAULT_SIGNER: Signer = new ethers.Wallet(dummyPrivateKey);
+export const AURORA_DEFAULT_SIGNER: Signer = new ethers.Wallet(dummyPrivateKey, AURORA_DEFAULT_PROVIDER);
 
 export const AURORA_CHAINID = 1313161554;
 
@@ -36,67 +36,59 @@ export type NetworkAddresses = {
 export const networkAddresses: NetworkAddresses = {
   auTokens: [
     {
-      address: '0x7967532568bef9ec96cfad6badea4c63add5888a',
-      underlying: '0x9738319d4b8a95a9b3cfd99419dbf859904f23d8'
+      address: '0xA21d86e113f161fa05d3cf767ef19Ccec1BD4889'.toLowerCase(),
+      underlying: '0x9Daf3f62cE9e53B8cd850a1ad392b632eAF7419F'.toLowerCase()
     },
     {
-      address: '0x96AAD2c3fde982627d531f45D1Bebd8bE3b86f60',
-      underlying: ETHAddress
+      address: '0xFa4A1B4137B66d69E5af8a0f63591D62A8c14446'.toLowerCase(),
+      underlying: ETHAddress.toLowerCase()
     },
     {
-      address: '0xccf005cfc3669d806a03f0617885648c397c456e',
-      underlying: '0x959bf9bf41062e9cac0e60cacbaa441fbc8946c6'
+      address: '0x1B8A94C4C9A1496E274B153e0756F1836AeaBB30'.toLowerCase(),
+      underlying: '0x68862668FEdd002dA008596A56C5ea29921E94e6'.toLowerCase()
     },
     {
-      address: '0x55a4c111c007f39326edf22cfd63bbbb21a35b35',
-      underlying: '0x1c67cb984abdf7f0a6bce2fd5d5e662e0b983369'
+      address: '0x5f8E0b6b049fecabC16AD7d23b5F311c48555fA6'.toLowerCase(),
+      underlying: '0xc0a00D761E569007a707aA84A9A08837cb6A04c1'.toLowerCase()
     },
     {
-      address: '0x77b088236c071ab5bd4e0bd21240b093275adffc',
-      underlying: '0x675c7e1d48f88329c6b4cd3867db5f10a69cda18'
+      address: '0xeee0A0BC4dc3999136f35f82DdaAC3c27Ed05017'.toLowerCase(),
+      underlying: '0x5231CfaF5BD3Aa0C9423703a72706B2D40f0b783'.toLowerCase()
     },
     {
-      address: '0xaa68274f87fd9ae940f1dec31b643486838481c1',
-      underlying: '0x7a80df8230c5aa711e2702a275ab31aeb32754bf'
+      address: '0x9Fc4f60DC140645978C53703acE6241448cFEaA8'.toLowerCase(),
+      underlying: '0xf7c51293c5eE5c76867d8Cf400627627a4Bd8697'.toLowerCase()
     },
     {
-      address: '0x6970167dfaa2aaa67404204102cbbd18b405eca9',
-      underlying: '0x1dc7d4990b1edb9a88f3fa7d899864b69ee2c428',
+      address: '0x533dBEC840f10f51B868453f86BDF211Fbc52Ba4'.toLowerCase(),
+      underlying: '0xaa847c16359bAA930ba8a5E8b6e41D6b63ABe505'.toLowerCase(),
     },
     {
-      address: '0x9630a6c5b729194972199805075fd76707a9713a',
-      underlying: '0x6f8a1daa158e08f75711a64e5a3073e959d688a6'
+      address: '0xDA748E324F4e05e1D9f517242C928A01C418c910'.toLowerCase(),
+      underlying: '0x206EA0Ae49F80d0376d04932479e33Cf2098211A'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0xb51028d4f3fc69e3f9e3118ce067a4562c595aad",
-    oracle: "0xf1ebfaa2af93f4d82215fd7817c1835853c62fb8",
-    AURIFAIRLAUNCH: "0x7942874a9ef8059c5de259625a883dc61f03320d",
-    AURILENS: '0xa2635a23a7688cd3acdd07713c4943b2f0f9082c'
+    COMPTROLLER: "0x77499F2F82cF45F34287816875794363098cD3e1".toLowerCase(),
+    oracle: "0x38d71afF809941Cd67938f44a827E11F322e8859".toLowerCase(),
+    AURIFAIRLAUNCH: "0x7B0a44390d6be7772438767c392868Db493f85e5".toLowerCase(),
+    AURILENS: '0xF48698990DaEA17a5efAca49293e68c589E292D4'.toLowerCase(),
+    TOKENLOCK: '0x5D2Be450734e880776D21942A6297F6492A35cfD'.toLowerCase()
   },
   tokens: {
-    AURORA: "0x7a80df8230c5aa711e2702a275ab31aeb32754bf",
-    PLY: "0x6f8a1daa158e08f75711a64e5a3073e959d688a6",
-    AURPLY: dummyAddress
+    AURORA: "0xf7c51293c5eE5c76867d8Cf400627627a4Bd8697".toLowerCase(),
+    PLY: "0x206EA0Ae49F80d0376d04932479e33Cf2098211A".toLowerCase(),
+    AURPLY: dummyAddress.toLowerCase()
   }
-  // auTokens: [
-  //   {
-  //     address: "0x0222cd9f9079140d12980ffcb39851694533436c",
-  //     underlying: "0xb12bfca5a55806aaf64e99521918a4bf0fc40802"
-  //   },
-  //   {
-  //     address: 
-  //   }
-  // ]
 }
 
 export const BORROW_LIMIT_BUFFER = new BigNumber(0.95);
 
-export const REWARDCLAIMSTART = 1673280000;
+export const REWARDCLAIMSTART = 1640995200;
 
 export const ONE_DAY = 86400;
 
 export const ONE_YEAR = ONE_DAY * 365;
 
-export const AurPlyPid = 1;
+export const AurPlyPid = 0;
 

package/src/decimals.ts

@@ -1,18 +1,18 @@
 export const decimalRecords: Record<string, number> = {
     '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-    '0x9738319d4b8a95a9b3cfd99419dbf859904f23d8': 18,
-    '0x1dc7d4990b1edb9a88f3fa7d899864b69ee2c428': 18,
-    '0x1c67cb984abdf7f0a6bce2fd5d5e662e0b983369': 18,
-    '0x675c7e1d48f88329c6b4cd3867db5f10a69cda18': 18,
-    '0xaa68274f87fd9ae940f1dec31b643486838481c1': 8,
-    '0x96AAD2c3fde982627d531f45D1Bebd8bE3b86f60': 8,
-    '0x6970167dfaa2aaa67404204102cbbd18b405eca9': 8,
-    '0x6f8a1daa158e08f75711a64e5a3073e959d688a6': 18,
-    '0xccf005cfc3669d806a03f0617885648c397c456e': 8,
-    '0x959bf9bf41062e9cac0e60cacbaa441fbc8946c6': 18,
-    '0x7a80df8230c5aa711e2702a275ab31aeb32754bf': 18,
-    '0x9630a6c5b729194972199805075fd76707a9713a': 8,
-    '0x77b088236c071ab5bd4e0bd21240b093275adffc': 8,
-    '0x7967532568bef9ec96cfad6badea4c63add5888a': 8,
-    '0x55a4c111c007f39326edf22cfd63bbbb21a35b35': 8
-}
+    '0x5231cfaf5bd3aa0c9423703a72706b2d40f0b783': 18,
+    '0x5f8e0b6b049fecabc16ad7d23b5f311c48555fa6': 8,
+    '0xfa4a1b4137b66d69e5af8a0f63591d62a8c14446': 8,
+    '0xa21d86e113f161fa05d3cf767ef19ccec1bd4889': 8,
+    '0xf7c51293c5ee5c76867d8cf400627627a4bd8697': 18,
+    '0xc0a00d761e569007a707aa84a9a08837cb6a04c1': 18,
+    '0x206ea0ae49f80d0376d04932479e33cf2098211a': 18,
+    '0x9fc4f60dc140645978c53703ace6241448cfeaa8': 8,
+    '0xeee0a0bc4dc3999136f35f82ddaac3c27ed05017': 8,
+    '0x1b8a94c4c9a1496e274b153e0756f1836aeabb30': 8,
+    '0x533dbec840f10f51b868453f86bdf211fbc52ba4': 8,
+    '0xaa847c16359baa930ba8a5e8b6e41d6b63abe505': 18,
+    '0x9daf3f62ce9e53b8cd850a1ad392b632eaf7419f': 18,
+    '0x68862668fedd002da008596a56c5ea29921e94e6': 18,
+    '0xda748e324f4e05e1d9f517242c928a01c418c910': 8
+  }

package/src/helpers.ts

@@ -16,9 +16,10 @@ export const isSameAddress = (address1: Address, address2: Address): boolean =>
 }
 
 export const getCurrentTimestamp = async (provider: providers.Provider): Promise<number> => {
-  const latestBlockNumber = await provider.getBlockNumber();
-  const currentTime: number = (await provider.getBlock(latestBlockNumber)).timestamp;
-  return currentTime;
+  // const latestBlockNumber = await provider.getBlockNumber();
+  // const currentTime: number = (await provider.getBlock(latestBlockNumber)).timestamp;
+  // return currentTime;
+  return Math.trunc(Date.now() / 1000)
 }
 
 export function validateAndParseAddress(address: Address): Address {

package/src/priceFetcher.ts

@@ -74,7 +74,6 @@ function processPriceFromOracle(rawPrice: BN, underlyingDecimal: number) {
 }
 export async function fetchPriceFromOracle(auTokenAddress: Address, underlyingDecimal: number, provider: providers.Provider): Promise<BigNumber> {
     const oracleContract: PriceOracle = new Contract(networkAddresses.misc.oracle, OracleABI.abi, provider) as PriceOracle;
-    console.log(oracleContract.address, auTokenAddress);
     const rawPrice = await oracleContract.getUnderlyingPrice(auTokenAddress);
     return processPriceFromOracle(rawPrice, underlyingDecimal)
 }
@@ -105,5 +104,8 @@ export async function fetchPrice(address: Address, provider: providers.Provider)
     }
 }
 export async function fetchValuation(tokenAmount: TokenAmount, provider: providers.Provider, price?: BigNumber): Promise<BigNumber> {
-    return new BigNumber(0)
+    if (price === null) {
+        price = await fetchPrice(tokenAmount.token.address, provider);
+    }
+    return new BigNumber(tokenAmount.formattedAmount()).multipliedBy(price!);
 }