Merge pull request #1724 from matter-labs/deniallugo-fix-nonce

Fix nonce mismatched

Author: Deniallugo

core/bin/prover/src/plonk_step_by_step_prover.rs

@@ -2,6 +2,7 @@
 use std::sync::Mutex;
 // Workspace deps
 use zksync_config::ChainConfig;
+use zksync_crypto::bellman::Circuit;
 use zksync_crypto::proof::{AggregatedProof, PrecomputedSampleProofs, SingleProof};
 use zksync_crypto::Engine;
 use zksync_prover_utils::aggregated_proofs::{gen_aggregate_proof, prepare_proof_data};
@@ -10,6 +11,7 @@ use zksync_prover_utils::{PlonkVerificationKey, SetupForStepByStepProver};
 use zksync_utils::parse_env;
 // Local deps
 use crate::{ProverConfig, ProverImpl};
+use zksync_crypto::franklin_crypto::circuit::test::TestConstraintSystem;
 use zksync_prover_utils::fs_utils::load_precomputed_proofs;
 
 /// We prepare some data before making proof for each block size, so we cache it in case next block
@@ -56,6 +58,14 @@ impl PlonkStepByStepProver {
         block_size: usize,
     ) -> anyhow::Result<SingleProof> {
         // we do this way here so old precomp is dropped
+        let mut cs = TestConstraintSystem::<Engine>::new();
+        witness.clone().synthesize(&mut cs).unwrap();
+
+        if let Some(err) = cs.which_is_unsatisfied() {
+            println!("unconstrained: {}", cs.find_unconstrained());
+            println!("number of constraints {}", cs.num_constraints());
+            println!("Unsatisfied {:?}", err);
+        }
         let valid_cached_precomp = {
             self.prepared_computations
                 .lock()

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

@@ -1,6 +1,7 @@
 use num::BigUint;
 
 use zksync_crypto::franklin_crypto::bellman::pairing::bn256::Bn256;
+use zksync_crypto::params::{MIN_NFT_TOKEN_ID, NFT_STORAGE_ACCOUNT_ID, NFT_TOKEN_ID};
 use zksync_state::handler::TxHandler;
 use zksync_state::state::{CollectedFee, ZkSyncState};
 use zksync_types::{AccountId, MintNFT, MintNFTOp, TokenId, H256};
@@ -10,7 +11,6 @@ use crate::witness::tests::test_utils::{
     WitnessTestAccount,
 };
 use crate::witness::{utils::WitnessBuilder, MintNFTWitness, SigDataInput};
-use zksync_crypto::params::{MIN_NFT_TOKEN_ID, NFT_STORAGE_ACCOUNT_ID, NFT_TOKEN_ID};
 
 /// Basic check for execution of `MintNFT` operation in circuit.
 /// Here we create two accounts and perform a mintNFT operation.