@aurigami/sdk 0.6.7 → 0.7.0

package/package.json

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

package/src/MoneyMarket.ts

@@ -5,8 +5,7 @@ import AuErc20ABI from '@aurigami/contracts/artifacts/contracts/AuErc20.sol/AuEr
 import AuETHABI from '@aurigami/contracts/artifacts/contracts/AuETH.sol/AuETH.json';
 import ComptrollerABI from '@aurigami/contracts/artifacts/contracts/Comptroller.sol/Comptroller.json';
 import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
-import EthRepayHelperABI from "@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json"
-import { AuErc20, AuETH, AuriLens, Comptroller, EthRepayHelper } from "@aurigami/contracts/typechain";
+import { AuErc20, AuETH, AuriLens, Comptroller } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import { networkAddresses, ETHAddress, ONE_YEAR, INF } from "./constants";
 import BigNumber from "bignumber.js";
@@ -139,7 +138,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     await Promise.all(promises);
     
     var borrowPlyApy = calcLMRewardApr(
-      calcValuation(
+      await calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardBorrowSpeed.toString()
@@ -150,7 +149,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       ONE_YEAR
     );
     var depositPlyApy = calcLMRewardApr(
-      calcValuation(
+      await calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardSupplySpeed.toString()
@@ -192,13 +191,6 @@ export class MoneyMarketRead extends BlockchainEntityRead {
 }
 
 export class MoneyMarketReadWrite extends MoneyMarketRead {
-
-  protected _EthRepayHelper: EthRepayHelper;
-  constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address) {
-    super(networkConnection, auToken, underlyingAsset);
-    this._EthRepayHelper = new Contract(networkAddresses.misc.ETHREPAYHELPER, EthRepayHelperABI.abi, networkConnection.provider) as EthRepayHelper;
-  }
-
   public async deposit(amount: TokenAmount): Promise<TransactionResponse> {
     if (isSameAddress(amount.token.address, ETHAddress)) {
       return (this.auToken as AuETH).connect(this._networkConnection.signer!).mint({value: amount.rawAmount()});
@@ -216,14 +208,16 @@ export class MoneyMarketReadWrite extends MoneyMarketRead {
     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._EthRepayHelper.connect(this._networkConnection.signer!).repayBorrow({value: amount.rawAmount()});
+      return (this.auToken as AuETH).connect(this._networkConnection.signer!).repayBorrow({value: repayAmount});
     } else {
-      if (new BigNumber(amount.rawAmount()).lt(0)) {
-        return this.auToken.connect(this._networkConnection.signer!).repayBorrow(INF);
-      } else {
-        return this.auToken.connect(this._networkConnection.signer!).repayBorrow(amount.rawAmount());
-      }
+      return (this.auToken as AuErc20).connect(this._networkConnection.signer!).repayBorrow(repayAmount);
     }
   }
   public async enableCollateral(): Promise<TransactionResponse> {
@@ -246,8 +240,4 @@ export class MoneyMarket extends BlockchainEntity {
   public read(networkConnection: NetworkConnection): MoneyMarketRead {
     return new MoneyMarketRead(networkConnection, this.address, this.underlying);
   }
-
-  public readWrite(networkConnection: NetworkConnection): MoneyMarketReadWrite {
-    return new MoneyMarketReadWrite(networkConnection, this.address, this.underlying);
-  }
 }

package/src/SDK.ts

@@ -128,8 +128,7 @@ export class SdkRead extends BlockchainEntityRead {
     for (var i = 0; i < marketCount; i ++) {
       const auToken = networkAddresses.auTokens[i];
       const moneyMarket: MoneyMarketRead = new MoneyMarketRead(this._networkConnection, auToken.address, auToken.underlying);
-      const borrowLimitMargin = totalBorrowLimit.minus(minimumBorrowLimitAllowed).gt(0) ? totalBorrowLimit.minus(minimumBorrowLimitAllowed) : new BigNumber(0);
-      const maxWithdrawCap: BigNumber = borrowLimitMargin.div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
+      const maxWithdrawCap: BigNumber = (totalBorrowLimit.minus(minimumBorrowLimitAllowed)).div(userMarketDetails[i].collateralRatio).div(underlyingPrices[i]);
       userMarketDetails[i].maxWithdrawableAmount = userMarketDetails[i].isCollateral && maxWithdrawCap.lt(userMarketDetails[i].depositBalance.formattedAmount()) 
       ?  new TokenAmount(
           moneyMarket.underlying,
@@ -255,7 +254,7 @@ export class SdkReadWrite extends SdkRead {
     );
   }
   public async stake(amount: TokenAmount): Promise<TransactionResponse> {
-    return this._auriFairLaunch.connect(this._networkConnection.signer!).deposit(AurPlyPid, amount.rawAmount());
+    return this._auriFairLaunch.connect(this._networkConnection.signer!).deposit(AurPlyPid, amount.rawAmount(), false);
   }
   public async unstake(amount: TokenAmount): Promise<TransactionResponse> {
     return this._auriFairLaunch.connect(this._networkConnection.signer!).withdraw(AurPlyPid, amount.rawAmount());

package/src/constants.ts

@@ -9,7 +9,6 @@ export const DECIMAL_PRECISION = 10;
 
 export type NetworkAddresses = {
   auTokens: {
-    name: string,
     address: string,
     underlying: string
   }[],
@@ -19,53 +18,45 @@ export type NetworkAddresses = {
 export const networkAddresses: NetworkAddresses = {
   auTokens: [
     {
-      name: "auUSDC",
-      address: '0x7A9984522bC81B348d66379ed36Be5BD6147820E'.toLowerCase(),
-      underlying: '0xe1Db3E2f129539b2399d8Cd9e808305c85f0c82f'.toLowerCase()
+      address: '0x7D9F7B4734E274Ff10531bBD5aE8fE6069164d28'.toLowerCase(),
+      underlying: '0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
     },
     {
-      name: "auETH",
-      address: '0x0e2E6069231928429F36dCA288466bC738e602b3'.toLowerCase(),
+      address: '0x580Ac375176A4e9B26977490656c3B2F00Abf624'.toLowerCase(),
       underlying: ETHAddress.toLowerCase()
     },
     {
-      name: "auWBTC",
-      address: '0x981bD5832EAB9C8F607940E0e9faCBf8C09ee20a'.toLowerCase(),
-      underlying: '0xA69506eAbdC11BBdAf2259882A02a91B66E6d7E1'.toLowerCase()
+      address: '0x705b9d83222c4EeDeaD1A0E399cDeB917173E1F6'.toLowerCase(),
+      underlying: '0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
     },
     {
-      name: "auUSDT",
-      address: '0xDACC02a4Ff16Ea3c1515AdbfdCeb7B1F448B79c8'.toLowerCase(),
-      underlying: '0x4459ED2dEFFe0569AE748aD5D7cFEFDeeF667E87'.toLowerCase()
+      address: '0xF9739783b767b358b21A1373140296c09271d6F5'.toLowerCase(),
+      underlying: '0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
     },
     {
-      name: "auDAI",
-      address: '0xC337343d1ac9F77B1305261CCD17e3799F088D4B'.toLowerCase(),
-      underlying: '0x1c9998C7768517b83136d3b237a31bc69eDc9028'.toLowerCase()
+      address: '0x4d2c286D74597B13642dd311D1050dFf9E7eF666'.toLowerCase(),
+      underlying: '0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
     },
     {
-      name: "auPLY",
-      address: '0x5e063B255e2437D75180117905499139a93f16E6'.toLowerCase(),
-      underlying: '0x3cD388c98FE71fE1a37272279F4b50bF27037E23'.toLowerCase()
+      address: '0x367E3fD10006bC64D279e5F1F499DcfA92518A35'.toLowerCase(),
+      underlying: '0x07a4f270836F2B2B5CACb00b09552e690276aC33'.toLowerCase()
     },
     {
-      name: "auWNEAR",
-      address: '0x910fb0AE51761ccCDBbD9ced613e6A4dc571594a'.toLowerCase(),
-      underlying: '0x01B2EDff9b095DC270beca46E2eFB41a3ecEE169'.toLowerCase()
+      address: '0x7FDe6C1C53DD4E94a8CD4c60BF1418613c90c42F'.toLowerCase(),
+      underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0x79e62AAfc1675c9F737Ec4Bb949115bfC8D2E2E6".toLowerCase(),
-    oracle: "0xAc99efFDF7a8934e35Ad13880D25127c548A7e6d".toLowerCase(),
-    AURIFAIRLAUNCH: "0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A".toLowerCase(),
-    AURILENS: '0x0Aa7Ce0f5D6259412602A230C3Ed83eDc857bDa1'.toLowerCase(),
-    TOKENLOCK: '0x1b5c4c6A77f784104662B293a0166B27aF71d2c0'.toLowerCase(),
-    FAUCET: "0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase(), // doesn't exist on mainnet
-    ETHREPAYHELPER: "0x0b28E2F1767623f2D5Cd59165e79f83E3D63b71F".toLowerCase()
+    COMPTROLLER: "0xc77877b0bd08fE3B060EbD8AEE06fb560C91A125".toLowerCase(),
+    oracle: "0xde76c82a6F99D25bEd226af44cF427e57dE8eE93".toLowerCase(),
+    AURIFAIRLAUNCH: "0x660159696c9E0B2c17E3e0ac2019F436aE34fc7A".toLowerCase(),
+    AURILENS: '0x503bD4B6a056F7E66671D2B4620f0aDC4ff2A4e9'.toLowerCase(),
+    TOKENLOCK: '0xa4623FC7C96B59f9a0a46144324d68C8E8710966'.toLowerCase(),
+    FAUCET: '0x8F791d611D71699B76C03857A51D7B7E5E66f01E'.toLowerCase() // doesn't exist on mainnet
   },
   tokens: {
-    AURORA: dummyAddress.toLowerCase(),
-    PLY: "0x3cD388c98FE71fE1a37272279F4b50bF27037E23".toLowerCase(),
+    AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
+    PLY: "0x07a4f270836F2B2B5CACb00b09552e690276aC33".toLowerCase(),
     AURPLY: dummyAddress.toLowerCase() // This is dummy
   }
 }

package/src/decimals.ts

@@ -1,16 +1,17 @@
 export const decimalRecords: Record<string, number> = {
   '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-  '0xdacc02a4ff16ea3c1515adbfdceb7b1f448b79c8': 8,
-  '0x01b2edff9b095dc270beca46e2efb41a3ecee169': 24,
-  '0x4459ed2deffe0569ae748ad5d7cfefdeef667e87': 6,
-  '0x3cd388c98fe71fe1a37272279f4b50bf27037e23': 18,
-  '0x1c9998c7768517b83136d3b237a31bc69edc9028': 18,
-  '0x7a9984522bc81b348d66379ed36be5bd6147820e': 8,
-  '0x0e2e6069231928429f36dca288466bc738e602b3': 8,
-  '0x981bd5832eab9c8f607940e0e9facbf8c09ee20a': 8,
-  '0xa69506eabdc11bbdaf2259882a02a91b66e6d7e1': 8,
-  '0x910fb0ae51761cccdbbd9ced613e6a4dc571594a': 8,
-  '0xe1db3e2f129539b2399d8cd9e808305c85f0c82f': 6,
-  '0x5e063b255e2437d75180117905499139a93f16e6': 8,
-  '0xc337343d1ac9f77b1305261ccd17e3799f088d4b': 8
+  '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
+  '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
+  '0xb12bfca5a55806aaf64e99521918a4bf0fc40802': 6,
+  '0x7fde6c1c53dd4e94a8cd4c60bf1418613c90c42f': 8,
+  '0xe3520349f477a5f6eb06107066048508498a291b': 18,
+  '0xf9739783b767b358b21a1373140296c09271d6f5': 8,
+  '0x07a4f270836f2b2b5cacb00b09552e690276ac33': 18,
+  '0xf4eb217ba2454613b15dbdea6e5f22276410e89e': 8,
+  '0x705b9d83222c4eedead1a0e399cdeb917173e1f6': 8,
+  '0x367e3fd10006bc64d279e5f1f499dcfa92518a35': 8,
+  '0x580ac375176a4e9b26977490656c3b2f00abf624': 8,
+  '0x4d2c286d74597b13642dd311d1050dff9e7ef666': 8,
+  '0x7d9f7b4734e274ff10531bbd5ae8fe6069164d28': 8,
+  '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24
 }

package/src/deployments/aurora_mainnet.json

@@ -1,21 +1,31 @@
 {
-    "deployer": "0xb969526EBc8dd4b1d816Da846eE08180515fFBbC",
-    "unitroller": "0xe3618BaDA3728a339A2214423C0426AD47d30626",
-    "comptrollerImpl": "0xEAdafBD9D7c09CE42512bf38d12abCD2D9ECBe0E",
-    "comptroller": "0xe3618BaDA3728a339A2214423C0426AD47d30626",
-    "PLY": "0x9ae13dd1FFd2008F68bC71d93C5a2381dC3F1D27",
-    "jumpRateModel": "0xA70d805Ed5B2DfF627Cf7046C131D73DFe11C59c",
-    "oracle": "0xC6e5185438e1730959c1eF3551059A3feC744E90",
+    "networkId": 1313161554,
+    "deployer": "0xf5FDd938B6BE0a0E6800262b3F623FE26c098410",
+    "unitroller": "0xc77877b0bd08fE3B060EbD8AEE06fb560C91A125",
+    "comptroller": "0x2082a661FCe093F1DEDd1842e79b9f95e68bb39B",
+    "ply": "0x07a4f270836F2B2B5CACb00b09552e690276aC33",
+    "tokenLock": "0xa4623FC7C96B59f9a0a46144324d68C8E8710966",
+    "lens": "0x503bD4B6a056F7E66671D2B4620f0aDC4ff2A4e9",
+    "fairLaunch": "0x660159696c9E0B2c17E3e0ac2019F436aE34fc7A",
+    "oracle": "0xde76c82a6F99D25bEd226af44cF427e57dE8eE93",
+    "interestRateModel": "0x70787df7735d736E20E06DBdc41B8455B98cc1e5",
     "auTokens": {
-      "USDC": "0x9728d8920707a5C12958E4cB2979Ae5588F85EcA",
-      "ETH": "0xc263e92038139879918C0DE0e97eA2F3f3984F72",
-      "WBTC": "0xC08FF86edF64c2d3816Eb43c5Ec95475a2d47BD0",
-      "USDT": "0x22AE568df8D8AeE3Ed9Ab0f135Ca8cFeF5d2Cf18",
-      "DAI": "0x6664d272c820d70c923DE9b1992De02A12C8a7d8",
-      "PLY": "0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A",
-      "WNEAR": "0xa64F1875080B91Db293dE1f547DC1D6Bc5d3Ef55"
+        "USDC": "0x7D9F7B4734E274Ff10531bBD5aE8fE6069164d28",
+        "ETH": "0x580Ac375176A4e9B26977490656c3B2F00Abf624",
+        "WBTC": "0x705b9d83222c4EeDeaD1A0E399cDeB917173E1F6",
+        "USDT": "0xF9739783b767b358b21A1373140296c09271d6F5",
+        "DAI": "0x4d2c286D74597B13642dd311D1050dFf9E7eF666",
+        "PLY": "0x367E3fD10006bC64D279e5F1F499DcfA92518A35",
+        "WNEAR": "0x7FDe6C1C53DD4E94a8CD4c60BF1418613c90c42F"
     },
-    "tokenLock": "0xE28339435478245CB1c57f84D246b67EECb3E204",
-    "fairLaunch": "0x451d4e8964d79081EFFDAEde236354b20b678640",
-    "auriLens": "0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329"
-  }
+    "supportedTokens": {
+        "USDC": "0xb12bfca5a55806aaf64e99521918a4bf0fc40802",
+        "WBTC": "0xf4eb217ba2454613b15dbdea6e5f22276410e89e",
+        "USDT": "0x4988a896b1227218e4a686fde5eabdcabd91571f",
+        "DAI": "0xe3520349f477a5f6eb06107066048508498a291b",
+        "PLY": "0x07a4f270836F2B2B5CACb00b09552e690276aC33",
+        "WNEAR": "0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d"
+    },
+    "PLY_AUR_LP": "",
+    "faucet": "0xA3923309CF9069b4945Dec09c760b70fC53373Db"
+}

package/src/deployments/aurora_testnet.json

@@ -1,30 +1,31 @@
 {
-    "deployer": "0xb969526EBc8dd4b1d816Da846eE08180515fFBbC",
-    "unitroller": "0x79e62AAfc1675c9F737Ec4Bb949115bfC8D2E2E6",
-    "comptrollerImpl": "0xBF44f4D1A5E9a1B324E9115CE5b58CDA07142Dbb",
-    "comptroller": "0x79e62AAfc1675c9F737Ec4Bb949115bfC8D2E2E6",
-    "PLY": "0x3cD388c98FE71fE1a37272279F4b50bF27037E23",
-    "jumpRateModel": "0x6664d272c820d70c923DE9b1992De02A12C8a7d8",
-    "oracle": "0xAc99efFDF7a8934e35Ad13880D25127c548A7e6d",
+    "networkId": 1313161555,
+    "deployer": "0x42D2D78Cc14e1B7D5e317B42e5335D8816B4Fd3F",
+    "unitroller": "0x1626d7941DF19781657a921014597c449F86941e",
+    "comptroller": "0x06200C8331193241e6487235C1E8a1340fcc9C1A",
+    "ply": "0x84B5C41DC786316c5aA319B5A22CA77472e1d31f",
+    "tokenLock": "0xc77E562C41ec3Ce860b5424758B77ad0aDb1bB93",
+    "lens": "0x680e15080Df9ff61131499D21aa5Ca9Bd05E60e0",
+    "fairLaunch": "0x4e91CdfeA23f44D4269E66494fe532867a0fAe5E",
+    "oracle": "0xe0E2Bb669a75Ae2384371cB4c4c95ff6fC1581b0",
+    "interestRateModel": "0x7346c735bce0c4838A917AFa9879F7723f1bB963",
     "auTokens": {
-      "USDT": "0xDACC02a4Ff16Ea3c1515AdbfdCeb7B1F448B79c8",
-      "WBTC": "0x981bD5832EAB9C8F607940E0e9faCBf8C09ee20a",
-      "ETH": "0x0e2E6069231928429F36dCA288466bC738e602b3",
-      "USDC": "0x7A9984522bC81B348d66379ed36Be5BD6147820E",
-      "DAI": "0xC337343d1ac9F77B1305261CCD17e3799F088D4B",
-      "PLY": "0x5e063B255e2437D75180117905499139a93f16E6",
-      "WNEAR": "0x910fb0AE51761ccCDBbD9ced613e6A4dc571594a"
+        "USDC": "0x1c7EB2ADdC2df2F28E9631cce970D2E2DF22429A",
+        "ETH": "0xdaE860b77c26498e7Bd8e16Fb80AD572FaB9688f",
+        "WBTC": "0x5329f32A9dDaC3d274Cc670B284561b0086D2244",
+        "USDT": "0x57E15Bf9Bc4c8a7AFd3C8DBE153ED29eC90B68Fa",
+        "DAI": "0xdCdA4c7eF408961200193d7180357AEC404C267A",
+        "PLY": "0xa8474c18f502551937367120a6D8453dA785f1DD",
+        "WNEAR": "0x2Db190F0Db94E78B87D805e022D2a07803652211"
     },
-    "tokenLock": "0x1b5c4c6A77f784104662B293a0166B27aF71d2c0",
-    "fairLaunch": "0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A",
-    "auriLens": "0x0Aa7Ce0f5D6259412602A230C3Ed83eDc857bDa1",
-    "test": {
-      "USDC": "0xe1Db3E2f129539b2399d8Cd9e808305c85f0c82f",
-      "USDT": "0x4459ED2dEFFe0569AE748aD5D7cFEFDeeF667E87",
-      "DAI": "0x1c9998C7768517b83136d3b237a31bc69eDc9028",
-      "WBTC": "0xA69506eAbdC11BBdAf2259882A02a91B66E6d7E1",
-      "WNEAR": "0x01B2EDff9b095DC270beca46E2eFB41a3ecEE169",
-      "PLY": "0x3cD388c98FE71fE1a37272279F4b50bF27037E23",
-      "faucet": "0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329"
-    }
-  }
+    "supportedTokens": {
+        "USDC": "0x3dcB6AdF46E4d854E94719b6ed9cfab6939cC1Cb",
+        "WBTC": "0x6fF98E346Ba4C56fBc3Ebc3f92477ffCe09D96AB",
+        "USDT": "0x05b8777B6c280DB4E61CF0F63d59b4Ac8ec70538",
+        "DAI": "0xd94951E6B276fD4327FFBD3253b6307d112403e2",
+        "PLY": "0x84B5C41DC786316c5aA319B5A22CA77472e1d31f",
+        "WNEAR": "0xb2cBCe33a6fb7D2efFb1cF73A654a4c0c9255874"
+    },
+    "PLY_AUR_LP": "",
+    "faucet": "0x8F791d611D71699B76C03857A51D7B7E5E66f01E"
+}

package/src/priceFetcher.ts

@@ -101,7 +101,7 @@ export async function fetchPrice(address: Address, provider: providers.Provider)
     });
     if (matchingAuToken !== undefined) {
         return fetchPriceFromOracle(matchingAuToken.address, getDecimal(address), provider);
-    } else if (isSameAddress(address, networkAddresses.tokens.AUPLYLP)) {
+    } else if (isSameAddress(address, networkAddresses.misc.AUPLYLP)) {
         return fetchLPPrice(address, provider);
     } else {
         return fetchPriceFromCoingecko(address);