[Loopring 3.6] remove deposit fee (#1611)

Author: dong77

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

@@ -83,8 +83,7 @@ library ExchangeData
     struct Deposit
     {
         uint96 amount;
-        uint32 timestamp; // only valid before 2105 (85 years to go)
-        uint64 fee;
+        uint64 timestamp;
     }
 
     // A forced withdrawal request.

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

@@ -50,8 +50,7 @@ abstract contract IExchangeV3 is IExchange
     event DepositRequested(
         address owner,
         address token,
-        uint96  amount,
-        uint    fee
+        uint96  amount
     );
 
     event ForcedWithdrawalRequested(

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

@@ -94,12 +94,13 @@ contract DefaultDepositContract is IDepositContract, Claimable
         ifNotZero(amount)
         returns (uint96 amountReceived)
     {
+        uint ethToReturn = 0;
+
         if (isETHInternal(token)) {
-            require(msg.value == amount, "INVALID_ETH_DEPOSIT");
+            require(msg.value >= amount, "INVALID_ETH_DEPOSIT");
             amountReceived = amount;
+            ethToReturn = msg.value - amount;
         } else {
-            require(msg.value == 0, "INVALID_TOKEN_DEPOSIT");
-
             bool checkBalance = needCheckBalance[token];
             uint balanceBefore = checkBalance ? ERC20(token).balanceOf(address(this)) : 0;
 
@@ -109,6 +110,12 @@ contract DefaultDepositContract is IDepositContract, Claimable
             uint diff = balanceAfter.sub(balanceBefore);
             amountReceived = uint96(diff);
             require(uint(amountReceived) == diff, "OUT_OF_RANGE");
+
+            ethToReturn = msg.value;
+        }
+
+        if (ethToReturn > 0) {
+            from.sendETHAndVerify(ethToReturn, gasleft());
         }
     }
 

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

@@ -24,8 +24,7 @@ library ExchangeDeposits
     event DepositRequested(
         address owner,
         address token,
-        uint96  amount,
-        uint    fee
+        uint96  amount
     );
 
     function deposit(
@@ -47,8 +46,7 @@ library ExchangeDeposits
         uint16 tokenID = S.getTokenID(tokenAddress);
 
         // Transfer the tokens to this contract
-        (uint96 amountDeposited, uint64 fee) = transferDeposit(
-            S,
+        uint96 amountDeposited = S.depositContract.deposit{value: msg.value}(
             from,
             tokenAddress,
             amount,
@@ -57,47 +55,14 @@ library ExchangeDeposits
 
         // Add the amount to the deposit request and reset the time the operator has to process it
         ExchangeData.Deposit memory _deposit = S.pendingDeposits[to][tokenID];
-        _deposit.timestamp = uint32(block.timestamp);
+        _deposit.timestamp = uint64(block.timestamp);
         _deposit.amount = _deposit.amount.add96(amountDeposited);
-        _deposit.fee = _deposit.fee.add64(fee);
         S.pendingDeposits[to][tokenID] = _deposit;
 
         emit DepositRequested(
             to,
             tokenAddress,
-            uint96(amountDeposited),
-            fee
-        );
-    }
-
-    function transferDeposit(
-        ExchangeData.State storage S,
-        address from,
-        address tokenAddress,
-        uint96  amount,
-        bytes   memory extraData
-        )
-        private
-        returns (
-            uint96 amountDeposited,
-            uint64 fee
-        )
-    {
-        IDepositContract depositContract = S.depositContract;
-        uint depositValueETH = 0;
-        if (msg.value > 0 && (tokenAddress == address(0) || depositContract.isETH(tokenAddress))) {
-            depositValueETH = amount;
-            fee = uint64(msg.value.sub(amount));
-        } else {
-            fee = uint64(msg.value);
-        }
-
-        // Transfer the tokens to the deposit contract (excluding the ETH fee)
-        amountDeposited = depositContract.deposit{value: depositValueETH}(
-            from,
-            tokenAddress,
-            amount,
-            extraData
+            uint96(amountDeposited)
         );
     }
 }

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

@@ -69,11 +69,16 @@ library ExchangeWithdrawals
             msg.sender.sendETHAndVerify(feeSurplus, gasleft());
         }
 
-        require(S.pendingForcedWithdrawals[accountID][tokenID].timestamp == 0, "WITHDRAWAL_ALREADY_PENDING");
+        require(
+            S.pendingForcedWithdrawals[accountID][tokenID].timestamp == 0,
+            "WITHDRAWAL_ALREADY_PENDING"
+        );
 
-        S.pendingForcedWithdrawals[accountID][tokenID].owner = owner;
-        S.pendingForcedWithdrawals[accountID][tokenID].timestamp = uint32(block.timestamp);
-        S.pendingForcedWithdrawals[accountID][tokenID].fee = uint64(withdrawalFeeETH);
+        S.pendingForcedWithdrawals[accountID][tokenID] = ExchangeData.ForcedWithdrawal({
+            owner: owner,
+            timestamp: uint32(block.timestamp),
+            fee: uint64(withdrawalFeeETH)
+        });
 
         S.numPendingForcedTransactions++;
 
@@ -140,7 +145,6 @@ library ExchangeWithdrawals
         );
 
         uint amount = deposit.amount;
-        uint fee = deposit.fee;
 
         // Reset the deposit request
         delete S.pendingDeposits[owner][tokenID];
@@ -156,9 +160,6 @@ library ExchangeWithdrawals
             gasleft(),
             false
         );
