Fix/zkp verifier get proof status (#221)

* add isProofSubmitted to ZKPVerifier

* fix

* make ZKPVerifier abstract class

contracts/package.json

@@ -22,7 +22,8 @@
     "url": "https://github.com/iden3/contracts/issues"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "^4.7.3",
-    "@openzeppelin/contracts-upgradeable": "^4.8.2"
+    "@openzeppelin/contracts": "^5.0.1",
+    "@openzeppelin/contracts-upgradeable": "^5.0.1",
+    "@openzeppelin/contracts-upgradeable-v4": "npm:@openzeppelin/contracts-upgradeable@^4.9.5"
   }
 }

contracts/test-helpers/ZKPVerifierWrapper.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.20;
+
+import {ZKPVerifier} from "../verifiers/ZKPVerifier.sol";
+
+contract ZKPVerifierWrapper is ZKPVerifier {
+    function initialize(address initialOwner) public initializer {
+        super.__ZKPVerifier_init(initialOwner);
+    }
+}

contracts/verifiers/ZKPVerifier.sol

@@ -8,7 +8,7 @@ import {ICircuitValidator} from "../interfaces/ICircuitValidator.sol";
 import {IZKPVerifier} from "../interfaces/IZKPVerifier.sol";
 import {ArrayUtils} from "../lib/ArrayUtils.sol";
 
-contract ZKPVerifier is IZKPVerifier, Ownable2StepUpgradeable {
+abstract contract ZKPVerifier is IZKPVerifier, Ownable2StepUpgradeable {
     /**
      * @dev Max return array length for request queries
      */
@@ -33,7 +33,17 @@ contract ZKPVerifier is IZKPVerifier, Ownable2StepUpgradeable {
         }
     }
 
-    function initialize(address initialOwner) public initializer {
+    /**
+     * @dev Sets the value for {initialOwner}.
+     *
+     * This value is immutable: it can only be set once during
+     * construction.
+     */
+    function __ZKPVerifier_init(address initialOwner) internal onlyInitializing {
+        ___ZKPVerifier_init_unchained(initialOwner);
+    }
+
+    function ___ZKPVerifier_init_unchained(address initialOwner) internal onlyInitializing {
         __Ownable_init(initialOwner);
     }
 
@@ -110,6 +120,10 @@ contract ZKPVerifier is IZKPVerifier, Ownable2StepUpgradeable {
         return result;
     }
 
+    function isProofSubmitted(address sender, uint64 requestID) public view returns (bool) {
+        return _getMainStorage().proofs[sender][requestID];
+    }
+
     /**
      * @dev Hook that is called before any proof response submit
      */

helpers/DeployHelper.ts

@@ -371,12 +371,12 @@ export class DeployHelper {
     address: string;
   }> {
     const Verifier = await ethers.getContractFactory(
-      "ZKPVerifier"
+      "ZKPVerifierWrapper"
     );
     // const zkpVerifier = await ZKPVerifier.deploy(owner.address);
     const verifier = await upgrades.deployProxy(Verifier, [owner.address]);
     await verifier.deployed();
-    console.log("ZKPVerifier deployed to:", verifier.address);
+    console.log("ZKPVerifierWrapper deployed to:", verifier.address);
     return verifier;
   }