Merge branch 'refactor/dao-voting' of github.com:HQ20/contracts into …

…refactor/dao-voting
HQ20 · Mar 2, 2020 · 3ded3c1 · 3ded3c1
2 parents 5d159d7 + 7ed4a8b
commit 3ded3c1
Show file tree

Hide file tree

Showing 8 changed files with 323 additions and 310 deletions.
diff --git a/contracts/drafts/issuance/IssuanceAdvanced.sol b/contracts/drafts/issuance/IssuanceAdvanced.sol
@@ -9,6 +9,7 @@ import "../../token/IERC20Detailed.sol";
 import "../../token/IERC20MintableDetailed.sol";
 import "./../../state/StateMachine.sol";
 import "../../utils/SafeCast.sol";
+import "../../math/DecimalMath.sol";
 
 
 /**
@@ -18,9 +19,7 @@ import "../../utils/SafeCast.sol";
 contract IssuanceAdvanced is Ownable, StateMachine, ReentrancyGuard {
 
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
 
@@ -102,23 +101,12 @@ contract IssuanceAdvanced is Ownable, StateMachine, ReentrancyGuard {
         require(investments[msg.sender] > 0, "No investments found.");
         uint256 amount = investments[msg.sender];
         investments[msg.sender] = 0;
-        IERC20Detailed _currencyToken = IERC20Detailed(currencyToken);
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/examples/dao/DAO.sol b/contracts/examples/dao/DAO.sol
@@ -4,7 +4,7 @@ import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/EnumerableSet.sol";
 import "./VentureEth.sol";
-import "../../drafts/voting/Voting.sol";
+import "./../../voting/Voting.sol";
 
 
 /**

diff --git a/contracts/issuance/Issuance.sol b/contracts/issuance/Issuance.sol
@@ -9,6 +9,7 @@ import "../token/IERC20Detailed.sol";
 import "../token/IERC20MintableDetailed.sol";
 import "../state/StateMachine.sol";
 import "../utils/SafeCast.sol";
+import "../math/DecimalMath.sol";
 
 
 /**
@@ -29,9 +30,7 @@ import "../utils/SafeCast.sol";
  */
 contract Issuance is Ownable, StateMachine, ReentrancyGuard {
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
     event IssuePriceSet();
@@ -98,23 +97,12 @@ contract Issuance is Ownable, StateMachine, ReentrancyGuard {
         );
         uint256 amount = investments[msg.sender];
         investments[msg.sender] = 0;
-        IERC20Detailed _currencyToken = IERC20Detailed(currencyToken);
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(
-                _currencyToken.decimals()
-            );
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/issuance/IssuanceEth.sol b/contracts/issuance/IssuanceEth.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "../token/IERC20MintableDetailed.sol";
 import "../state/StateMachine.sol";
-import "../utils/SafeCast.sol";
+import "../math/DecimalMath.sol";
 
 
 /**
@@ -27,9 +27,7 @@ import "../utils/SafeCast.sol";
  */
 contract IssuanceEth is Ownable, StateMachine, ReentrancyGuard {
     using SafeMath for uint256;
-    using FixidityLib for int256;
-    using SafeCast for int256;
-    using SafeCast for uint256;
+    using DecimalMath for uint256;
 
     event IssuanceCreated();
     event IssuePriceSet();
@@ -73,15 +71,9 @@ contract IssuanceEth is Ownable, StateMachine, ReentrancyGuard {
         IERC20MintableDetailed _issuanceToken = IERC20MintableDetailed(
             issuanceToken
         );
-        int256 investedFixed = amount.safeUintToInt().newFixed(18);
-        int256 issuePriceFixed = issuePrice.safeUintToInt().newFixed(18);
-        int256 issuanceTokensFixed = investedFixed.divide(issuePriceFixed);
-        uint256 issuanceTokens = issuanceTokensFixed.fromFixed(
-                _issuanceToken.decimals()
-            ).safeIntToUint();
         _issuanceToken.mint(
             msg.sender,
-            issuanceTokens
+            amount.divd(issuePrice, _issuanceToken.decimals())
         );
     }
 

diff --git a/contracts/drafts/voting/README.md → contracts/voting/README.md b/contracts/drafts/voting/README.md → contracts/voting/README.md
diff --git a/contracts/drafts/voting/Voting.sol → contracts/voting/Voting.sol b/contracts/drafts/voting/Voting.sol → contracts/voting/Voting.sol
@@ -6,8 +6,8 @@ import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/utils/EnumerableSet.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20Detailed.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "../../state/StateMachine.sol";
-import "../../utils/SafeCast.sol";
+import "../state/StateMachine.sol";
+import "../utils/SafeCast.sol";
 
 
 /**