@aurigami/sdk 0.2.6 → 0.3.3

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,13 @@ 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 speeds = await this._auriLens.getRewardSpeeds(this._comptroller.address, this.auToken.address);
+    return speeds;
+  }
   public async getTotalTokenBorrowed(): Promise<TokenAmount> {
     return new TokenAmount(
       this.underlying,
@@ -77,7 +93,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 +110,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 +130,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 = [];
@@ -85,6 +86,8 @@ export class SdkRead extends BlockchainEntityRead {
         isSameAddress(auToken.address, auAddress)
       }).length > 0) {
         userMarketDetails[i].isCollateral = true;
+      } else {
+        userMarketDetails[i].isCollateral = false;
       }
       depositValuationPromises.push(fetchValuation(userMarketDetails[i].depositBalance, this._networkConnection.provider, underlyingPrices[i]));
     }
@@ -98,7 +101,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];
@@ -155,6 +158,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 +190,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

@@ -9,7 +9,7 @@ export const AVAX_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
   AVAX_DEFAULT_PROVIDER_URL
 );
 
-export const AURORA_DEFAULT_PROVIDER_URL = "https://testnet.aurora.dev";
+export const AURORA_DEFAULT_PROVIDER_URL = "https://mainnet.aurora.dev";
 
 export const AURORA_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
   AURORA_DEFAULT_PROVIDER_URL
@@ -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: '0x2dEf6eb801757655AD227110d65C80DB595bBc60'.toLowerCase(),
+      underlying: '0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
     },
     {
-      address: '0x96AAD2c3fde982627d531f45D1Bebd8bE3b86f60',
-      underlying: ETHAddress
+      address: '0x7b47690b04494A628151Dbb86B4cC95CF2629B14'.toLowerCase(),
+      underlying: ETHAddress.toLowerCase()
     },
     {
-      address: '0xccf005cfc3669d806a03f0617885648c397c456e',
-      underlying: '0x959bf9bf41062e9cac0e60cacbaa441fbc8946c6'
+      address: '0xFB0e4680B8b1c7B69fb6a3988029c74fea871DD9'.toLowerCase(),
+      underlying: '0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
     },
     {
-      address: '0x55a4c111c007f39326edf22cfd63bbbb21a35b35',
-      underlying: '0x1c67cb984abdf7f0a6bce2fd5d5e662e0b983369'
+      address: '0x6bB82009b316A9098C23E3962b4371E879c8D23D'.toLowerCase(),
+      underlying: '0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
     },
     {
-      address: '0x77b088236c071ab5bd4e0bd21240b093275adffc',
-      underlying: '0x675c7e1d48f88329c6b4cd3867db5f10a69cda18'
+      address: '0xBf43057c634868251e65e39b4f27662f644454b4'.toLowerCase(),
+      underlying: '0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
     },
     {
-      address: '0xaa68274f87fd9ae940f1dec31b643486838481c1',
-      underlying: '0x7a80df8230c5aa711e2702a275ab31aeb32754bf'
+      address: '0x83Ae17f197C1F1260543d4D5A710772761535066'.toLowerCase(),
+      underlying: '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79'.toLowerCase()
     },
     {
-      address: '0x6970167dfaa2aaa67404204102cbbd18b405eca9',
-      underlying: '0x1dc7d4990b1edb9a88f3fa7d899864b69ee2c428',
+      address: '0xcC5CA0156317C1FF2A96E0f45659625081352071'.toLowerCase(),
+      underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase(),
     },
     {
-      address: '0x9630a6c5b729194972199805075fd76707a9713a',
-      underlying: '0x6f8a1daa158e08f75711a64e5a3073e959d688a6'
+      address: '0x173Bf18675D52B4887C5d40E935C3ab1192aFb4C'.toLowerCase(),
+      underlying: '0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0xb51028d4f3fc69e3f9e3118ce067a4562c595aad",
-    oracle: "0xf1ebfaa2af93f4d82215fd7817c1835853c62fb8",
-    AURIFAIRLAUNCH: "0x7942874a9ef8059c5de259625a883dc61f03320d",
-    AURILENS: '0xa2635a23a7688cd3acdd07713c4943b2f0f9082c'
+    COMPTROLLER: "0x3b416D37A85F7aD941e36258d4Da660A1898E181".toLowerCase(),
+    oracle: "0x08A74ca75BAE803e92752f8d7A5cD718b1cA6509".toLowerCase(),
+    AURIFAIRLAUNCH: "0xeed0433Cbc81F25061bb739Ff8f1D5736b16d038".toLowerCase(),
+    AURILENS: '0xb11820C3d8ae1f6C31047644C59190280651C9da'.toLowerCase(),
+    TOKENLOCK: '0x537754515509A83Ce2D076c0982292AC5289b408'.toLowerCase()
   },
   tokens: {
-    AURORA: "0x7a80df8230c5aa711e2702a275ab31aeb32754bf",
-    PLY: "0x6f8a1daa158e08f75711a64e5a3073e959d688a6",
-    AURPLY: dummyAddress
+    AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
+    PLY: "0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be".toLowerCase(),
+    AURPLY: "0x822E871518C22E8570cFbEa43FddbBFF963d4bdE".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,19 @@
 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
+    '0xb9b8d9e5557381bf025f1a59b602ad3f19a4e4be': 18,
+    '0x83ae17f197c1f1260543d4d5a710772761535066': 8,
+    '0xf4eb217ba2454613b15dbdea6e5f22276410e89e': 8,
+    '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
+    '0xfb0e4680b8b1c7b69fb6a3988029c74fea871dd9': 8,
+    '0xb12bfca5a55806aaf64e99521918a4bf0fc40802': 6,
+    '0xbf43057c634868251e65e39b4f27662f644454b4': 8,
+    '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24,
+    '0x7b47690b04494a628151dbb86b4cc95cf2629b14': 8,
+    '0x822e871518c22e8570cfbea43fddbbff963d4bde': 18,
+    '0x2def6eb801757655ad227110d65c80db595bbc60': 8,
+    '0x6bb82009b316a9098c23e3962b4371e879c8d23d': 8,
+    '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
+    '0xcc5ca0156317c1ff2a96e0f45659625081352071': 8,
+    '0xe3520349f477a5f6eb06107066048508498a291b': 18,
+    '0x173bf18675d52b4887c5d40e935c3ab1192afb4c': 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!);
 }