@aurigami/sdk 0.5.2 → 0.5.6

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.2",
+  "version": "0.5.6",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "@aurigami/contracts": "^1.1.1",
+    "@aurigami/contracts": "^2.1.0",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.2",
     "dotenv": "^16.0.0",

package/src/SDK.ts

@@ -24,14 +24,14 @@ 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/Faucet.json";
+import FaucetABI from "@aurigami/contracts/artifacts/contracts/mock/Faucet.sol/Faucet.json";
 
 export class SdkRead extends BlockchainEntityRead {
 
   protected _comptroller: Comptroller;
   protected _tokenLock: TokenLock;
   protected _auriFairLaunch: AuriFairLaunch;
-  protected _auriLens: Contract; // To-do
+  protected _auriLens: AuriLens;
   constructor(networkConnection: NetworkConnection) {
     super(networkConnection);
     this._comptroller = new Contract(networkAddresses.misc.COMPTROLLER, ComptrollerABI.abi, networkConnection.provider) as Comptroller;
@@ -97,14 +97,19 @@ export class SdkRead extends BlockchainEntityRead {
       return p;
     }, new BigNumber(0))
 
-    promises = [];
-    var accountLiquidity: [BN, BN, BN], rewardBalancesMetadata, lockedAmount: BN;
-    promises.push(this._comptroller.getAccountLiquidity(userAddress));
-    promises.push(this._auriLens.callStatic.getRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, userAddress, [AurPlyPid]));
-    promises.push(this._tokenLock.lockedAmounts(userAddress));
+    promises = new Array(3);
+    var accountLiquidity: [BN, BN], rewardBalancesMetadata, lockedAmount: BN;
+    promises[0] = this._comptroller.getAccountLiquidity(userAddress);
+    promises[1] = this._auriLens.callStatic.claimAndGetRewardBalancesMetadata(this._comptroller.address, this._auriFairLaunch.address, [AurPlyPid], {from: userAddress}).catch((err: any) => {
+      return {
+        plyAccrued: BN.from(0)
+      }
+    });
+    promises[2] = this._tokenLock.lockedAmounts(userAddress);
     var values = await Promise.all(promises);
+
     accountLiquidity = values[0]; rewardBalancesMetadata = values[1]; lockedAmount = values[2];
-    var borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[1].toString()).div(decimalFactor(18)));
+    var borrowedvaluation: BigNumber = totalBorrowLimit.minus(new BigNumber(accountLiquidity[0].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);

package/src/constants.ts

@@ -54,7 +54,7 @@ export const networkAddresses: NetworkAddresses = {
     COMPTROLLER: "0x444e4662BdEcF02590AF47389dc4B76DbD5B020e".toLowerCase(),
     oracle: "0x4FEF75Fdb00Dcc9c25D53ba76B2778A34a8f483B".toLowerCase(),
     AURIFAIRLAUNCH: "0x9752aFD6ddb1edb3886537fa1DcD4392607Cbce0".toLowerCase(),
-    AURILENS: '0x4C3f48202DecAbCb10Fac5DB049a80722acbfc65'.toLowerCase(),
+    AURILENS: '0x4FbD62D837Ae38406aB4050B7e960dad7Fb177EC'.toLowerCase(),
     TOKENLOCK: '0x8726961E1d6Ddee44B70e34979159400e759A08D'.toLowerCase(),
     FAUCET: '0x34528465D80EbA8c21E827Ba3f6D73Fa247c1AcF'.toLowerCase()
   },

package/src/index.ts

@@ -1,5 +1,9 @@
-export * from './SDK';
+import { ethers } from 'ethers';
+import { Logger } from 'ethers/lib/utils';
+
+ethers.utils.Logger.setLogLevel(Logger.levels.ERROR);
 
+export * from './SDK';
 export * from './MoneyMarket';
 export * from './BlockchainEntity';
 export * from './helpers';