Merge branch 'master' into sbigelow/travis

Author: pgebheim

CRIBBED_CODE.txt

@@ -0,0 +1,29 @@
+Licensing inclusion for the following files which were originally taken from the OpenZeppelin Solidity token contracts and later modified by us:
+
+source/libraries/token/BasicToken.sol
+source/libraries/token/ERC20.sol
+source/libraries/token/ERC20Basic.sol
+source/libraries/token/StandardToken.sol
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Smart Contract Solutions, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

source/contracts/Augur.sol

@@ -34,6 +34,8 @@ contract Augur is Controlled, Extractable {
     event TokensMinted(address indexed universe, address indexed token, address indexed target, uint256 amount);
     event TokensBurned(address indexed universe, address indexed token, address indexed target, uint256 amount);
     event FeeWindowCreated(address indexed universe, address feeWindow, uint256 startTime, uint256 endTime, uint256 id);
+    event WhitelistAddition(address addition);
+    event RegistryAddition(bytes32 key, address addition, bytes20 commitHash, bytes32 bytecodeHash);
 
     mapping(address => bool) private universes;
 
@@ -279,6 +281,16 @@ contract Augur is Controlled, Extractable {
         return true;
     }
 
+    function logContractAddedToWhitelist(address _addition) public onlyControllerCaller returns (bool) {
+        WhitelistAddition(_addition);
+        return true;
+    }
+
+    function logContractAddedToRegistry(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public onlyControllerCaller returns (bool) {
+        RegistryAddition(_key, _address, _commitHash, _bytecodeHash);
+        return true;
+    }
+
     function getProtectedTokens() internal returns (address[] memory) {
         return new address[](0);
     }

source/contracts/Controller.sol

@@ -66,6 +66,7 @@ contract Controller is IController {
 
     function addToWhitelist(address _target) public onlyWhitelistedCallers returns (bool) {
         whitelist[_target] = true;
+        getAugur().logContractAddedToWhitelist(_target);
         return true;
     }
 
@@ -85,6 +86,7 @@ contract Controller is IController {
 
     function registerContract(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public onlyOwnerCaller returns (bool) {
         registry[_key] = ContractDetails(_key, _address, _commitHash, _bytecodeHash);
+        getAugur().logContractAddedToRegistry(_key, _address, _commitHash, _bytecodeHash);
         return true;
     }
 

source/contracts/factories/DisputeCrowdsourcerFactory.sol

@@ -3,7 +3,6 @@ pragma solidity 0.4.18;
 import 'libraries/Delegator.sol';
 import 'reporting/IDisputeCrowdsourcer.sol';
 import 'reporting/IMarket.sol';
-import 'reporting/IFeeWindow.sol';
 import 'IController.sol';
 
 

source/contracts/factories/MarketFactory.sol

@@ -2,7 +2,6 @@ pragma solidity 0.4.18;
 
 
 import 'libraries/Delegator.sol';
-import 'reporting/IFeeWindow.sol';
 import 'reporting/IMarket.sol';
 import 'reporting/IReputationToken.sol';
 import 'trading/ICash.sol';

source/contracts/libraries/Delegator.sol

@@ -23,14 +23,9 @@ contract Delegator is DelegationTarget {
         assembly {
             //0x40 is the address where the next free memory slot is stored in Solidity
             let _calldataMemoryOffset := mload(0x40)
+            // new "memory end" including padding. The bitwise operations here ensure we get rounded up to the nearest 32 byte boundary
+            let _size := and(add(calldatasize, 0x1f), not(0x1f))
             // Update the pointer at 0x40 to point at new free memory location so any theoretical allocation doesn't stomp our memory in this call
-            let _size := 0
-            switch gt(calldatasize, 32)
-            case 1 {
-                _size := calldatasize
-            } default {
-                _size := 32
-            }
             mstore(0x40, add(_calldataMemoryOffset, _size))
             // Copy method signature and parameters of this call into memory
             calldatacopy(_calldataMemoryOffset, 0x0, calldatasize)

source/contracts/reporting/FeeWindow.sol

@@ -16,7 +16,6 @@ import 'reporting/Reporting.sol';
 import 'libraries/math/SafeMathUint256.sol';
 import 'libraries/math/RunningAverage.sol';
 import 'reporting/IFeeWindow.sol';
-import 'factories/FeeWindowFactory.sol';
 import 'libraries/Extractable.sol';
 import 'libraries/token/VariableSupplyToken.sol';
 import 'reporting/IFeeToken.sol';
@@ -42,7 +41,7 @@ contract FeeWindow is DelegationTarget, VariableSupplyToken, Extractable, Initia
     function initialize(IUniverse _universe, uint256 _feeWindowId) public onlyInGoodTimes beforeInitialized returns (bool) {
         endInitialization();
         universe = _universe;
-        startTime = _feeWindowId * universe.getDisputeRoundDurationInSeconds();
+        startTime = _feeWindowId.mul(universe.getDisputeRoundDurationInSeconds());
         // Initialize this to some reasonable value to handle the first market ever created without branching code
         reportingGasPrice.record(Reporting.getDefaultReportingGasPrice());
         feeToken = FeeTokenFactory(controller.lookup("FeeTokenFactory")).createFeeToken(controller, this);
@@ -108,7 +107,7 @@ contract FeeWindow is DelegationTarget, VariableSupplyToken, Extractable, Initia
         }
 
         if (_totalFeeStake == 0) {
-            return;
+            return true;
         }
 
         // CASH
@@ -173,7 +172,7 @@ contract FeeWindow is DelegationTarget, VariableSupplyToken, Extractable, Initia
     }
 
     function getEndTime() public afterInitialized view returns (uint256) {
-        return getStartTime() + Reporting.getDisputeRoundDurationSeconds();
+        return getStartTime().add(Reporting.getDisputeRoundDurationSeconds());
     }
 
     function getFeeToken() public afterInitialized view returns (IFeeToken) {

source/contracts/reporting/Market.sol

@@ -405,7 +405,7 @@ contract Market is DelegationTarget, Extractable, ITyped, Initializable, Ownable
     }
 
     function getDesignatedReportingEndTime() public view returns (uint256) {
-        return endTime + Reporting.getDesignatedReportingDurationSeconds();
+        return endTime.add(Reporting.getDesignatedReportingDurationSeconds());
     }
 
     function getNumParticipants() public view returns (uint256) {

source/contracts/reporting/ReputationToken.sol

@@ -122,8 +122,8 @@ contract ReputationToken is DelegationTarget, Extractable, ITyped, Initializable
 
     function updateSiblingMigrationTotal(IReputationToken _token) public returns (bool) {
         require(_token != this);
-        IUniverse _supposedUniverse = _token.getUniverse();
-        require(_token == universe.getParentUniverse().getChildUniverse(_supposedUniverse.getParentPayoutDistributionHash()).getReputationToken());
+        IUniverse _shadyUniverse = _token.getUniverse();
+        require(_token == universe.getParentUniverse().getChildUniverse(_shadyUniverse.getParentPayoutDistributionHash()).getReputationToken());
         totalTheoreticalSupply += migratedToSibling[_token];
         migratedToSibling[_token] = _token.getTotalMigrated();
         totalTheoreticalSupply -= migratedToSibling[_token];

source/contracts/reporting/Universe.sol

@@ -56,7 +56,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
         require(forkingMarket == IMarket(0));
         require(isContainerForMarket(IMarket(msg.sender)));
         forkingMarket = IMarket(msg.sender);
-        forkEndTime = controller.getTimestamp() + Reporting.getForkDurationSeconds();
+        forkEndTime = controller.getTimestamp().add(Reporting.getForkDurationSeconds());
         controller.getAugur().logUniverseForked();
         return true;
     }
@@ -65,7 +65,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
         uint256 _totalRepSupply = reputationToken.getTotalTheoreticalSupply();
         forkReputationGoal = _totalRepSupply.div(2); // 50% of REP migrating results in a victory in a fork
         disputeThresholdForFork = _totalRepSupply.div(80); // 1.25% of the total rep supply
-        initialReportMinValue = disputeThresholdForFork.div(3).div(2**18) + 1; // This value will result in a maximum 20 round dispute sequence
+        initialReportMinValue = disputeThresholdForFork.div(3).div(2**18).add(1); // This value will result in a maximum 20 round dispute sequence
         return true;
     }
 
@@ -118,7 +118,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     }
 
     function getFeeWindowId(uint256 _timestamp) public view returns (uint256) {
-        return _timestamp / getDisputeRoundDurationInSeconds();
+        return _timestamp.div(getDisputeRoundDurationInSeconds());
     }
 
     function getDisputeRoundDurationInSeconds() public view returns (uint256) {
@@ -141,11 +141,11 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     }
 
     function getOrCreatePreviousFeeWindow() public onlyInGoodTimes returns (IFeeWindow) {
-        return getOrCreateFeeWindowByTimestamp(controller.getTimestamp() - getDisputeRoundDurationInSeconds());
+        return getOrCreateFeeWindowByTimestamp(controller.getTimestamp().sub(getDisputeRoundDurationInSeconds()));
     }
 
     function getPreviousFeeWindow() public view onlyInGoodTimes returns (IFeeWindow) {
-        return getFeeWindowByTimestamp(controller.getTimestamp() - getDisputeRoundDurationInSeconds());
+        return getFeeWindowByTimestamp(controller.getTimestamp().sub(getDisputeRoundDurationInSeconds()));
     }
 
     function getOrCreateCurrentFeeWindow() public onlyInGoodTimes returns (IFeeWindow) {
@@ -157,15 +157,15 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     }
 
     function getOrCreateNextFeeWindow() public onlyInGoodTimes returns (IFeeWindow) {
-        return getOrCreateFeeWindowByTimestamp(controller.getTimestamp() + getDisputeRoundDurationInSeconds());
+        return getOrCreateFeeWindowByTimestamp(controller.getTimestamp().add(getDisputeRoundDurationInSeconds()));
     }
 
     function getNextFeeWindow() public view onlyInGoodTimes returns (IFeeWindow) {
-        return getFeeWindowByTimestamp(controller.getTimestamp() + getDisputeRoundDurationInSeconds());
+        return getFeeWindowByTimestamp(controller.getTimestamp().add(getDisputeRoundDurationInSeconds()));
     }
 
     function getOrCreateFeeWindowBefore(IFeeWindow _feeWindow) public onlyInGoodTimes returns (IFeeWindow) {
-        return getOrCreateFeeWindowByTimestamp(_feeWindow.getStartTime() - 2);
+        return getOrCreateFeeWindowByTimestamp(_feeWindow.getStartTime().sub(2));
     }
 
     function createChildUniverse(uint256[] _parentPayoutNumerators, bool _parentInvalid) public returns (IUniverse) {
@@ -426,7 +426,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     }
 
     function getOrCacheMarketCreationCost() public onlyInGoodTimes returns (uint256) {
-        return getOrCacheValidityBond() + getOrCacheTargetReporterGasCosts();
+        return getOrCacheValidityBond().add(getOrCacheTargetReporterGasCosts());
     }
 
     function getInitialReportStakeSize() public onlyInGoodTimes returns (uint256) {