Revert "[Loopring 3.6] skip fee distribution in submitBlocks (#1622)"

This reverts commit 6d5ef9d.

Author: wangdong

packages/loopring_v3/contracts/core/iface/ExchangeData.sol

@@ -92,7 +92,8 @@ library ExchangeData
     struct ForcedWithdrawal
     {
         address owner;
-        uint64  timestamp;
+        uint32  timestamp;
+        uint64  fee;
     }
 
     struct Constants

packages/loopring_v3/contracts/core/iface/IExchangeV3.sol

@@ -43,7 +43,8 @@ abstract contract IExchangeV3 is IExchange
     event BlockSubmitted(
         uint    indexed blockIdx,
         bytes32         merkleRoot,
-        bytes32         publicDataHash
+        bytes32         publicDataHash,
+        uint            blockFee
     );
 
     event DepositRequested(
@@ -155,16 +156,6 @@ abstract contract IExchangeV3 is IExchange
         view
         returns (IDepositContract);
 
-    // @dev Exchange owner withdraws fees from the exchange.
-    // @param token Fee token address
-    // @param feeRecipient Fee recipient address
-    function withdrawExchangeFees(
-        address token,
-        address feeRecipient
-        )
-        external
-        virtual;
-
     // -- Constants --
     /// @dev Returns a list of constants used by the exchange.
     /// @return constants The list of constants.
@@ -339,7 +330,11 @@ abstract contract IExchangeV3 is IExchange
     ///      - data: The data for this block
     ///      - offchainData: Arbitrary data, mainly for off-chain data-availability, i.e.,
     ///        the multihash of the IPFS file that contains the block data.
-    function submitBlocks(ExchangeData.Block[] calldata blocks)
+    /// @param feeRecipient The address that will receive the onchain block rewards
+    function submitBlocks(
+        ExchangeData.Block[] calldata blocks,
+        address payable feeRecipient
+        )
         external
         virtual;
 

packages/loopring_v3/contracts/core/impl/ExchangeV3.sol

@@ -3,9 +3,7 @@
 pragma solidity ^0.7.0;
 pragma experimental ABIEncoderV2;
 
-import "../../lib/AddressUtil.sol";
 import "../../lib/EIP712.sol";
-import "../../lib/ERC20SafeTransfer.sol";
 import "../../lib/MathUint.sol";
 import "../iface/IAgentRegistry.sol";
 import "../iface/IExchangeV3.sol";
@@ -27,8 +25,6 @@ import "./libtransactions/TransferTransaction.sol";
 /// @author Daniel Wang  - <[email protected]>
 contract ExchangeV3 is IExchangeV3
 {
-    using AddressUtil           for address;
-    using ERC20SafeTransfer     for address;
     using MathUint              for uint;
     using ExchangeAdmins        for ExchangeData.State;
     using ExchangeBalances      for ExchangeData.State;
@@ -134,26 +130,6 @@ contract ExchangeV3 is IExchangeV3
         return state.depositContract;
     }
 
-    function withdrawExchangeFees(
-        address token,
-        address recipient
-        )
-        external
-        override
-        nonReentrant
-        onlyOwner
-    {
-        require(recipient != address(0), "INVALID_ADDRESS");
-
-        if (token == address(0)) {
-            uint amount = address(this).balance;
-            recipient.sendETHAndVerify(amount, gasleft());
-        } else {
-            uint amount = ERC20(token).balanceOf(address(this));
-            token.safeTransferAndVerify(recipient, amount);
-        }
-    }
-
     // -- Constants --
     function getConstants()
         external
@@ -334,13 +310,19 @@ contract ExchangeV3 is IExchangeV3
         return state.blocks[blockIdx];
     }
 
-    function submitBlocks(ExchangeData.Block[] calldata blocks)
+    function submitBlocks(
+        ExchangeData.Block[] calldata blocks,
+        address payable feeRecipient
+        )
         external
         override
         nonReentrant
         onlyOwner
     {
-        state.submitBlocks(blocks);
+        state.submitBlocks(
+            blocks,
+            feeRecipient
+        );
     }
 
     function getNumAvailableForcedSlots()

packages/loopring_v3/contracts/core/impl/libexchange/ExchangeAdmins.sol

