Remove defi dependecies in CompoundManager

argentlabs · May 6, 2020 · 6f04028 · 6f04028
1 parent e5749b3
commit 6f04028
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 76 deletions.
diff --git a/contracts/defi/Invest.sol b/contracts/defi/Invest.sol
diff --git a/contracts/legacy/LegacyMakerManager.sol b/contracts/legacy/LegacyMakerManager.sol
@@ -19,10 +19,9 @@ import "../wallet/BaseWallet.sol";
 import "../modules/common/BaseModule.sol";
 import "../modules/common/RelayerModule.sol";
 import "../modules/common/OnlyOwnerModule.sol";
-import "../defi/Loan.sol";
+import "./Loan.sol";
 import "../../lib/maker/DS/DSMath.sol";
 
-
 // Interface to MakerDAO's Tub contract, used to manage CDPs
 contract IMakerCdp {
     IDSValue  public pep; // MKR price feed

diff --git a/contracts/defi/Loan.sol → contracts/legacy/Loan.sol b/contracts/defi/Loan.sol → contracts/legacy/Loan.sol
diff --git a/contracts/modules/CompoundManager.sol b/contracts/modules/CompoundManager.sol
@@ -19,8 +19,6 @@ import "../wallet/BaseWallet.sol";
 import "./common/BaseModule.sol";
 import "./common/RelayerModule.sol";
 import "./common/OnlyOwnerModule.sol";
-import "../defi/Loan.sol";
-import "../defi/Invest.sol";
 import "../infrastructure/CompoundRegistry.sol";
 
 interface IComptroller {
@@ -47,7 +45,7 @@ interface ICToken {
  * @dev Module to invest and borrow tokens with CompoundV2
  * @author Julien Niset - <julien@argent.xyz>
  */
-contract CompoundManager is Loan, Invest, BaseModule, RelayerModule, OnlyOwnerModule {
+contract CompoundManager is BaseModule, RelayerModule, OnlyOwnerModule {
 
     bytes32 constant NAME = "CompoundManager";
 
@@ -59,6 +57,21 @@ contract CompoundManager is Loan, Invest, BaseModule, RelayerModule, OnlyOwnerMo
     // Mock token address for ETH
     address constant internal ETH_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
 
+    event InvestmentAdded(address indexed _wallet, address _token, uint256 _invested, uint256 _period);
+    event InvestmentRemoved(address indexed _wallet, address _token, uint256 _fraction);
+    event LoanOpened(
+        address indexed _wallet,
+        bytes32 indexed _loanId,
+        address _collateral,
+        uint256 _collateralAmount,
+        address _debtToken,
+        uint256 _debtAmount);
+    event LoanClosed(address indexed _wallet, bytes32 indexed _loanId);
+    event CollateralAdded(address indexed _wallet, bytes32 indexed _loanId, address _collateral, uint256 _collateralAmount);
+    event CollateralRemoved(address indexed _wallet, bytes32 indexed _loanId, address _collateral, uint256 _collateralAmount);
+    event DebtAdded(address indexed _wallet, bytes32 indexed _loanId, address _debtToken, uint256 _debtAmount);
+    event DebtRemoved(address indexed _wallet, bytes32 indexed _loanId, address _debtToken, uint256 _debtAmount);
+
     using SafeMath for uint256;
 
     constructor(