the gas bonds should go to the market creator, not the designated reporter

Author: nuevoalex

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.
-        cash.depositEtherFor.value(reporterGasCostsFeeAttoeth)(participants[0]);
         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_escape_hatches.py

@@ -74,10 +74,8 @@ def test_reporting_participant_escape_hatch(localFixture, controller, reputation
     assert controller.emergencyStop()
 
     # We can now call the escape hatch
-    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
-    with EtherDelta(expectedGasBond, initialReporter.getOwner(), localFixture.chain, "Initial reporter did not get the reporting gas cost bond"):
-        with TokenDelta(reputationToken, reputationToken.balanceOf(initialReporter.address), tester.a0, "REP was not given back"):
-            assert initialReporter.withdrawInEmergency()
+    with TokenDelta(reputationToken, reputationToken.balanceOf(initialReporter.address), tester.a0, "REP was not given back"):
+        assert initialReporter.withdrawInEmergency()
 
     with TokenDelta(reputationToken, reputationToken.balanceOf(crowdsourcer1.address), tester.a0, "REP was not given back"):
         assert crowdsourcer1.withdrawInEmergency()

tests/reporting/test_fee_distribution.py

@@ -69,15 +69,14 @@ def test_initial_report_and_participation_fee_collection(localFixture, universe,
 
     marketStake = marketInitialReport.getStake()
     expectedFees = reporterFees * marketStake / totalStake
-    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, marketStake, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert marketInitialReport.redeem(tester.a0)
 
     categoricalMarketStake = categoricalInitialReport.getStake()
     expectedFees = reporterFees * categoricalMarketStake / totalStake
     with TokenDelta(reputationToken, categoricalMarketStake, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert categoricalInitialReport.redeem(tester.a0)
 
 def test_failed_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
@@ -162,9 +161,8 @@ def test_one_round_crowdsourcer_fees(localFixture, universe, market, cash, reput
 
     # The initial reporter gets fees even though they were not correct. They do not get their REP back though
     expectedFees = cash.balanceOf(feeWindow.address) + cash.balanceOf(universe.getOrCreateFeeWindowBefore(feeWindow.address))
-    expectedGasBond = 2 * constants.GAS_TO_REPORT() * constants.DEFAULT_REPORTING_GAS_PRICE()
     with TokenDelta(reputationToken, 0, tester.a0, "Redeeming didn't refund REP"):
-        with EtherDelta(expectedFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert initialReporter.redeem(tester.a0)
 
 def test_multiple_round_crowdsourcer_fees(localFixture, universe, market, cash, reputationToken):
@@ -203,9 +201,8 @@ def test_multiple_round_crowdsourcer_fees(localFixture, universe, market, cash,
     # The initial reporter locked in REP for 5 rounds.
     expectedInitialReporterFees = getExpectedFees(localFixture, cash, initialReporter, 5)
     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(expectedInitialReporterFees + expectedGasBond, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
+        with EtherDelta(expectedInitialReporterFees, tester.a0, localFixture.chain, "Redeeming didn't increase ETH correctly"):
             assert initialReporter.redeem(tester.a0)
 
     # The first winning dispute crowdsourcer will get fees for 4 rounds

tests/reporting/test_universe_redeem.py

@@ -93,7 +93,6 @@ def test_redeem_reporting_participants(kitchenSinkFixture, market, categoricalMa
     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 +  expectedGasBond, 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()