[Process Exit Bounty] Add process exit bounty for SE

plasma_framework/contracts/mocks/exits/payment/routers/PaymentInFlightExitRouterMock.sol

@@ -30,7 +30,7 @@ contract PaymentInFlightExitRouterMock is FailFastReentrancyGuard, PaymentInFlig
     }
 
     /** override and calls processInFlightExit for test */
-    function processExit(uint168 exitId, uint256, address ercContract) external {
+    function processExit(uint168 exitId, uint256, address ercContract, address payable) external {
         PaymentInFlightExitRouter.processInFlightExit(exitId, ercContract);
     }
 

plasma_framework/contracts/mocks/exits/payment/routers/PaymentStandardExitRouterMock.sol

@@ -20,8 +20,8 @@ contract PaymentStandardExitRouterMock is PaymentStandardExitRouter {
     }
 
     /** override and calls processStandardExit for test */
-    function processExit(uint168 exitId, uint256, address ercContract) external {
-        PaymentStandardExitRouter.processStandardExit(exitId, ercContract);
+    function processExit(uint168 exitId, uint256, address ercContract, address payable processor) external {
+        PaymentStandardExitRouter.processStandardExit(exitId, ercContract, processor);
     }
 
     /** helper functions for testing */

plasma_framework/contracts/mocks/exits/utils/ExitBountyWrapper.sol

@@ -0,0 +1,11 @@
+pragma solidity 0.5.11;
+
+import "../../../src/exits/utils/ExitBounty.sol";
+
+contract ExitBountyWrapper {
+
+    function processStandardExitBountySize() public view returns (uint256) {
+        return ExitBounty.processStandardExitBountySize();
+    }
+
+}

plasma_framework/contracts/mocks/framework/DummyExitGame.sol

@@ -23,7 +23,7 @@ contract DummyExitGame is IExitProcessor {
     );
 
     // override ExitProcessor interface
-    function processExit(uint168 exitId, uint256 vaultId, address ercContract) public {
+    function processExit(uint168 exitId, uint256 vaultId, address ercContract, address payable) public {
         emit ExitFinalizedFromDummyExitGame(exitId, vaultId, ercContract);
     }
 

plasma_framework/contracts/mocks/framework/ReentrancyExitGame.sol

@@ -19,7 +19,7 @@ contract ReentrancyExitGame is IExitProcessor {
 
     // override ExitProcessor interface
     // This would call the processExits back to mimic reentracy attack
-    function processExit(uint168, uint256, address) public {
+    function processExit(uint168, uint256, address, address payable) public {
         exitGameController.processExits(vaultId, testToken, 0, reentryMaxExitToProcess);
     }
 

plasma_framework/contracts/poc/fast_exits/Liquidity.sol

@@ -9,6 +9,7 @@ import "../../src/framework/models/BlockModel.sol";
 import "../../src/utils/Merkle.sol";
 import "../../src/exits/payment/routers/PaymentStandardExitRouter.sol";
 import "openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol";
+import "../../src/exits/utils/ExitBounty.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol";
 
@@ -165,7 +166,12 @@ contract Liquidity is ERC721Full {
 
         FungibleTokenOutputModel.Output memory outputFromSecondTransaction
         = decodedSecondTx.outputs[0];
-        exitData[exitId] = ExitData(msg.value, msg.sender, outputFromSecondTransaction.amount, outputFromSecondTransaction.token);
+        exitData[exitId] = ExitData(
+            msg.value - ExitBounty.processStandardExitBountySize(),
+            msg.sender,
+            outputFromSecondTransaction.amount,
+            outputFromSecondTransaction.token
+        );
     }
 
     /**

plasma_framework/contracts/src/exits/payment/PaymentExitDataModel.sol

@@ -15,6 +15,7 @@ library PaymentExitDataModel {
      * @param exitTarget The address to which the exit withdraws funds
      * @param amount The amount of funds to withdraw with this exit
      * @param bondSize The size of the bond put up for this exit to start, and which is used to cover the cost of challenges
+     * @param bountySize The size of the bounty put up to cover the cost of processing the exit
      */
     struct StandardExit {
         bool exitable;
@@ -23,6 +24,7 @@ library PaymentExitDataModel {
         address payable exitTarget;
         uint256 amount;
         uint256 bondSize;
+        uint256 bountySize;
     }
 
     /**

plasma_framework/contracts/src/exits/payment/PaymentExitGame.sol

@@ -34,10 +34,11 @@ contract PaymentExitGame is IExitProcessor, OnlyFromAddress, PaymentStandardExit
      * @notice Callback processes exit function for the PlasmaFramework to call
      * @param exitId The exit ID
      * @param token Token (ERC20 address or address(0) for ETH) of the exiting output
+     * @param processor The processExit initiator
      */
-    function processExit(uint168 exitId, uint256, address token) external onlyFrom(address(plasmaFramework)) {
+    function processExit(uint168 exitId, uint256, address token, address payable processor) external onlyFrom(address(plasmaFramework)) {
         if (ExitId.isStandardExit(exitId)) {
-            PaymentStandardExitRouter.processStandardExit(exitId, token);
+            PaymentStandardExitRouter.processStandardExit(exitId, token, processor);
         } else {
             PaymentInFlightExitRouter.processInFlightExit(exitId, token);
         }

plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeStandardExit.sol

@@ -90,7 +90,7 @@ library PaymentChallengeStandardExit {
 
         exitMap.exits[args.exitId].exitable = false;
 
-        SafeEthTransfer.transferRevertOnError(msg.sender, data.exitData.bondSize, self.safeGasStipend);
+        SafeEthTransfer.transferRevertOnError(msg.sender, data.exitData.bondSize + data.exitData.bountySize, self.safeGasStipend);
 
         emit ExitChallenged(data.exitData.utxoPos);
     }

plasma_framework/contracts/src/exits/payment/controllers/PaymentProcessStandardExit.sol

@@ -29,6 +29,11 @@ library PaymentProcessStandardExit {
         uint256 amount
     );
 
+    event BountyRewardFailed(
+        address indexed receiver,
+        uint256 amount
+    );
+
     /**
      * @notice Main logic function to process standard exit
      * @dev emits ExitOmitted event if the exit is omitted
@@ -42,7 +47,8 @@ library PaymentProcessStandardExit {
         Controller memory self,
         PaymentExitDataModel.StandardExitMap storage exitMap,
         uint168 exitId,
-        address token
+        address token,
+        address payable processor
     )
         public
     {
@@ -57,11 +63,16 @@ library PaymentProcessStandardExit {
         self.framework.flagOutputFinalized(exit.outputId, exitId);
 
         // we do not want to block a queue if bond return is unsuccessful
-        bool success = SafeEthTransfer.transferReturnResult(exit.exitTarget, exit.bondSize, self.safeGasStipend);
-        if (!success) {
+        bool successBondReturn = SafeEthTransfer.transferReturnResult(exit.exitTarget, exit.bondSize, self.safeGasStipend);
+        if (!successBondReturn) {
             emit BondReturnFailed(exit.exitTarget, exit.bondSize);
         }
 
+        bool successBountyReturn = SafeEthTransfer.transferReturnResult(processor, exit.bountySize, self.safeGasStipend);
+        if (!successBountyReturn) {
+            emit BountyRewardFailed(processor, exit.bountySize);
+        }
+
         if (token == address(0)) {
             self.ethVault.withdraw(exit.exitTarget, exit.amount);
         } else {

plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol

@@ -7,10 +7,10 @@ import "../../utils/ExitableTimestamp.sol";
 import "../../utils/ExitId.sol";
 import "../../utils/OutputId.sol";
 import "../../utils/MoreVpFinalization.sol";
+import "../../utils/ExitBounty.sol";
 import "../../../transactions/PaymentTransactionModel.sol";
 import "../../../utils/PosLib.sol";
 import "../../../framework/PlasmaFramework.sol";
-import "../../utils/ExitableTimestamp.sol";
 
 library PaymentStartStandardExit {
     using ExitableTimestamp for ExitableTimestamp.Calculator;
@@ -170,7 +170,8 @@ library PaymentStartStandardExit {
             outputId: data.outputId,
             exitTarget: msg.sender,
             amount: data.output.amount,
-            bondSize: msg.value
+            bondSize: msg.value - ExitBounty.processStandardExitBountySize(),
+            bountySize: ExitBounty.processStandardExitBountySize()
         });
     }
 

plasma_framework/contracts/src/exits/payment/routers/PaymentStandardExitRouter.sol

@@ -137,7 +137,7 @@ contract PaymentStandardExitRouter is
         public
         payable
         nonReentrant(framework)
-        onlyWithValue(startStandardExitBondSize())
+        onlyWithValue(startStandardExitBondSize() + ExitBounty.processStandardExitBountySize())
     {
         startStandardExitController.run(standardExitMap, args);
     }
@@ -157,8 +157,9 @@ contract PaymentStandardExitRouter is
      * @dev This function is designed to be called in the main processExit function, using internal
      * @param exitId The standard exit ID
      * @param token The token (in erc20 address or address(0) for ETH) of the exiting output
+     * @param processor The processExit initiator
      */
-    function processStandardExit(uint168 exitId, address token) internal {
-        processStandardExitController.run(standardExitMap, exitId, token);
+    function processStandardExit(uint168 exitId, address token, address payable processor) internal {
+        processStandardExitController.run(standardExitMap, exitId, token, processor);
     }
 }

plasma_framework/contracts/src/exits/utils/ExitBounty.sol

@@ -0,0 +1,12 @@
+pragma solidity 0.5.11;
+
+library ExitBounty {
+
+    /**
+     * @notice Returns the Process Exit Bounty size for standard exits
+     */
+    function processStandardExitBountySize() internal view returns (uint256) {
+        return 107000 * tx.gasprice;
+    }
+
+}

plasma_framework/contracts/src/framework/ExitGameController.sol

@@ -170,7 +170,7 @@ contract ExitGameController is ExitGameRegistry {
             queue.delMin();
             processedNum++;
 
-            processor.processExit(exitId, vaultId, token);
+            processor.processExit(exitId, vaultId, token, msg.sender);
 
             if (queue.currentSize() == 0) {
                 break;

plasma_framework/contracts/src/framework/interfaces/IExitProcessor.sol

@@ -10,6 +10,7 @@ interface IExitProcessor {
      * @param exitId Unique ID for exit per tx type
      * @param vaultId ID of the vault that funds the exit
      * @param token Address of the token contract
+     * @param processor Address of the processExit intitiator
      */
-    function processExit(uint168 exitId, uint256 vaultId, address token) external;
+    function processExit(uint168 exitId, uint256 vaultId, address token, address payable processor) external;
 }

plasma_framework/test/endToEndTests/FastExit.e2e.test.js

@@ -2,6 +2,7 @@ const PaymentExitGame = artifacts.require('PaymentExitGame');
 const PlasmaFramework = artifacts.require('PlasmaFramework');
 const Liquidity = artifacts.require('../Liquidity');
 const EthVault = artifacts.require('EthVault');
+const ExitBounty = artifacts.require('ExitBountyWrapper');
 const Erc20Vault = artifacts.require('Erc20Vault');
 const ERC20Mintable = artifacts.require('ERC20Mintable');
 
@@ -35,10 +36,11 @@ contract(
             alice = await web3.eth.personal.importRawKey(alicePrivateKey, password);
             alice = web3.utils.toChecksumAddress(alice);
             web3.eth.personal.unlockAccount(alice, password, 3600);
-            web3.eth.sendTransaction({ to: alice, from: richDad, value: web3.utils.toWei('1', 'ether') });
+            web3.eth.sendTransaction({ to: alice, from: richDad, value: web3.utils.toWei('2', 'ether') });
         };
 
         const deployStableContracts = async () => {
+            this.exitBountyHelper = await ExitBounty.new();
             this.erc20 = await ERC20Mintable.new();
             await this.erc20.mint(richDad, INITIAL_ERC20_SUPPLY);
         };
@@ -59,6 +61,12 @@ contract(
 
             this.startStandardExitBondSize = await this.exitGame.startStandardExitBondSize();
 
+            this.dummyGasPrice = 1000000;
+
+            this.processExitBountySize = await this.exitBountyHelper.processStandardExitBountySize({
+                gasPrice: this.dummyGasPrice,
+            });
+
             this.framework.addExitQueue(config.registerKeys.vaultId.eth, ETH);
 
             this.liquidity = await Liquidity.new(this.framework.address, { from: authority });
@@ -192,7 +200,11 @@ contract(
                                 rlpDepositTx,
                                 depositInclusionProof,
                                 depositUtxoPos,
-                                { from: bob, value: this.startStandardExitBondSize },
+                                {
+                                    from: bob,
+                                    value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                    gasPrice: this.dummyGasPrice,
+                                },
                             ),
                             'Was not called by the first Tx owner',
                         );
@@ -216,7 +228,11 @@ contract(
                                 rlpDepositTx,
                                 depositInclusionProof,
                                 depositUtxoPos,
-                                { from: alice, value: this.startStandardExitBondSize },
+                                {
+                                    from: alice,
+                                    value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                    gasPrice: this.dummyGasPrice,
+                                },
                             ),
                             "Provided Transaction isn't finalized or doesn't exist",
                         );
@@ -239,7 +255,11 @@ contract(
                             rlpDepositTx,
                             depositInclusionProof,
                             depositUtxoPos,
-                            { from: alice, value: this.startStandardExitBondSize },
+                            {
+                                from: alice,
+                                value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                gasPrice: this.dummyGasPrice,
+                            },
                         );
                     });
 
@@ -283,7 +303,11 @@ contract(
                                 rlpDepositTx,
                                 depositInclusionProof,
                                 depositUtxoPos,
-                                { from: alice, value: this.startStandardExitBondSize },
+                                {
+                                    from: alice,
+                                    value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                    gasPrice: this.dummyGasPrice,
+                                },
                             ),
                             'Exit has already started.',
                         );
@@ -429,7 +453,11 @@ contract(
                             rlpDepositTx,
                             depositInclusionProof,
                             depositUtxoPos,
-                            { from: alice, value: this.startStandardExitBondSize },
+                            {
+                                from: alice,
+                                value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                gasPrice: this.dummyGasPrice,
+                            },
                         );
                     });
 
@@ -550,7 +578,11 @@ contract(
                             rlpDepositTx,
                             depositInclusionProof,
                             depositUtxoPos,
-                            { from: alice, value: this.startStandardExitBondSize },
+                            {
+                                from: alice,
+                                value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                gasPrice: this.dummyGasPrice,
+                            },
                         );
                     });
 
@@ -685,7 +717,11 @@ contract(
                             rlpDepositTx,
                             depositInclusionProof,
                             depositUtxoPos,
-                            { from: alice, value: this.startStandardExitBondSize },
+                            {
+                                from: alice,
+                                value: this.startStandardExitBondSize.add(this.processExitBountySize),
+                                gasPrice: this.dummyGasPrice,
+                            },
                         );
                     });
 
@@ -711,7 +747,11 @@ contract(
                                 rlpDepositTx,
                                 depositInclusionProof,
                                 depositUtxoPos,
-                                { from: bob, value: this.updatedStandardExitBondSize },
+                                {
+                                    from: bob,
+                                    value: this.updatedStandardExitBondSize.add(this.processExitBountySize),
+                                    gasPrice: this.dummyGasPrice,
+                                },
                             );
                         });