Merge branch 'master' of https://github.com/commons-stack/genesis-contracts

Author: Eknir

contracts/bondingcurve/CommonsToken.sol

@@ -210,7 +210,7 @@ contract CommonsToken is BondingCurveToken {
     uint256 lockedInternal = initialContributions[msg.sender].lockedInternal;
 
     // The total amount of INTERNAL tokens that should have been unlocked.
-    uint256 shouldHaveUnlockedInternal = (paidExternal / initialRaise) * unlockedInternal;
+    uint256 shouldHaveUnlockedInternal = (paidExternal * unlockedInternal) / initialRaise;
     // The amount of INTERNAL tokens that was already unlocked.
     uint256 previouslyUnlockedInternal = (paidExternal / p0) - lockedInternal;
     // The amount that can be unlocked.

contracts/bondingcurve/FundingPoolMock.sol

@@ -1,6 +1,7 @@
 pragma solidity ^0.5.0;
 
 import "./CommonsToken.sol";
+import "./vendor/ERC20/IERC20.sol";
 
 contract FundingPoolMock {
 
@@ -10,8 +11,9 @@ contract FundingPoolMock {
     commonsToken = CommonsToken(_commonsToken);
   }
 
+  // Note: function not secure => via this function all fundingPool tokens can be withdrawn
   function allocateFunds(address to, uint256 value) public {
     commonsToken.fundsAllocated(value);
-    commonsToken.transfer(to, value);
+    IERC20(commonsToken.externalToken()).transfer(to, value);
   }
 }