Child universes may be created manually

Author: nuevoalex

source/contracts/reporting/BaseReportingParticipant.sol

@@ -34,7 +34,7 @@ contract BaseReportingParticipant is Controlled, IReportingParticipant {
 
     function fork() public onlyInGoodTimes returns (bool) {
         require(market == market.getUniverse().getForkingMarket());
-        IUniverse _newUniverse = market.getUniverse().createChildUniverse(payoutDistributionHash);
+        IUniverse _newUniverse = market.getUniverse().createChildUniverse(payoutNumerators, invalid);
         IReputationToken _newReputationToken = _newUniverse.getReputationToken();
         redeemForAllFeeWindows();
         uint256 _balance = reputationToken.balanceOf(this);

source/contracts/reporting/IReputationToken.sol

@@ -14,5 +14,6 @@ contract IReputationToken is ITyped, ERC20 {
     function trustedFeeWindowTransfer(address _source, address _destination, uint256 _attotokens) public returns (bool);
     function trustedUniverseTransfer(address _source, address _destination, uint256 _attotokens) public returns (bool);
     function getUniverse() public view returns (IUniverse);
+    function getTotalMigrated() public view returns (uint256);
     function mintForReportingParticipant(uint256 _amountMigrated) public returns (bool);
 }

source/contracts/reporting/IUniverse.sol

@@ -15,7 +15,7 @@ contract IUniverse is ITyped {
     function initialize(IUniverse _parentUniverse, bytes32 _parentPayoutDistributionHash) external returns (bool);
     function fork() public returns (bool);
     function getParentUniverse() public view returns (IUniverse);
-    function createChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (IUniverse);
+    function createChildUniverse(uint256[] _parentPayoutNumerators, bool _invalid) public returns (IUniverse);
     function getChildUniverse(bytes32 _parentPayoutDistributionHash) public view returns (IUniverse);
     function getReputationToken() public view returns (IReputationToken);
     function getForkingMarket() public view returns (IMarket);
@@ -40,6 +40,7 @@ contract IUniverse is ITyped {
     function getCurrentFeeWindow() public view returns (IFeeWindow);
     function getOrCreateFeeWindowBefore(IFeeWindow _feeWindow) public returns (IFeeWindow);
     function isParentOf(IUniverse _shadyChild) public view returns (bool);
+    function updateTentativeWinningChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (bool);
     function isContainerForFeeWindow(IFeeWindow _shadyTarget) public view returns (bool);
     function isContainerForMarket(IMarket _shadyTarget) public view returns (bool);
     function isContainerForReportingParticipant(IReportingParticipant _reportingParticipant) public view returns (bool);

source/contracts/reporting/ReputationToken.sol

@@ -22,6 +22,7 @@ contract ReputationToken is DelegationTarget, Extractable, ITyped, Initializable
     string constant public symbol = "REP";
     uint256 constant public decimals = 18;
     IUniverse private universe;
+    uint256 private totalMigrated;
 
     function initialize(IUniverse _universe) public onlyInGoodTimes beforeInitialized returns (bool) {
         endInitialization();
@@ -42,12 +43,11 @@ contract ReputationToken is DelegationTarget, Extractable, ITyped, Initializable
         IUniverse _parentUniverse = universe.getParentUniverse();
         require(ReputationToken(msg.sender) == _parentUniverse.getReputationToken());
         mint(_reporter, _attotokens);
-        // Award a bonus if migration is done before the fork has resolved and check if the fork can be resolved early
+        totalMigrated += _attotokens;
+        // Award a bonus if migration is done before the fork has resolved and update the universe tentative winner tracking
         if (!_parentUniverse.getForkingMarket().isFinalized()) {
             mint(_reporter, _attotokens.div(Reporting.getForkMigrationPercentageBonusDivisor()));
-            if (supply > _parentUniverse.getForkReputationGoal()) {
-                _parentUniverse.getForkingMarket().finalizeFork();
-            }
+            _parentUniverse.updateTentativeWinningChildUniverse(universe.getParentPayoutDistributionHash());
         }
         return true;
     }
@@ -108,6 +108,10 @@ contract ReputationToken is DelegationTarget, Extractable, ITyped, Initializable
         return universe;
     }
 
+    function getTotalMigrated() public view returns (uint256) {
+        return totalMigrated;
+    }
+
     function onTokenTransfer(address _from, address _to, uint256 _value) internal returns (bool) {
         controller.getAugur().logReputationTokensTransferred(universe, _from, _to, _value);
         return true;

source/contracts/reporting/Universe.sol

@@ -26,11 +26,12 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     bytes32 private parentPayoutDistributionHash;
     IReputationToken private reputationToken;
     IMarket private forkingMarket;
+    bytes32 private tentativeWinningChildUniversePayoutDistributionHash;
     uint256 private forkEndTime;
     uint256 private forkReputationGoal;
     mapping(uint256 => IFeeWindow) private feeWindows;
     mapping(address => bool) private markets;
-    IUniverse[] private childUniverses;
+    mapping(bytes32 => IUniverse) private childUniverses;
     uint256 private openInterestInAttoEth;
 
     mapping (address => uint256) private validityBondInAttoeth;
@@ -60,8 +61,6 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
         } else {
             // We're using a hardcoded supply value instead of getting the total REP supply from the token since at launch we will start out with a 0 supply token and users will migrate legacy REP to this token. Since the first fork may occur before all REP migrates we want to count that unmigrated REP too since it may participate in the fork eventually.
             forkReputationGoal = Reporting.getInitialREPSupply() / Reporting.getForkRepMigrationVictoryDivisor();
-            // Account for the bonus for migrating rep that occurs before finalization
-            forkReputationGoal += forkReputationGoal / Reporting.getForkMigrationPercentageBonusDivisor();
         }
         controller.getAugur().logUniverseForked();
         return true;
@@ -104,13 +103,7 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
     }
 
     function getChildUniverse(bytes32 _parentPayoutDistributionHash) public view returns (IUniverse) {
-        for (uint8 i=0; i < childUniverses.length; i++) {
-            IUniverse _childUniverse = childUniverses[i];
-            if (_childUniverse.getParentPayoutDistributionHash() == _parentPayoutDistributionHash) {
-                return _childUniverse;
-            }
-        }
-        return IUniverse(0);
+        return childUniverses[_parentPayoutDistributionHash];
     }
 
     function getFeeWindowId(uint256 _timestamp) public view returns (uint256) {
@@ -164,34 +157,41 @@ contract Universe is DelegationTarget, Extractable, ITyped, Initializable, IUniv
         return getOrCreateFeeWindowByTimestamp(_feeWindow.getStartTime() - 2);
     }
 
-    function createChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (IUniverse) {
-        IReportingParticipant _reportingParticipant = IReportingParticipant(msg.sender);
-        require(isContainerForReportingParticipant(_reportingParticipant));
-        require(_reportingParticipant.getMarket() == forkingMarket);
+    function createChildUniverse(uint256[] _parentPayoutNumerators, bool _parentInvalid) public returns (IUniverse) {
+        bytes32 _parentPayoutDistributionHash = forkingMarket.derivePayoutDistributionHash(_parentPayoutNumerators, _parentInvalid);
         IUniverse _childUniverse = getChildUniverse(_parentPayoutDistributionHash);
         if (_childUniverse == IUniverse(0)) {
             _childUniverse = controller.getAugur().createChildUniverse(_parentPayoutDistributionHash);
-            childUniverses.push(_childUniverse);
+            childUniverses[_parentPayoutDistributionHash] = _childUniverse;
             controller.getAugur().logUniverseCreated(_childUniverse);
         }
         return _childUniverse;
     }
 
+    function updateTentativeWinningChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (bool) {
+        IUniverse _tentativeWinningUniverse = getChildUniverse(tentativeWinningChildUniversePayoutDistributionHash);
+        IUniverse _updatedUniverse = getChildUniverse(_parentPayoutDistributionHash);
+        uint256 _currentTentativeWinningChildUniverseRepMigrated = 0;
+        if (_tentativeWinningUniverse != IUniverse(0)) {
+            _tentativeWinningUniverse.getReputationToken().getTotalMigrated();
+        }
+        uint256 _updatedUniverseRepMigrated = _updatedUniverse.getReputationToken().getTotalMigrated();
+        if (_updatedUniverseRepMigrated > _currentTentativeWinningChildUniverseRepMigrated) {
+            tentativeWinningChildUniversePayoutDistributionHash = _parentPayoutDistributionHash;
+        }
+        if (_updatedUniverseRepMigrated >= forkReputationGoal) {
+            forkingMarket.finalizeFork();
+        }
+        return true;
+    }
+
     function getWinningChildUniverse() public view returns (IUniverse) {
         require(forkingMarket != IMarket(0));
-        require(childUniverses.length > 0);
-        uint256 _winningAmount = 0;
-        IUniverse _winningUniverse;
-        for (uint8 i = 0; i < childUniverses.length; i++) {
-            uint256 _balance = childUniverses[i].getReputationToken().totalSupply();
-            if (_balance > _winningAmount) {
-                _winningUniverse = childUniverses[i];
-                _winningAmount = _balance;
-            }
-        }
-        require(_winningUniverse != IUniverse(0));
+        require(tentativeWinningChildUniversePayoutDistributionHash != bytes32(0));
+        IUniverse _tentativeWinningUniverse = getChildUniverse(tentativeWinningChildUniversePayoutDistributionHash);
+        uint256 _winningAmount = _tentativeWinningUniverse.getReputationToken().getTotalMigrated();
         require(_winningAmount >= forkReputationGoal || controller.getTimestamp() > forkEndTime);
-        return _winningUniverse;
+        return _tentativeWinningUniverse;
     }
 
     function isContainerForFeeWindow(IFeeWindow _shadyFeeWindow) public view returns (bool) {

tests/conftest.py

@@ -346,9 +346,8 @@ def getShareToken(self, market, outcome):
         return shareToken
 
     def getOrCreateChildUniverse(self, parentUniverse, market, payoutDistribution):
-        payoutDistributionHash = market.derivePayoutDistributionHash(payoutDistribution, False)
         assert payoutDistributionHash
-        childUniverseAddress = parentUniverse.getOrCreateChildUniverse(payoutDistributionHash)
+        childUniverseAddress = parentUniverse.getOrCreateChildUniverse(payoutDistribution, False)
         assert childUniverseAddress
         childUniverse = ABIContract(self.chain, ContractTranslator(ContractsFixture.signatures['Universe']), childUniverseAddress)
         return childUniverse

tests/reporting/test_reporting.py

@@ -158,6 +158,10 @@ def test_forking(finalizeByMigration, localFixture, universe, market, categorica
     with raises(TransactionFailed, message="We cannot migrate until the fork is finalized"):
         categoricalMarket.migrateThroughOneFork()
 
+    # confirm that we can manually create a child universe from an outcome no one asserted was true during dispute
+    numTicks = market.getNumTicks()
+    childUniverse = universe.createChildUniverse([numTicks/ 4, numTicks * 3 / 4], False)
+
     # finalize the fork
     finalizeFork(localFixture, market, universe, finalizeByMigration)
 

tests/solidity_test_helpers/MockReputationToken.sol

@@ -178,4 +178,8 @@ contract MockReputationToken is DelegationTarget, ITyped, Initializable, MockVar
     function mintForReportingParticipant(uint256 _amountMigrated) public returns (bool) {
         return true;
     }
+
+    function getTotalMigrated() public view returns (uint256) {
+        return 0;
+    }
 }

tests/solidity_test_helpers/MockUniverse.sol

@@ -391,7 +391,7 @@ contract MockUniverse is Initializable, IUniverse {
         return _newMarket;
     }
 
-    function createChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (IUniverse) {
+    function createChildUniverse(uint256[] _parentPayoutNumerators, bool _parentInvalid) public returns (IUniverse) {
         return IUniverse(0);
     }
 
@@ -426,4 +426,8 @@ contract MockUniverse is Initializable, IUniverse {
     function isForking() public view returns (bool) {
         return true;
     }
+
+    function updateTentativeWinningChildUniverse(bytes32 _parentPayoutDistributionHash) public returns (bool) {
+        return true;
+    }
 }