Partial crowdfund support

README.md

@@ -76,3 +76,32 @@ We use [Solidity Coverage](https://github.com/sc-forks/solidity-coverage).
 ```
 $(npm bin)/solidity-coverage
 ```
+
+# Draft Loan Statuses
+
+**crowdfundStatus** (pertains to _stage_ of crowdfund)
+
+1. notStarted
+2. started
+3. paused
+4. ended (either early end by borrower, or hit goal)
+
+**crowdfundSuccess** (pertains to _outcome_ of crowdfund)
+
+1. pending (i.e. during phase)
+2. accepted (i.e. borrower starts the loan)
+3. refunded (i.e. borrower rejects the crowdfund, returns money)
+
+**loanStatus** (pertains to _stage_ of loan)
+
+1. Crowdfunding
+2. Disbursed
+3. RepaymentCycle (ie. >30 days after disbursement, also covers loans that are in default). Can also rename this to "in progress",
+4. Completed (i.e. either fully paid back or written off)
+
+**loanOutcome** (pertains to _outcome_ of loan)
+
+1. on time (not fully paid back yet)
+2. late 30, 60, 90
+3. fully paid back
+4. written off (default)

contracts/crowdloan/Crowdloan.sol

@@ -42,25 +42,42 @@ contract Crowdloan is Initializable, ICrowdloan, ReentrancyGuard {
         crowdfundParams = CrowdfundParams(_crowdfundLength, _crowdfundStart);
     }
 
+    function getCrowdfundParams() public view returns (uint256, uint256) {
+        return (crowdfundParams.crowdfundLength, crowdfundParams.crowdfundStart);
+    }
+
+    function getCrowdfundEnd() public view returns (uint256) {
+        return (crowdfundParams.crowdfundStart.add(crowdfundParams.crowdfundLength));
+    }
+
+    function getTotalCrowdfunded() public view returns (uint256 total) {
+        /** Note: this may return more than principalRequested because of native ERC20 transfers */
+        total = _getPrincipalToken().balanceOf(address(this));
+    }
+
+    function getBorrower() public view returns (address) {
+        return termsContract.borrower();
+    }
+
     // @notice additional payment does not exceed the pricipal Amount
     function _isBelowMaxSupply(uint256 amount) internal view returns (bool) {
-        uint256 principal = termsContract.getPrincipal();
-        return repaymentManager.totalShares().add(amount) <= principal;
+        uint256 principalRequested = termsContract.getPrincipalRequested();
+        return repaymentManager.totalShares().add(amount) <= principalRequested;
     }
 
     // @notice reconcile the loans funding status
     function _updateCrowdfundStatus() internal {
-        uint256 principal = termsContract.getPrincipal();
+        uint256 principalRequested = termsContract.getPrincipalRequested();
         uint256 totalShares = repaymentManager.totalShares();
         uint256 totalPaid = repaymentManager.totalPaid();
 
         if (
             totalShares > 0 &&
-            totalShares < principal &&
+            totalShares < principalRequested &&
             termsContract.getLoanStatus() < TermsContractLib.LoanStatus.FUNDING_FAILED
         ) {
             termsContract.setLoanStatus(TermsContractLib.LoanStatus.FUNDING_STARTED);
-        } else if (totalShares >= principal && totalPaid == 0) {
+        } else if (totalShares >= principalRequested && totalPaid == 0) {
             termsContract.setLoanStatus(TermsContractLib.LoanStatus.FUNDING_COMPLETE);
         }
     }
@@ -111,7 +128,7 @@ contract Crowdloan is Initializable, ICrowdloan, ReentrancyGuard {
         _validatedERC20Transfer(_getPrincipalToken(), msg.sender, address(this), amount);
         //Mint new debt token and transfer to sender
         repaymentManager.increaseShares(msg.sender, amount);
-        emit Fund(msg.sender, amount); // TODO(Dan): Remove comments once IClaimsToken is implemented
+        emit Fund(msg.sender, amount);
     }
 
     /// @notice Get a refund for a debt token owned by the sender
@@ -125,48 +142,32 @@ contract Crowdloan is Initializable, ICrowdloan, ReentrancyGuard {
 
         repaymentManager.decreaseShares(msg.sender, amount);
         _validatedERC20Transfer(_getPrincipalToken(), address(this), msg.sender, amount);
-
         emit Refund(msg.sender, amount);
     }
 
+    /**
+     * @notice Withdraw method
+     */
+    function withdraw() public {
+        withdraw(_getPrincipalToken().balanceOf(address(this)));
+    }
+
     // @notice Withdraw loan
     function withdraw(uint256 amount) public {
         require(
             termsContract.getLoanStatus() > TermsContractLib.LoanStatus.FUNDING_FAILED,
             "Crowdfund not completed"
         );
         require(msg.sender == termsContract.borrower(), "Withdrawal only allowed for Borrower");
-        require(
-            _getPrincipalToken().balanceOf(address(this)) >= amount,
-            "Amount exceeds available balance"
-        );
-
+        uint256 totalCrowdfunded = _getPrincipalToken().balanceOf(address(this));
+        require(amount <= totalCrowdfunded, "Amount exceeds available balance");
         if (termsContract.getLoanStatus() < TermsContractLib.LoanStatus.REPAYMENT_CYCLE) {
-            termsContract.startLoan();
+            termsContract.startRepaymentCycle(totalCrowdfunded); // TODO(Dan): change this to be the amount actually raised
         }
-
         _validatedERC20Transfer(_getPrincipalToken(), address(this), msg.sender, amount);
-
         emit ReleaseFunds(msg.sender, amount);
     }
 
-    // @notice Withdraw loan
-    function withdraw() public {
-        withdraw(_getPrincipalToken().balanceOf(address(this)));
-    }
-
-    function getCrowdfundParams() public view returns (uint256, uint256) {
-        return (crowdfundParams.crowdfundLength, crowdfundParams.crowdfundStart);
-    }
-
-    function getCrowdfundEnd() public view returns (uint256) {
-        return (crowdfundParams.crowdfundStart.add(crowdfundParams.crowdfundLength));
-    }
-
-    function getBorrower() public view returns (address) {
-        return termsContract.borrower();
-    }
-
     /**
      * @dev fallback function ***DO NOT OVERRIDE***
      * Revert all native Ether payments