@aurigami/sdk 0.7.3 → 0.8.1

package/package.json

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

package/src/MoneyMarket.ts

@@ -5,7 +5,8 @@ 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 { AuErc20, AuETH, AuriLens, Comptroller } from "@aurigami/contracts/typechain";
+import EthRepayHelperABI from "@aurigami/contracts/artifacts/contracts/EthRepayHelper.sol/EthRepayHelper.json"
+import { AuErc20, AuETH, AuriLens, Comptroller, EthRepayHelper } from "@aurigami/contracts/typechain";
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import { networkAddresses, ETHAddress, ONE_YEAR, INF } from "./constants";
 import BigNumber from "bignumber.js";
@@ -138,7 +139,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     await Promise.all(promises);
     
     var borrowPlyApy = calcLMRewardApr(
-      await calcValuation(
+      calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardBorrowSpeed.toString()
@@ -149,7 +150,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       ONE_YEAR
     );
     var depositPlyApy = calcLMRewardApr(
-      await calcValuation(
+      calcValuation(
         new TokenAmount(
           PLYToken,
           rewardSpeeds!.plyRewardSupplySpeed.toString()
@@ -191,6 +192,13 @@ 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()});
@@ -208,20 +216,14 @@ 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)) {
-      if (isSameAddress(amount.token.address, ETHAddress)) {
-        repayAmount = BN.from((await this.getUserBorrowBalance(await this._networkConnection.signer!.getAddress())).rawAmount());
-      } else {
-        repayAmount = INF;
-      }
-    } else {
-      repayAmount = BN.from(amount.rawAmount());
-    }
     if (isSameAddress(amount.token.address, ETHAddress)) {
-      return (this.auToken as AuETH).connect(this._networkConnection.signer!).repayBorrow({value: repayAmount});
+      return this._EthRepayHelper.connect(this._networkConnection.signer!).repayBorrow({value: amount.rawAmount()});
     } else {
-      return (this.auToken as AuErc20).connect(this._networkConnection.signer!).repayBorrow(repayAmount);
+      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());
+      }
     }
   }
   public async enableCollateral(): Promise<TransactionResponse> {
@@ -244,4 +246,8 @@ 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

@@ -255,7 +255,7 @@ export class SdkReadWrite extends SdkRead {
     );
   }
   public async stake(amount: TokenAmount): Promise<TransactionResponse> {
-    return this._auriFairLaunch.connect(this._networkConnection.signer!).deposit(AurPlyPid, amount.rawAmount(), false);
+    return this._auriFairLaunch.connect(this._networkConnection.signer!).deposit(AurPlyPid, amount.rawAmount());
   }
   public async unstake(amount: TokenAmount): Promise<TransactionResponse> {
     return this._auriFairLaunch.connect(this._networkConnection.signer!).withdraw(AurPlyPid, amount.rawAmount());

package/src/constants.ts

@@ -9,6 +9,7 @@ export const DECIMAL_PRECISION = 10;
 
 export type NetworkAddresses = {
   auTokens: {
+    name: string,
     address: string,
     underlying: string
   }[],
@@ -18,45 +19,53 @@ export type NetworkAddresses = {
 export const networkAddresses: NetworkAddresses = {
   auTokens: [
     {
-      address: '0x7D9F7B4734E274Ff10531bBD5aE8fE6069164d28'.toLowerCase(),
+      name: "auUSDC",
+      address: '0x9728d8920707a5C12958E4cB2979Ae5588F85EcA'.toLowerCase(),
       underlying: '0xb12bfca5a55806aaf64e99521918a4bf0fc40802'.toLowerCase()
     },
     {
-      address: '0x580Ac375176A4e9B26977490656c3B2F00Abf624'.toLowerCase(),
+      name: "auETH",
+      address: '0xc263e92038139879918C0DE0e97eA2F3f3984F72'.toLowerCase(),
       underlying: ETHAddress.toLowerCase()
     },
     {
-      address: '0x705b9d83222c4EeDeaD1A0E399cDeB917173E1F6'.toLowerCase(),
+      name: "auWBTC",
+      address: '0xC08FF86edF64c2d3816Eb43c5Ec95475a2d47BD0'.toLowerCase(),
       underlying: '0xf4eb217ba2454613b15dbdea6e5f22276410e89e'.toLowerCase()
     },
     {
-      address: '0xF9739783b767b358b21A1373140296c09271d6F5'.toLowerCase(),
+      name: "auUSDT",
+      address: '0x22AE568df8D8AeE3Ed9Ab0f135Ca8cFeF5d2Cf18'.toLowerCase(),
       underlying: '0x4988a896b1227218e4a686fde5eabdcabd91571f'.toLowerCase()
     },
     {
-      address: '0x4d2c286D74597B13642dd311D1050dFf9E7eF666'.toLowerCase(),
+      name: "auDAI",
+      address: '0x6664d272c820d70c923DE9b1992De02A12C8a7d8'.toLowerCase(),
       underlying: '0xe3520349f477a5f6eb06107066048508498a291b'.toLowerCase()
     },
     {
-      address: '0x367E3fD10006bC64D279e5F1F499DcfA92518A35'.toLowerCase(),
-      underlying: '0x07a4f270836F2B2B5CACb00b09552e690276aC33'.toLowerCase()
+      name: "auPLY",
+      address: '0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A'.toLowerCase(),
+      underlying: '0x9ae13dd1FFd2008F68bC71d93C5a2381dC3F1D27'.toLowerCase()
     },
     {
-      address: '0x7FDe6C1C53DD4E94a8CD4c60BF1418613c90c42F'.toLowerCase(),
+      name: "auWNEAR",
+      address: '0xa64F1875080B91Db293dE1f547DC1D6Bc5d3Ef55'.toLowerCase(),
       underlying: '0xC42C30aC6Cc15faC9bD938618BcaA1a1FaE8501d'.toLowerCase()
     }
   ],
   misc: {
-    COMPTROLLER: "0xc77877b0bd08fE3B060EbD8AEE06fb560C91A125".toLowerCase(),
-    oracle: "0x9c8180255ED1bA5fA812FABc933E3ecbd3B585D5".toLowerCase(),
-    AURIFAIRLAUNCH: "0x660159696c9E0B2c17E3e0ac2019F436aE34fc7A".toLowerCase(),
-    AURILENS: '0x503bD4B6a056F7E66671D2B4620f0aDC4ff2A4e9'.toLowerCase(),
-    TOKENLOCK: '0xa4623FC7C96B59f9a0a46144324d68C8E8710966'.toLowerCase(),
-    FAUCET: '0x8F791d611D71699B76C03857A51D7B7E5E66f01E'.toLowerCase() // doesn't exist on mainnet
+    COMPTROLLER: "0xe3618BaDA3728a339A2214423C0426AD47d30626".toLowerCase(),
+    oracle: "0xC6e5185438e1730959c1eF3551059A3feC744E90".toLowerCase(),
+    AURIFAIRLAUNCH: "0x451d4e8964d79081EFFDAEde236354b20b678640".toLowerCase(),
+    AURILENS: '0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329'.toLowerCase(),
+    TOKENLOCK: '0xE28339435478245CB1c57f84D246b67EECb3E204'.toLowerCase(),
+    FAUCET: dummyAddress.toLowerCase(), // doesn't exist on mainnet
+    ETHREPAYHELPER: "0xFb7c45A326DB421da1CE532420232D655107b110".toLowerCase()
   },
   tokens: {
     AURORA: "0x8bec47865ade3b172a928df8f990bc7f2a3b9f79".toLowerCase(),
-    PLY: "0x07a4f270836F2B2B5CACb00b09552e690276aC33".toLowerCase(),
+    PLY: "0x9ae13dd1FFd2008F68bC71d93C5a2381dC3F1D27".toLowerCase(),
     AURPLY: dummyAddress.toLowerCase() // This is dummy
   }
 }

package/src/decimals.ts

@@ -1,17 +1,17 @@
 export const decimalRecords: Record<string, number> = {
   '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': 18,
-  '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
-  '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
   '0xb12bfca5a55806aaf64e99521918a4bf0fc40802': 6,
-  '0x7fde6c1c53dd4e94a8cd4c60bf1418613c90c42f': 8,
-  '0xe3520349f477a5f6eb06107066048508498a291b': 18,
-  '0xf9739783b767b358b21a1373140296c09271d6f5': 8,
-  '0x07a4f270836f2b2b5cacb00b09552e690276ac33': 18,
+  '0xd204fd43bfe4aaeb9ab993c116c1decddf1b9f1a': 8,
   '0xf4eb217ba2454613b15dbdea6e5f22276410e89e': 8,
-  '0x705b9d83222c4eedead1a0e399cdeb917173e1f6': 8,
-  '0x367e3fd10006bc64d279e5f1f499dcfa92518a35': 8,
-  '0x580ac375176a4e9b26977490656c3b2f00abf624': 8,
-  '0x4d2c286d74597b13642dd311d1050dff9e7ef666': 8,
-  '0x7d9f7b4734e274ff10531bbd5ae8fe6069164d28': 8,
-  '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24
+  '0xc08ff86edf64c2d3816eb43c5ec95475a2d47bd0': 8,
+  '0xc263e92038139879918c0de0e97ea2f3f3984f72': 8,
+  '0x22ae568df8d8aee3ed9ab0f135ca8cfef5d2cf18': 8,
+  '0x9ae13dd1ffd2008f68bc71d93c5a2381dc3f1d27': 18,
+  '0x9728d8920707a5c12958e4cb2979ae5588f85eca': 8,
+  '0xa64f1875080b91db293de1f547dc1d6bc5d3ef55': 8,
+  '0xe3520349f477a5f6eb06107066048508498a291b': 18,
+  '0x4988a896b1227218e4a686fde5eabdcabd91571f': 6,
+  '0xc42c30ac6cc15fac9bd938618bcaa1a1fae8501d': 24,
+  '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79': 18,
+  '0x6664d272c820d70c923de9b1992de02a12c8a7d8': 8
 }

package/src/deployments/aurora_mainnet.json

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

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.misc.AUPLYLP)) {
+    } else if (isSameAddress(address, networkAddresses.tokens.AUPLYLP)) {
         return fetchLPPrice(address, provider);
     } else {
         return fetchPriceFromCoingecko(address);