Merge pull request #763 from matter-labs/dvush/add-events-from-pending-withdrawals-pr

Cherry pick contract events

Author: dvush

contracts/contracts/Events.sol

@@ -54,21 +54,37 @@ interface Events {
         uint256 expirationBlock
     );
 
+    /// @notice Deposit committed event.
     event DepositCommit(
-        uint32 indexed franklinBlockId,
+        uint32 indexed zkSyncBlockId,
         uint32 indexed accountId,
         address owner,
         uint16 indexed tokenId,
         uint128 amount
     );
 
+    /// @notice Full exit committed event.
     event FullExitCommit(
-        uint32 indexed franklinBlockId,
+        uint32 indexed zkSyncBlockId,
         uint32 indexed accountId,
         address owner,
         uint16 indexed tokenId,
         uint128 amount
     );
+
+    /// @notice Pending withdrawals index range that were added in the verifyBlock operation.
+    /// NOTE: processed indexes in the queue map are [queueStartIndex, queueEndIndex)
+    event PendingWithdrawalsAdd(
+        uint32 queueStartIndex,
+        uint32 queueEndIndex
+    );
+
+    /// @notice Pending withdrawals index range that were executed in the completeWithdrawals operation.
+    /// NOTE: processed indexes in the queue map are [queueStartIndex, queueEndIndex)
+    event PendingWithdrawalsComplete(
+        uint32 queueStartIndex,
+        uint32 queueEndIndex
+    );
 }
 
 /// @title Upgrade events

contracts/contracts/ZkSync.sol

@@ -138,6 +138,9 @@ contract ZkSync is UpgradeableMaster, Storage, Config, Events, ReentrancyGuard {
                 }
             }
         }
+        if (toProcess > 0) {
+            emit PendingWithdrawalsComplete(startIndex, startIndex + toProcess);
+        }
     }
 
     /// @notice Accrues users balances from deposit priority requests in Exodus mode
@@ -686,8 +689,11 @@ contract ZkSync is UpgradeableMaster, Storage, Config, Events, ReentrancyGuard {
             withdrawalsDataHash = keccak256(abi.encode(withdrawalsDataHash, addToPendingWithdrawalsQueue, _to, _tokenId, _amount));
             offset += ONCHAIN_WITHDRAWAL_BYTES;
         }
-        numberOfPendingWithdrawals = localNumberOfPendingWithdrawals;
         require(withdrawalsDataHash == expectedWithdrawalsDataHash, "pow12"); // pow12 - withdrawals data hash not matches with expected value
+        if (numberOfPendingWithdrawals != localNumberOfPendingWithdrawals) {
+            emit PendingWithdrawalsAdd(firstPendingWithdrawalIndex + numberOfPendingWithdrawals, firstPendingWithdrawalIndex + localNumberOfPendingWithdrawals);
+        }
+        numberOfPendingWithdrawals = localNumberOfPendingWithdrawals;
     }
 
     /// @notice Checks whether oldest unverified block has expired