-
-        // Return the fee
-        owner.sendETHAndVerify(fee, gasleft());
     }
 
     function withdrawFromApprovedWithdrawals(

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

@@ -39,7 +39,7 @@ library DepositTransaction
         bytes                     memory  /*auxiliaryData*/
         )
         internal
-        returns (uint feeETH)
+        returns (uint)
     {
         // Read in the deposit
         Deposit memory deposit = readTx(data, offset);
@@ -55,27 +55,17 @@ library DepositTransaction
         // Also note the original deposit.amount can be zero!
         if (deposit.amount > 0) {
             require(pendingDeposit.amount >= deposit.amount, "INVALID_AMOUNT");
-            feeETH = pendingDeposit.amount == deposit.amount?
-                uint(pendingDeposit.fee):
-                uint(pendingDeposit.fee).mul(deposit.amount) / pendingDeposit.amount;
-
-            pendingDeposit.fee = uint64(uint(pendingDeposit.fee).sub(feeETH));
             pendingDeposit.amount = uint96(uint(pendingDeposit.amount).sub(deposit.amount));
         }
 
         // If the deposit was fully consumed, reset it so the storage is freed up
         // and the owner receives a gas refund.
         if (pendingDeposit.amount == 0) {
-            // Give the owner the remaining fee
-            feeETH = feeETH.add(uint(pendingDeposit.fee));
-            // Reset the deposit data
-            pendingDeposit.fee = 0;
-            pendingDeposit.timestamp = 0;
+            delete S.pendingDeposits[deposit.owner][deposit.tokenID];
+        } else {
+            S.pendingDeposits[deposit.owner][deposit.tokenID] = pendingDeposit;
         }
 
-        // Update the data in storage
-        S.pendingDeposits[deposit.owner][deposit.tokenID] = pendingDeposit;
-
         //emit DepositProcessed(owner, accountID, tokenID, amount);
     }
 

…ring_v3/test/testBasicDepositContract.ts …ng_v3/test/testDefaultDepositContract.tspackages/loopring_v3/test/testBasicDepositContract.ts renamed to packages/loopring_v3/test/testDefaultDepositContract.ts packages/loopring_v3/test/testBasicDepositContract.ts renamed to packages/loopring_v3/test/testDefaultDepositContract.ts

@@ -59,31 +59,31 @@ contract("DefaultDepositContract", (accounts: string[]) => {
       });
     });
 
-    it("should not be able to send a wrong amount of ETH in a deposit", async () => {
-      const exchange = exchange1;
-      await depositContract.initialize(exchange1);
-
-      await expectThrow(
-        depositContract.deposit(
-          owner1,
-          Constants.zeroAddress,
-          new BN(2),
-          "0x",
-          {
-            from: exchange,
-            value: new BN(1)
-          }
-        ),
-        "INVALID_ETH_DEPOSIT"
-      );
-      await expectThrow(
-        depositContract.deposit(owner1, token.address, new BN(1), "0x", {
-          from: exchange,
-          value: new BN(1)
-        }),
-        "INVALID_TOKEN_DEPOSIT"
-      );
-    });
+    // it("should not be able to send a wrong amount of ETH in a deposit", async () => {
+    //   const exchange = exchange1;
+    //   await depositContract.initialize(exchange1);
+
+    //   await expectThrow(
+    //     depositContract.deposit(
+    //       owner1,
+    //       Constants.zeroAddress,
+    //       new BN(2),
+    //       "0x",
+    //       {
+    //         from: exchange,
+    //         value: new BN(1)
+    //       }
+    //     ),
+    //     "INVALID_ETH_DEPOSIT"
+    //   );
+    //   await expectThrow(
+    //     depositContract.deposit(owner1, token.address, new BN(1), "0x", {
+    //       from: exchange,
+    //       value: new BN(1)
+    //     }),
+    //     "INVALID_TOKEN_DEPOSIT"
+    //   );
+    // });
   });
 
   describe("anyone", () => {