Merge pull request #1751 from matter-labs/fix-forced-exit

Fix forced exit

core/bin/zksync_core/src/eth_watch/mod.rs

@@ -216,7 +216,6 @@ impl<W: EthClient> EthWatch<W> {
             new_tokens,
             register_nft_factory_events,
         );
-
         self.set_new_state(new_state);
         Ok(())
     }

core/lib/state/src/handler/error.rs

@@ -56,6 +56,8 @@ pub enum ForcedExitOpError {
     InvalidTokenId,
     #[error("Target account is not locked; forced exit is forbidden")]
     TargetAccountNotLocked,
+    #[error("Target account is invalid")]
+    InvalidTargetAccount,
     #[error("Nonce mismatch")]
     NonceMismatch,
     #[error("Initiator account: Not enough balance to cover fees")]

core/lib/state/src/handler/forced_exit.rs

@@ -1,6 +1,8 @@
 use std::time::Instant;
 use zksync_crypto::params;
-use zksync_types::{AccountUpdate, AccountUpdates, ForcedExit, ForcedExitOp, PubKeyHash, ZkSyncOp};
+use zksync_types::{
+    AccountUpdate, AccountUpdates, Address, ForcedExit, ForcedExitOp, PubKeyHash, ZkSyncOp,
+};
 use zksync_utils::BigUintSerdeWrapper;
 
 use crate::{
@@ -54,6 +56,10 @@ impl TxHandler<ForcedExit> for ZkSyncState {
             account.pub_key_hash == PubKeyHash::default(),
             ForcedExitOpError::TargetAccountNotLocked
         );
+        invariant!(
+            account.address != Address::default(),
+            ForcedExitOpError::InvalidTargetAccount
+        );
 
         // Obtain the token balance to be withdrawn.
         let account_balance = self