Merge pull request #68 from Merit-Systems/refactor/remove-totalGrossAmount

Remove totalGrossAmount loop

Author: shafu0x

interface/IEscrow.sol

@@ -28,15 +28,15 @@ struct DepositParams {
  *         - A protocol fee can be configured and applied to deposits.
  */
 interface IEscrow {
-    event Deposited                (uint indexed depositId, address indexed token, address indexed recipient, address sender, uint amount, uint claimDeadline);
+    event Deposited                (uint indexed depositId, address indexed token, address indexed recipient, address sender, uint netAmount, uint feeAmount, uint claimDeadline);
     event Claimed                  (uint indexed depositId, address indexed recipient, uint amount);
     event Reclaimed                (uint indexed depositId, address indexed sender,    uint amount);
     event CanClaimSet              (address indexed recipient, bool status);
     event ProtocolFeeSet           (uint    newFeeBps);
     event FeeRecipientSet          (address newFeeRecipient);
     event TokenWhitelisted         (address indexed token);
     event TokenRemovedFromWhitelist(address indexed token);
-    event BatchDeposited           (uint indexed batchId, uint repoId, uint timestamp, uint[] depositIds, uint totalGrossAmount);
+    event BatchDeposited           (uint indexed batchId, uint repoId, uint timestamp, uint[] depositIds);
 
     /**
      * @notice Deposits tokens into the escrow on behalf of a specified sender and recipient.

src/Escrow.sol

@@ -78,11 +78,11 @@ contract Escrow is Owned, IEscrow {
         require(_whitelistedTokens.contains(address(param.token)), Errors.INVALID_TOKEN);
 
         uint feeAmount;
-        uint amountToEscrow = param.amount;
+        uint netAmount = param.amount;
         if (protocolFeeBps > 0) {
-            feeAmount      = param.amount.mulDivUp(protocolFeeBps, 10_000);
-            amountToEscrow = param.amount - feeAmount;
-            require(amountToEscrow > 0, Errors.INVALID_AMOUNT_AFTER_FEE);
+            feeAmount = param.amount.mulDivUp(protocolFeeBps, 10_000);
+            netAmount = param.amount - feeAmount;
+            require(netAmount > 0, Errors.INVALID_AMOUNT_AFTER_FEE);
         }
 
         param.token.safeTransferFrom(msg.sender, address(this), param.amount);
@@ -92,7 +92,7 @@ contract Escrow is Owned, IEscrow {
         }
 
         deposits[depositCount] = Deposit({
-            amount:        amountToEscrow,
+            amount:        netAmount,
             token:         param.token,
             recipient:     param.recipient,
             sender:        param.sender,
@@ -108,7 +108,8 @@ contract Escrow is Owned, IEscrow {
             address(param.token),
             param.recipient,
             param.sender,
-            amountToEscrow,
+            netAmount,
+            feeAmount,
             block.timestamp + param.claimPeriod
         );
 
@@ -124,15 +125,13 @@ contract Escrow is Owned, IEscrow {
         external 
         returns (uint[] memory depositIds) 
     {
-        uint totalGrossAmount;
         depositIds = new uint[](params.length);
 
         for (uint256 i = 0; i < params.length; i++) {
             depositIds[i] = deposit(params[i]);
-            totalGrossAmount += params[i].amount;
         }
 
-        emit BatchDeposited(batchCount++, repoId, timestamp, depositIds, totalGrossAmount);
+        emit BatchDeposited(batchCount++, repoId, timestamp, depositIds);
     }
 
     /*//////////////////////////////////////////////////////////////