Merge pull request #9 from WingsDao/develop

1.1.0 version
WingsDao · Jul 23, 2018 · 76fe1d1 · 76fe1d1
2 parents 6d27620 + bd61e0d
commit 76fe1d1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/contracts/Bridge.sol b/contracts/Bridge.sol
@@ -149,8 +149,14 @@ contract Bridge is BasicCrowdsale {
 
     uint256 tokenReward = totalSold.mul(tokenRewardPart) / 1000000;
 
+    if (totalCollectedETH != 0) {
+      totalCollected = totalCollectedETH;
+    }
+
+    totalCollected = IWingsController(manager).fitCollectedValueIntoRange(totalCollected);
+
     if (hasEthReward) {
-      ethReward = ((totalCollectedETH == 0) ? totalCollected : totalCollectedETH).mul(ethRewardPart) / 1000000;
+      ethReward = totalCollected.mul(ethRewardPart) / 1000000;
     }
 
     return (ethReward, tokenReward);

diff --git a/contracts/IWingsController.sol b/contracts/IWingsController.sol
@@ -5,4 +5,6 @@ pragma solidity ^0.4.23;
 contract IWingsController {
   uint256 public ethRewardPart;
   uint256 public tokenRewardPart;
+
+  function fitCollectedValueIntoRange(uint256 _totalCollected) public view returns (uint256);
 }
diff --git a/contracts/test/ControllerStub.sol b/contracts/test/ControllerStub.sol
@@ -6,12 +6,16 @@ import "../IWingsController.sol";
 
 // Minimal crowdsale token for custom contracts
 contract ControllerStub is IWingsController {
-  
+
   constructor(uint256 _ethRewardPart, uint256 _tokenRewardPart) {
     ethRewardPart = _ethRewardPart;
     tokenRewardPart = _tokenRewardPart;
   }
 
+  function fitCollectedValueIntoRange(uint256 _totalCollected) public view returns (uint256) {
+    return _totalCollected;
+  }
+
   function() public payable {
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wings-light-bridge",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "In this tutorial we are going to walkthrough the Wings integration process.",
   "main": "truffle.js",
   "directories": {