@@ -15,9 +15,9 @@ import "./ExchangeMode.sol";
 /// @author Brecht Devos - <[email protected]>
 library ExchangeAdmins
 {
+    using MathUint          for uint;
     using ERC20SafeTransfer for address;
     using ExchangeMode      for ExchangeData.State;
-    using MathUint          for uint;
 
     event OperatorChanged(
         uint    indexed exchangeId,

packages/loopring_v3/contracts/core/impl/libexchange/ExchangeBlocks.sol

@@ -32,7 +32,8 @@ library ExchangeBlocks
     event BlockSubmitted(
         uint    indexed blockIdx,
         bytes32         merkleRoot,
-        bytes32         publicDataHash
+        bytes32         publicDataHash,
+        uint            blockFee
     );
 
     event ProtocolFeesUpdated(
@@ -88,7 +89,8 @@ library ExchangeBlocks
 
     function submitBlocks(
         ExchangeData.State   storage S,
-        ExchangeData.Block[] memory  blocks
+        ExchangeData.Block[] memory  blocks,
+        address              payable feeRecipient
         )
         public
     {
@@ -103,18 +105,28 @@ library ExchangeBlocks
             // Hash all the public data to a single value which is used as the input for the circuit
             publicDataHashes[i] = blocks[i].data.fastSHA256();
             // Commit the block
-            commitBlock(S, blocks[i], publicDataHashes[i]);
+            commitBlock(
+                S,
+                blocks[i],
+                feeRecipient,
+                publicDataHashes[i]
+            );
         }
 
         // Verify the blocks - blocks are verified in a batch to save gas.
-        verifyBlocks(S, blocks, publicDataHashes);
+        verifyBlocks(
+            S,
+            blocks,
+            publicDataHashes
+        );
     }
 
     // == Internal Functions ==
 
     function commitBlock(
         ExchangeData.State storage S,
         ExchangeData.Block memory  _block,
+        address            payable _feeRecipient,
         bytes32                    _publicDataHash
         )
         private
@@ -156,17 +168,20 @@ library ExchangeBlocks
         );
 
         // Process conditional transactions
-        processConditionalTransactions(
+        uint blockFeeETH = processConditionalTransactions(
             S,
             offset,
             _block.data,
             _block.auxiliaryData,
             inputTimestamp
         );
 
+        // Transfer the onchain block fee to the operator
+        _feeRecipient.sendETHAndVerify(blockFeeETH, gasleft());
+
         // Emit an event
         uint numBlocks = S.numBlocks;
-        emit BlockSubmitted(numBlocks, merkleRootAfter, _publicDataHash);
+        emit BlockSubmitted(numBlocks, merkleRootAfter, _publicDataHash, blockFeeETH);
 
         S.merkleRoot = merkleRootAfter;
 
@@ -255,6 +270,7 @@ library ExchangeBlocks
         uint32                              timestamp
         )
         private
+        returns (uint blockFeeETH)
     {
         // The length of the auxiliary data needs to match the number of conditional transactions
         uint numConditionalTransactions = data.toUint32(offset);
@@ -290,32 +306,33 @@ library ExchangeBlocks
                 );
                 txDataOffset += 1;
 
+                uint txFeeETH = 0;
                 if (txType == ExchangeData.TransactionType.DEPOSIT) {
-                    DepositTransaction.process(
+                    txFeeETH = DepositTransaction.process(
                         S,
                         ctx,
                         data,
                         txDataOffset,
                         txAuxiliaryData[i].data
                     );
                 } else if (txType == ExchangeData.TransactionType.WITHDRAWAL) {
-                    WithdrawTransaction.process(
+                    txFeeETH = WithdrawTransaction.process(
                         S,
                         ctx,
                         data,
                         txDataOffset,
                         txAuxiliaryData[i].data
                     );
                 } else if (txType == ExchangeData.TransactionType.TRANSFER) {
-                    TransferTransaction.process(
+                    txFeeETH = TransferTransaction.process(
                         S,
                         ctx,
                         data,
                         txDataOffset,
                         txAuxiliaryData[i].data
                     );
                 } else if (txType == ExchangeData.TransactionType.ACCOUNT_UPDATE) {
-                    AccountUpdateTransaction.process(
+                    txFeeETH = AccountUpdateTransaction.process(
                         S,
                         ctx,
                         data,
@@ -329,6 +346,7 @@ library ExchangeBlocks
                     revert("UNSUPPORTED_TX_TYPE");
                 }
 
+                blockFeeETH = blockFeeETH.add(txFeeETH);
                 prevTxDataOffset = txDataOffset;
             }
         }

packages/loopring_v3/contracts/core/impl/libexchange/ExchangeWithdrawals.sol

@@ -76,7 +76,8 @@ library ExchangeWithdrawals
 
         S.pendingForcedWithdrawals[accountID][tokenID] = ExchangeData.ForcedWithdrawal({
             owner: owner,
-            timestamp: uint64(block.timestamp)
+            timestamp: uint32(block.timestamp),
+            fee: uint64(withdrawalFeeETH)
         });
 
         S.numPendingForcedTransactions++;

packages/loopring_v3/contracts/core/impl/libtransactions/AccountUpdateTransaction.sol

@@ -53,6 +53,7 @@ library AccountUpdateTransaction
         bytes                     memory  auxiliaryData
         )
         internal
+        returns (uint /*feeETH*/)
     {
         // Read the account update
         AccountUpdate memory accountUpdate = readTx(data, offset);

packages/loopring_v3/contracts/core/impl/libtransactions/DepositTransaction.sol

@@ -39,6 +39,7 @@ library DepositTransaction
         bytes                     memory  /*auxiliaryData*/
         )
         internal
+        returns (uint)
     {
         // Read in the deposit
         Deposit memory deposit = readTx(data, offset);

packages/loopring_v3/contracts/core/impl/libtransactions/TransferTransaction.sol

@@ -58,6 +58,7 @@ library TransferTransaction
         bytes                     memory  auxiliaryData
         )
         internal
+        returns (uint /*feeETH*/)
     {
         // Read the transfer
         Transfer memory transfer = readTx(data, offset);

packages/loopring_v3/contracts/core/impl/libtransactions/WithdrawTransaction.sol

@@ -79,6 +79,7 @@ library WithdrawTransaction
         bytes                     memory  auxiliaryData
         )
         internal
+        returns (uint feeETH)
     {
         Withdrawal memory withdrawal = readTx(data, offset);
         WithdrawalAuxiliaryData memory auxData = abi.decode(auxiliaryData, (WithdrawalAuxiliaryData));
@@ -133,6 +134,9 @@ library WithdrawTransaction
                     require(withdrawal.amount == 0, "UNAUTHORIZED_WITHDRAWAL");
                 }
 
+                // Get the fee
+                feeETH = forcedWithdrawal.fee;
+
                 // delete the withdrawal request and free a slot
                 delete S.pendingForcedWithdrawals[withdrawal.accountID][withdrawal.tokenID];
                 S.numPendingForcedTransactions--;