[Loopring 3] allow withdrawal of unregistered tokens (#2439)

Author: dong77

packages/loopring_v3/contracts/aux/access/LoopringIOExchangeOwner.sol

@@ -12,8 +12,8 @@ import "../../lib/Drainable.sol";
 import "../../lib/ERC1271.sol";
 import "../../lib/MathUint.sol";
 import "../../lib/SignatureUtil.sol";
-import "./SelectorBasedAccessManager.sol";
 import "./ITransactionReceiver.sol";
+import "./SelectorBasedAccessManager.sol";
 
 
 contract LoopringIOExchangeOwner is SelectorBasedAccessManager, ERC1271, Drainable

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

@@ -136,16 +136,6 @@ abstract contract IExchangeV3 is Claimable
         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.
@@ -652,6 +642,29 @@ abstract contract IExchangeV3 is Claimable
         returns (bool);
 
     // -- Admins --
+
+    // @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;
+
+    // @dev Exchange owner withdraws unregistered tokens from the deposit contract.
+    // @param token Fee token address
+    // @param to The target address
+    // @amount The amount to withdraw.
+    function withdrawUnregisteredToken(
+        address token,
+        address to,
+        uint    amount
+        )
+        external
+        virtual;
+
     /// @dev Sets the max time deposits have to wait before becoming withdrawable.
     /// @param newValue The new value.
     /// @return  The old value.

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

@@ -151,21 +151,6 @@ contract ExchangeV3 is IExchangeV3, ReentrancyGuard
         return state.depositContract;
     }
 
-    function withdrawExchangeFees(
-        address token,
-        address recipient
-        )
-        external
-        override
-        nonReentrant
-        onlyOwner
-    {
-        require(recipient != address(0), "INVALID_ADDRESS");
-
-        uint amount = token.selfBalance();
-        token.transferOut(recipient, amount);
-    }
-
     function isUserOrAgent(address owner)
         public
         view
@@ -662,6 +647,46 @@ contract ExchangeV3 is IExchangeV3, ReentrancyGuard
     }
 
     // -- Admins --
+    function withdrawExchangeFees(
+        address token,
+        address recipient
+        )
+        external
+        override
+        nonReentrant
+        onlyOwner
+    {
+        require(recipient != address(0), "INVALID_ADDRESS");
+
+        uint amount = token.selfBalance();
+        token.transferOut(recipient, amount);
+    }
+
+    function withdrawUnregisteredToken(
+        address token,
+        address to,
+        uint    amount
+        )
+        external
+        override
+        nonReentrant
+        onlyOwner
+    {
+        try this.getTokenID(token) {
+            revert("TOKEN_REGISTERED");
+        } catch {
+            require(to != address(0), "INVALID_ADDRESS");
+            require(amount > 0, "INVALID_AMOUNT");
+            state.depositContract.withdraw(
+                address(state.depositContract),
+                to,
+                token,
+                amount,
+                new bytes(0)
+            );
+        }
+    }
+
     function setMaxAgeDepositUntilWithdrawable(
         uint32 newValue
         )