Merge pull request #521 from AugurProject/initial_reporter_escape_hatch_eth

use cash for gas report bond and send it in the escape hatch

Author: nuevoalex

source/contracts/reporting/IInitialReporter.sol

@@ -12,5 +12,4 @@ contract IInitialReporter is IReportingParticipant {
     function designatedReporterWasCorrect() public view returns (bool);
     function getDesignatedReporter() public view returns (address);
     function getReportTimestamp() public view returns (uint256);
-    function depositGasBond() public payable returns (bool);
 }

source/contracts/reporting/InitialReporter.sol

@@ -23,10 +23,6 @@ contract InitialReporter is DelegationTarget, Ownable, Extractable, BaseReportin
         return true;
     }
 
-    function depositGasBond() public payable returns (bool) {
-        return true;
-    }
-
     function redeem(address) public returns (bool) {
         if (!isDisavowed() && !market.isFinalized()) {
             market.finalize();
@@ -57,6 +53,10 @@ contract InitialReporter is DelegationTarget, Ownable, Extractable, BaseReportin
 
     function withdrawInEmergency() public onlyInBadTimes returns (bool) {
         reputationToken.transfer(owner, reputationToken.balanceOf(this));
+        uint256 _cashBalance = cash.balanceOf(this);
+        if (_cashBalance > 0) {
+            cash.withdrawEtherTo(owner, _cashBalance);
+        }
         return true;
     }
 

source/contracts/reporting/Market.sol

@@ -89,8 +89,6 @@ contract Market is DelegationTarget, Extractable, ITyped, Initializable, Ownable
         if (_refund > 0) {
             require(owner.call.value(_refund)());
         }
-        // Send the reporter gas bond to the initial report contract. It will be paid out only if they are correct.
-        require(IInitialReporter(participants[0]).depositGasBond.value(reporterGasCostsFeeAttoeth)());
         return true;
     }
 
@@ -225,8 +223,10 @@ contract Market is DelegationTarget, Extractable, ITyped, Initializable, Ownable
         // If the designated reporter showed up return the no show bond to the market creator. Otherwise it will be used as stake in the first report.
         if (_reporter == _initialReporter.getDesignatedReporter()) {
             _reputationToken.transfer(owner, _repBalance);
+            marketCreatorMailbox.depositEther.value(reporterGasCostsFeeAttoeth)();
         } else {
             _reputationToken.transfer(_initialReporter, _repBalance);
+            cash.depositEtherFor.value(reporterGasCostsFeeAttoeth)(_initialReporter);
         }
         return true;
     }

tests/reporting/test_fee_distribution.py

@@ -6,6 +6,7 @@
 
 def test_initial_report_and_participation_fee_collection(localFixture, universe, market, categoricalMarket, scalarMarket, cash, reputationToken):
     feeWindow = localFixture.applySignature('FeeWindow', market.getFeeWindow())
+    constants = localFixture.contracts["Constants"]
 
     # We cannot purchase participation tokens yet since the window isn't active
     with raises(TransactionFailed):
