@aurigami/sdk 0.6.6 → 0.6.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.6",
+  "version": "0.6.7",
   "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-beta",
+    "@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/constants.ts

@@ -60,7 +60,8 @@ export const networkAddresses: NetworkAddresses = {
     AURIFAIRLAUNCH: "0xD204fD43bFe4aAEB9aB993c116c1dECdDF1b9F1A".toLowerCase(),
     AURILENS: '0x0Aa7Ce0f5D6259412602A230C3Ed83eDc857bDa1'.toLowerCase(),
     TOKENLOCK: '0x1b5c4c6A77f784104662B293a0166B27aF71d2c0'.toLowerCase(),
-    FAUCET: "0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase() // doesn't exist on mainnet
+    FAUCET: "0xe8b53eE0443620fB8DcEaEB6DE98ED117971c329".toLowerCase(), // doesn't exist on mainnet
+    ETHREPAYHELPER: "0x0b28E2F1767623f2D5Cd59165e79f83E3D63b71F".toLowerCase()
   },
   tokens: {
     AURORA: dummyAddress.toLowerCase(),