Merge pull request #86 from hermeznetwork/feature/updateRoot

Feature/update root

contracts/hermez/future_versions/HermezV2.sol

@@ -86,9 +86,6 @@ contract HermezV2 is InstantWithdrawManagerV2 {
     // Verifiers array
     VerifierRollup[] public rollupVerifiers;
 
-    // Withdraw verifier interface
-    VerifierWithdrawInterface[MAX_TOKEN_WITHDRAW] public withdrawVerifiers;
-
     // Last account index created inside the rollup
     uint48 public lastIdx;
 
@@ -135,6 +132,9 @@ contract HermezV2 is InstantWithdrawManagerV2 {
 
     uint256 public constant MAX_TOKEN_WITHDRAW = 8;
 
+    // Withdraw verifier interface
+    VerifierWithdrawInterface[MAX_TOKEN_WITHDRAW] public withdrawVerifiers;
+
     // Withdraw Bjj verifier interface
     VerifierWithdrawInterface public withdrawBjjVerfier;
 
@@ -158,7 +158,7 @@ contract HermezV2 is InstantWithdrawManagerV2 {
     event UpdateFeeAddToken(uint256 newFeeAddToken);
 
     // Event emitted when a withdrawal is done
-    event WithdrawEvent(
+    event WithdrawEventNew(
         uint192 indexed amountWithdraw,
         uint48 indexed idx,
         bool indexed instantWithdraw
@@ -501,7 +501,7 @@ contract HermezV2 is InstantWithdrawManagerV2 {
      * @param batchNum Batch number after exit transactions has been done
      * @param idxs Index of the exit tree account
      * @param instantWithdraws true if is an instant withdraw
-     * Events: `WithdrawEvent`
+     * Events: `WithdrawEventNew`
      */
     function withdrawMultiToken(
         uint256[2] calldata proofA,
@@ -580,7 +580,7 @@ contract HermezV2 is InstantWithdrawManagerV2 {
                 msg.sender,
                 instantWithdraws[i]
             );
-            emit WithdrawEvent(
+            emit WithdrawEventNew(
                 amountWithdraws[i],
                 idxs[i],
                 instantWithdraws[i]
@@ -601,7 +601,7 @@ contract HermezV2 is InstantWithdrawManagerV2 {
      * @param batchNum Batch number after exit transactions has been done
      * @param idx Index of the exit tree account
      * @param instantWithdraw true if is an instant withdraw
-     * Events: `WithdrawEvent`
+     * Events: `WithdrawEventNew`
      */
     function withdrawBjjCircuit(
         uint256[2] calldata proofA,
@@ -659,7 +659,7 @@ contract HermezV2 is InstantWithdrawManagerV2 {
             instantWithdraw
         );
 
-        emit WithdrawEvent(amountWithdraw, idx, instantWithdraw);
+        emit WithdrawEventNew(amountWithdraw, idx, instantWithdraw);
     }
 
     //////////////
@@ -1022,7 +1022,6 @@ contract HermezV2 is InstantWithdrawManagerV2 {
         // L2 TX unused data is padded with 0 at the start
         _fillZeros(ptr, l1L2TxsDataLength - dLen);
         ptr += l1L2TxsDataLength - dLen;
-
         assembly {
             calldatacopy(ptr, dPtr, dLen)
         }