upgrade v8

contracts/contracts/Config.sol

@@ -60,7 +60,7 @@ contract Config {
     /// @dev Expiration delta for priority request to be satisfied (in seconds)
     /// @dev NOTE: Priority expiration should be > (EXPECT_VERIFICATION_IN * BLOCK_PERIOD)
     /// @dev otherwise incorrect block with priority op could not be reverted.
-    uint256 internal constant PRIORITY_EXPIRATION_PERIOD = 3 days;
+    uint256 internal constant PRIORITY_EXPIRATION_PERIOD = 7 days;
 
     /// @dev Expiration delta for priority request to be satisfied (in ETH blocks)
     uint256 internal constant PRIORITY_EXPIRATION =

core/bin/key_generator/src/main.rs

@@ -55,7 +55,7 @@ fn main() {
         Command::Keys => {
             make_plonk_exodus_verify_key();
             make_plonk_blocks_verify_keys(config.clone());
-            make_recursive_verification_keys(config.clone());
+            //make_recursive_verification_keys(config.clone());
             make_sample_proofs(config).expect("Failed to generate sample proofs");
         }
         Command::Contract => {

core/lib/circuit/src/circuit.rs

@@ -1834,11 +1834,13 @@ impl<'a, E: RescueEngine + JubjubEngine> ZkSyncCircuit<'a, E> {
 
         //keys are same or account is empty
 
-        let is_pubkey_correct = Boolean::xor(
-            cs.namespace(|| "keys are same xor account is empty"),
-            &is_pub_equal_to_previous,
-            &is_account_empty,
-        )?;
+        // or instead of xor
+        let is_pubkey_correct = Boolean::and(
+            cs.namespace(|| "keys are same or account is empty"),
+            &is_pub_equal_to_previous.not(),
+            &is_account_empty.not(),
+        )?
+        .not();
 
         is_valid_flags.push(is_pubkey_correct);
 

core/lib/circuit/src/witness/tests/deposit.rs

@@ -40,6 +40,40 @@ fn test_deposit_in_empty_leaf() {
     );
 }
 
+/// Checks that deposit can be applied to a new account if deposit address is zero.
+/// Here we generate an empty ZkSyncState (with no accounts), and make a deposit to a new account.
+#[test]
+#[ignore]
+fn test_deposit_zero_address() {
+    // Input data.
+    let mut account = WitnessTestAccount::new(AccountId(1), 1); // Will not be included into ZkSyncState
+    account.set_empty_address();
+    account.set_empty_pubkey_hash();
+
+    let accounts = vec![account];
+
+    let deposit_op = DepositOp {
+        priority_op: Deposit {
+            from: accounts[0].account.address,
+            token: TokenId(0),
+            amount: BigUint::from(1u32),
+            to: accounts[0].account.address,
+        },
+        account_id: accounts[0].id,
+    };
+
+    generic_test_scenario::<DepositWitness<Bn256>, _>(
+        &accounts,
+        deposit_op,
+        (),
+        |plasma_state, op| {
+            <ZkSyncState as TxHandler<Deposit>>::apply_op(plasma_state, op)
+                .expect("Deposit failed");
+            vec![]
+        },
+    );
+}
+
 /// Checks that deposit can be applied to an existing account.
 /// Here we generate a ZkSyncState with one account, and make a deposit to this account.
 #[test]

core/lib/circuit/src/witness/tests/test_utils.rs

@@ -125,6 +125,11 @@ impl WitnessTestAccount {
         self.account.pub_key_hash = Default::default();
     }
 
+    pub fn set_empty_address(&mut self) {
+        self.zksync_account.address = Default::default();
+        self.account.address = Default::default();
+    }
+
     pub fn new_empty(id: AccountId) -> Self {
         Self::new(id, 0)
     }