Final tuning

.gitattributes

@@ -0,0 +1 @@
+*.sol linguist-language=Solidity

Fund.sol

@@ -18,7 +18,7 @@ contract Fund is ICrowdsaleFund, SafeMath, MultiOwnable {
     FundState public state = FundState.Crowdsale;
     ManagedToken public token;
 
-    uint256 public constant INITIAL_TAP = 385802469135802; // (wei/sec) == 1000 ether/month
+    uint256 public constant INITIAL_TAP = 192901234567901; // (wei/sec) == 500 ether/month
 
     address public teamWallet;
     uint256 public crowdsaleEndDate;

PollManagedFund.sol

@@ -14,10 +14,12 @@ import './token/ITokenEventListener.sol';
 contract PollManagedFund is Fund, DateTime, ITokenEventListener {
     uint256 public constant TAP_POLL_DURATION = 3 days;
     uint256 public constant REFUND_POLL_DURATION = 7 days;
+    uint256 public constant MAX_VOTED_TOKEN_PERC = 10;
 
     TapPoll public tapPoll;
     RefundPoll public refundPoll;
 
+    uint256 public minVotedTokensPerc = 0;
     uint256 public secondRefundPollDate = 0;
     bool public isWithdrawEnabled = true;
 
@@ -37,6 +39,11 @@ contract PollManagedFund is Fund, DateTime, ITokenEventListener {
         _;
     }
 
+    event TapPollCreated();
+    event TapPollFinished(bool approved, uint256 _tap);
+    event RefundPollCreated();
+    event RefundPollFinished(bool approved);
+
     /**
      * @dev PollManagedFund constructor
      * params - see Fund constructor
@@ -81,6 +88,19 @@ contract PollManagedFund is Fund, DateTime, ITokenEventListener {
         }
     }
 
+    /**
+     * @dev Update minVotedTokensPerc value after tap poll.
+     * Set new value == 50% from current voted tokens amount
+     */
+    function updateMinVotedTokens(uint256 _minVotedTokensPerc) internal {
+        uint256 newPerc = safeDiv(_minVotedTokensPerc, 2);
+        if(newPerc > MAX_VOTED_TOKEN_PERC) {
+            minVotedTokensPerc = MAX_VOTED_TOKEN_PERC;
+            return;
+        }
+        minVotedTokensPerc = newPerc;
+    }
+
     // Tap poll
     function createTapPoll(uint8 tapIncPerc) public onlyOwner {
         require(state == FundState.TeamWithdraw);
@@ -90,14 +110,17 @@ contract PollManagedFund is Fund, DateTime, ITokenEventListener {
         uint256 _tap = safeAdd(tap, safeDiv(safeMul(tap, tapIncPerc), 100));
         uint256 startTime = now;
         uint256 endTime = startTime + TAP_POLL_DURATION;
-        tapPoll = new TapPoll(_tap, token, this, startTime, endTime);
+        tapPoll = new TapPoll(_tap, token, this, startTime, endTime, minVotedTokensPerc);
+        TapPollCreated();
     }
 
     function onTapPollFinish(bool agree, uint256 _tap) external {
         require(msg.sender == address(tapPoll) && tapPoll.finalized());
         if(agree) {
             tap = _tap;
         }
+        updateMinVotedTokens(tapPoll.getVotedTokensPerc());
+        TapPollFinished(agree, _tap);
         delete tapPoll;
     }
 
@@ -137,6 +160,7 @@ contract PollManagedFund is Fund, DateTime, ITokenEventListener {
             );
         }
         refundPoll = new RefundPoll(token, this, startTime, endTime, holdEndTime, isFirstRefund);
+        RefundPollCreated();
     }
 
     function onRefundPollFinish(bool agree) external {
@@ -157,6 +181,8 @@ contract PollManagedFund is Fund, DateTime, ITokenEventListener {
             secondRefundPollDate = 0;
             isWithdrawEnabled = true;
         }
+        RefundPollFinished(agree);
+
         delete refundPoll;
     }
 

TapPoll.sol

@@ -9,7 +9,8 @@ import './fund/IPollManagedFund.sol';
  * @dev Poll to increase tap amount
  */
 contract TapPoll is BasePoll {
-    uint256 tap;
+    uint256 public tap;
+    uint256 public minTokensPerc = 0;
 
     /**
      * TapPoll constructor
@@ -18,15 +19,32 @@ contract TapPoll is BasePoll {
      * @param _fundAddress Fund contract address
      * @param _startTime Poll start time
      * @param _endTime Poll end time
+     * @param _minTokensPerc - Min percent of tokens from totalSupply where poll is considered to be fulfilled
      */
-    function TapPoll(uint256 _tap, address _tokenAddress, address _fundAddress, uint256 _startTime, uint256 _endTime) public
+    function TapPoll(
+        uint256 _tap,
+        address _tokenAddress,
+        address _fundAddress,
+        uint256 _startTime,
+        uint256 _endTime,
+        uint256 _minTokensPerc
+    ) public
         BasePoll(_tokenAddress, _fundAddress, _startTime, _endTime, false)
     {
         tap = _tap;
+        minTokensPerc = _minTokensPerc;
     }
 
     function onPollFinish(bool agree) internal {
         IPollManagedFund fund = IPollManagedFund(fundAddress);
         fund.onTapPollFinish(agree, tap);
     }
+
+    function getVotedTokensPerc() public view returns(uint256) {
+        return safeDiv(safeMul(safeAdd(yesCounter, noCounter), 100), token.totalSupply());
+    }
+
+    function isSubjectApproved() internal view returns(bool) {
+        return yesCounter > noCounter && getVotedTokensPerc() >= minTokensPerc;
+    }
 }