@@ -121,6 +122,7 @@ def test_failed_crowdsourcer_fees(localFixture, universe, market, cash, reputati
 
 def test_one_round_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
     feeWindow = localFixture.applySignature('FeeWindow', market.getFeeWindow())
+    constants = localFixture.contracts["Constants"]
 
     # We'll make the window active
     localFixture.contracts["Time"].setTimestamp(feeWindow.getStartTime() + 1)
@@ -164,6 +166,8 @@ def test_one_round_crowdsourcer_fees(localFixture, universe, market, cash, reput
             assert initialReporter.redeem(tester.a0)
 
 def test_multiple_round_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
+    constants = localFixture.contracts["Constants"]
+
     # Initial Report disputed
     proceedToNextRound(localFixture, market, tester.k1, True)
     # Initial Report winning

tests/reporting/test_reporting.py

@@ -61,7 +61,7 @@ def test_initialReportHappyPath(localFixture, universe, market):
     localFixture.contracts["Time"].setTimestamp(feeWindow.getEndTime() + 1)
     assert market.finalize()
 
-def test_initialReport_transfer_ownership(localFixture, universe, market, cash):
+def test_initialReport_transfer_ownership(localFixture, universe, market, cash, constants):
     reputationToken = localFixture.applySignature("ReputationToken", universe.getReputationToken())
 
     # proceed to the initial reporting period
@@ -92,8 +92,11 @@ def test_initialReport_transfer_ownership(localFixture, universe, market, cash):
     # When we redeem the initialReporter it goes to the correct party as well
     expectedRep = initialReporter.getStake()
     owner = initialReporter.getOwner()
-    with TokenDelta(reputationToken, expectedRep, owner, "Redeeming didn't refund REP"):
-        assert initialReporter.redeem(owner)
+
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
+    with EtherDelta(expectedGasBond, owner, localFixture.chain, "Initial reporter did not get the reporting gas cost bond"):
+        with TokenDelta(reputationToken, expectedRep, owner, "Redeeming didn't refund REP"):
+            assert initialReporter.redeem(owner)
 
 @mark.parametrize('rounds', [
     2,
@@ -327,3 +330,7 @@ def localSnapshot(fixture, kitchenSinkSnapshot):
 def localFixture(fixture, localSnapshot):
     fixture.resetToSnapshot(localSnapshot)
     return fixture
+
+@fixture
+def constants(localFixture, kitchenSinkSnapshot):
+    return localFixture.contracts['Constants']

tests/reporting/test_universe_redeem.py

@@ -62,6 +62,7 @@ def test_redeem_participation_tokens(kitchenSinkFixture, universe, market, cash)
 
 def test_redeem_reporting_participants(kitchenSinkFixture, market, categoricalMarket, scalarMarket, universe, cash):
     reputationToken = kitchenSinkFixture.applySignature("ReputationToken", universe.getReputationToken())
+    constants = kitchenSinkFixture.contracts["Constants"]
 
     # Initial Report
     proceedToNextRound(kitchenSinkFixture, market, doGenerateFees = True)
@@ -90,8 +91,8 @@ def test_redeem_reporting_participants(kitchenSinkFixture, market, categoricalMa
     expectedRep = long(winningDisputeCrowdsourcer2.getStake() + winningDisputeCrowdsourcer1.getStake())
     expectedRep = long(expectedRep + expectedRep / 2)
     expectedRep += long(initialReporter.getStake() + initialReporter.getStake() / 2)
+    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, expectedRep, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees, tester.a0, kitchenSinkFixture.chain, "Redeeming didn't increase ETH correctly"):
-            with PrintGasUsed(kitchenSinkFixture, "Universe Redeem:", 0):
-                assert universe.redeemStake([initialReporter.address, winningDisputeCrowdsourcer1.address, winningDisputeCrowdsourcer2.address], [])
+        with PrintGasUsed(kitchenSinkFixture, "Universe Redeem:", 0):
+            assert universe.redeemStake([initialReporter.address, winningDisputeCrowdsourcer1.address, winningDisputeCrowdsourcer2.address], [])
 

tests/reporting_utils.py

@@ -114,6 +114,7 @@ def generateFees(fixture, universe, market):
     completeSets = fixture.contracts['CompleteSets']
     cash = fixture.contracts['Cash']
     mailbox = fixture.applySignature('Mailbox', market.getMarketCreatorMailbox())
+    assert mailbox.withdrawEther()
 
     cost = 1000 * market.getNumTicks()
     marketCreatorFees = cost / market.getMarketCreatorSettlementFeeDivisor()

tests/solidity_test_helpers/MockInitialReporter.sol

@@ -58,10 +58,6 @@ contract MockInitialReporter is IInitialReporter {
         return reportTimestamp;
     }
 
-    function depositGasBond() public payable returns (bool) {
-        return true;
-    }
-
     function getStake() public view returns (uint256) {
         return 0;
     }