@aurigami/sdk 0.3.0 → 0.3.4

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.4",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "typescript": "^4.5.4"
   },
   "dependencies": {
-    "@aurigami/contracts": "^1.0.1",
+    "@aurigami/contracts": "^1.1.1",
     "axios": "^0.24.0",
     "bignumber.js": "^9.0.2",
     "ethers": "^5.0.0"

package/src/MoneyMarket.ts

@@ -45,13 +45,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
   }
 
   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);
+    var speeds = await this._auriLens.getRewardSpeeds(this._comptroller.address, this.auToken.address);
     return speeds;
   }
   public async getTotalTokenBorrowed(): Promise<TokenAmount> {

package/src/SDK.ts

@@ -39,7 +39,6 @@ export class SdkRead extends BlockchainEntityRead {
   }
 
   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;
@@ -59,7 +58,6 @@ export class SdkRead extends BlockchainEntityRead {
   public async getUserDetails(userAddress: string): Promise<UserDetails> {
     const marketCount = networkAddresses.auTokens.length;
     var userMarketDetails: UserMarketDetails[] = [], assetsIn: string[];
-    var collateralRatio: BigNumber[] = new Array(marketCount);
     var promises = [];
     var totalBorrowLimit = new BigNumber(0);
     var pricePromises = [];
@@ -70,7 +68,7 @@ export class SdkRead extends BlockchainEntityRead {
       const moneyMarket: MoneyMarketRead = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
       promises.push(moneyMarket.getUserDepositBalance(userAddress).then((res: TokenAmount) => {userMarketDetail.depositBalance = res}));
       promises.push(moneyMarket.getUserBorrowBalance(userAddress).then((res: TokenAmount) => {userMarketDetail.borrowBalance = res}));
-      promises.push(moneyMarket.getCollateralRatio().then((res: BigNumber) => {collateralRatio[i] = res}));
+      promises.push(moneyMarket.getCollateralRatio().then((res: BigNumber) => {userMarketDetail.collateralRatio = res.toNumber()}));
       pricePromises.push(fetchPrice(moneyMarket.underlying.address, this._networkConnection.provider));
     }
 
@@ -82,19 +80,19 @@ export class SdkRead extends BlockchainEntityRead {
 
     for (var i = 0; i < marketCount; i ++) {
       const auToken = networkAddresses.auTokens[i];
-      if (assetsIn!.filter((auAddress: Address) => {
-        isSameAddress(auToken.address, auAddress)
-      }).length > 0) {
+      if (assetsIn!.find((auAddress: Address) => isSameAddress(auToken.address, auAddress)) !== undefined) {
         userMarketDetails[i].isCollateral = true;
+      } else {
+        userMarketDetails[i].isCollateral = false;
       }
       depositValuationPromises.push(fetchValuation(userMarketDetails[i].depositBalance, this._networkConnection.provider, 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(collateralRatio[index]));
+      if (userMarketDetails[index].isCollateral) return p.plus(v.multipliedBy(userMarketDetails[index].collateralRatio));
       return p;
-    })
+    }, new BigNumber(0))
 
     promises = [];
     var accountLiquidity: [BN, BN, BN], rewardBalancesMetadata, lockedAmount: BN;
@@ -141,7 +139,6 @@ 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;  
     }));

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
@@ -36,49 +36,49 @@ export type NetworkAddresses = {
 export const networkAddresses: NetworkAddresses = {
   auTokens: [
     {
-      address: '0xA21d86e113f161fa05d3cf767ef19Ccec1BD4889'.toLowerCase(),
-      underlying: '0x9Daf3f62cE9e53B8cd850a1ad392b632eAF7419F'.toLowerCase()
+      address: '0x2dEf6eb801757655AD227110d65C80DB595bBc60'.toLowerCase(),
+      underlying: '0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
     },
     {
-      address: '0xFa4A1B4137B66d69E5af8a0f63591D62A8c14446'.toLowerCase(),
+      address: '0x7b47690b04494A628151Dbb86B4cC95CF2629B14'.toLowerCase(),
       underlying: ETHAddress.toLowerCase()
     },
     {
-      address: '0x1B8A94C4C9A1496E274B153e0756F1836AeaBB30'.toLowerCase(),
-      underlying: '0x68862668FEdd002dA008596A56C5ea29921E94e6'.toLowerCase()
+      address: '0xFB0e4680B8b1c7B69fb6a3988029c74fea871DD9'.toLowerCase(),
+      underlying: '0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
     },
     {
-      address: '0x5f8E0b6b049fecabC16AD7d23b5F311c48555fA6'.toLowerCase(),
-      underlying: '0xc0a00D761E569007a707aA84A9A08837cb6A04c1'.toLowerCase()
+      address: '0x6bB82009b316A9098C23E3962b4371E879c8D23D'.toLowerCase(),
+      underlying: '0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
     },
     {
-      address: '0xeee0A0BC4dc3999136f35f82DdaAC3c27Ed05017'.toLowerCase(),
-      underlying: '0x5231CfaF5BD3Aa0C9423703a72706B2D40f0b783'.toLowerCase()
+      address: '0xBf43057c634868251e65e39b4f27662f644454b4'.toLowerCase(),
+      underlying: '0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
     },
     {
-      address: '0x9Fc4f60DC140645978C53703acE6241448cFEaA8'.toLowerCase(),
-      underlying: '0xf7c51293c5eE5c76867d8Cf400627627a4Bd8697'.toLowerCase()
+      address: '0x83Ae17f197C1F1260543d4D5A710772761535066'.toLowerCase(),
+      underlying: '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79'.toLowerCase()
     },
     {
-      address: '0x533dBEC840f10f51B868453f86BDF211Fbc52Ba4'.toLowerCase(),
-      underlying: '0xaa847c16359bAA930ba8a5E8b6e41D6b63ABe505'.toLowerCase(),
+      address: '0xcC5CA0156317C1FF2A96E0f45659625081352071'.toLowerCase(),
+      underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase(),
     },
     {
-      address: '0xDA748E324F4e05e1D9f517242C928A01C418c910'.toLowerCase(),
-      underlying: '0x206EA0Ae49F80d0376d04932479e33Cf2098211A'.toLowerCase()
+      address: '0x173Bf18675D52B4887C5d40E935C3ab1192aFb4C'.toLowerCase(),
+      underlying: '0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0x77499F2F82cF45F34287816875794363098cD3e1".toLowerCase(),
-    oracle: "0x38d71afF809941Cd67938f44a827E11F322e8859".toLowerCase(),
-    AURIFAIRLAUNCH: "0x7B0a44390d6be7772438767c392868Db493f85e5".toLowerCase(),
-    AURILENS: '0xF48698990DaEA17a5efAca49293e68c589E292D4'.toLowerCase(),
-    TOKENLOCK: '0x5D2Be450734e880776D21942A6297F6492A35cfD'.toLowerCase()
+    COMPTROLLER: "0x3b416D37A85F7aD941e36258d4Da660A1898E181".toLowerCase(),
+    oracle: "0x08A74ca75BAE803e92752f8d7A5cD718b1cA6509".toLowerCase(),
+    AURIFAIRLAUNCH: "0xeed0433Cbc81F25061bb739Ff8f1D5736b16d038".toLowerCase(),
+    AURILENS: '0xb11820C3d8ae1f6C31047644C59190280651C9da'.toLowerCase(),
+    TOKENLOCK: '0x537754515509A83Ce2D076c0982292AC5289b408'.toLowerCase()
   },
   tokens: {
-    AURORA: "0xf7c51293c5eE5c76867d8Cf400627627a4Bd8697".toLowerCase(),
-    PLY: "0x206EA0Ae49F80d0376d04932479e33Cf2098211A".toLowerCase(),
-    AURPLY: dummyAddress.toLowerCase()
+    AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
+    PLY: "0xb9b8d9e5557381BF025f1A59B602ad3F19A4e4Be".toLowerCase(),
+    AURPLY: "0x822E871518C22E8570cFbEa43FddbBFF963d4bdE".toLowerCase()
   }
 }
 

package/src/decimals.ts

@@ -1,18 +1,19 @@
 export const decimalRecords: Record<string, number> = {
     '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-    '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
-  }
+    '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/types.ts

@@ -53,6 +53,7 @@ export type UserMarketDetails = {
   borrowBalance: TokenAmount;
   isCollateral: boolean;
   maxWithdrawableAmount: TokenAmount;
+  collateralRatio: number;
 };
 
 export type PlyAuroraPoolDetails = {