remove lock verifiers

Signed-off-by: Jim Zhang <[email protected]>

solidity/contracts/factory.sol

@@ -29,11 +29,9 @@ contract ZetoTokenFactory is Ownable {
         address implementation;
         address depositVerifier;
         address withdrawVerifier;
-        address lockVerifier;
         address verifier;
         address batchVerifier;
         address batchWithdrawVerifier;
-        address batchLockVerifier;
     }
 
     event ZetoTokenDeployed(address indexed zetoToken);
@@ -86,14 +84,6 @@ contract ZetoTokenFactory is Ownable {
             args.batchWithdrawVerifier != address(0),
             "Factory: batchWithdrawVerifier address is required"
         );
-        require(
-            args.lockVerifier != address(0),
-            "Factory: lockVerifier address is required"
-        );
-        require(
-            args.batchLockVerifier != address(0),
-            "Factory: batchLockVerifier address is required"
-        );
         address instance = Clones.clone(args.implementation);
         require(
             instance != address(0),
@@ -105,9 +95,7 @@ contract ZetoTokenFactory is Ownable {
             args.depositVerifier,
             args.withdrawVerifier,
             args.batchVerifier,
-            args.batchWithdrawVerifier,
-            args.lockVerifier,
-            args.batchLockVerifier
+            args.batchWithdrawVerifier
         );
         emit ZetoTokenDeployed(instance);
         return instance;
@@ -122,19 +110,14 @@ contract ZetoTokenFactory is Ownable {
             args.implementation != address(0),
             "Factory: failed to find implementation"
         );
-        require(
-            args.lockVerifier != address(0),
-            "Factory: lockVerifier address is required"
-        );
         address instance = Clones.clone(args.implementation);
         require(
             instance != address(0),
             "Factory: failed to clone implementation"
         );
         (IZetoNonFungibleInitializable(instance)).initialize(
             initialOwner,
-            args.verifier,
-            args.lockVerifier
+            args.verifier
         );
         emit ZetoTokenDeployed(instance);
         return instance;

solidity/contracts/lib/interfaces/izeto_fungible_initializable.sol

@@ -22,8 +22,6 @@ interface IZetoFungibleInitializable {
         address _withdrawVerifier,
         address _verifier,
         address _batchVerifier,
-        address _batchWithdrawVerifier,
-        address _lockVerifier,
-        address _batchLockVerifier
+        address _batchWithdrawVerifier
     ) external;
 }

solidity/contracts/lib/interfaces/izeto_lockable.sol

@@ -35,21 +35,3 @@ interface IZetoLockable {
         bytes data
     );
 }
-
-interface ILockVerifier {
-    function verifyProof(
-        uint[2] calldata _pA,
-        uint[2][2] calldata _pB,
-        uint[2] calldata _pC,
-        uint[2] calldata _pubSignals
-    ) external view returns (bool);
-}
-
-interface IBatchLockVerifier {
-    function verifyProof(
-        uint[2] calldata _pA,
-        uint[2][2] calldata _pB,
-        uint[2] calldata _pC,
-        uint[10] calldata _pubSignals
-    ) external view returns (bool);
-}

solidity/contracts/lib/interfaces/izeto_nf_initializable.sol

@@ -16,9 +16,5 @@
 pragma solidity ^0.8.27;
 
 interface IZetoNonFungibleInitializable {
-    function initialize(
-        address initialOwner,
-        address _verifier,
-        address _lockVerifier
-    ) external;
+    function initialize(address initialOwner, address _verifier) external;
 }

solidity/contracts/lib/zeto_lock.sol

@@ -24,19 +24,14 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 ///        without using nullifiers. Each UTXO's spending status is explicitly tracked.
 /// @author Kaleido, Inc.
 /// @dev Implements common functionalities of Zeto based tokens without nullifiers
-abstract contract ZetoLock is IZetoBase, IZetoLockable, OwnableUpgradeable {
+abstract contract ZetoLock is IZetoBase, IZetoLockable {
     // used for multi-step transaction flows that require counterparties
     // to upload proofs. To protect the party that uploads their proof first,
     // and prevent any other party from utilizing the uploaded proof to execute
     // a transaction, the input UTXOs or nullifiers can be locked and only usable
     // by the same party that did the locking.
     mapping(uint256 => address) internal lockedUTXOs;
 
-    function __ZetoLock_init(
-        address lockVerifier,
-        address batchLockVerifier
-    ) public onlyInitializing {}
-
     // Locks the UTXOs so that they can only be spent by submitting the appropriate
     // proof from the Eth account designated as the "delegate". This function
     // should be called by escrow contracts that will use uploaded proofs

solidity/contracts/zeto_anon.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZeto} from "./lib/interfaces/izeto.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckInputsOutputsValue} from "./lib/verifier_check_inputs_outputs_value.sol";
 import {Groth16Verifier_CheckInputsOutputsValueBatch} from "./lib/verifier_check_inputs_outputs_value_batch.sol";
@@ -57,17 +56,14 @@ contract Zeto_Anon is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckInputsOutputsValue withdrawVerifier,
         Groth16Verifier_AnonBatch batchVerifier,
-        Groth16Verifier_CheckInputsOutputsValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckInputsOutputsValueBatch batchWithdrawVerifier
     ) public initializer {
         __ZetoBase_init(initialOwner);
         __ZetoFungibleWithdraw_init(
             depositVerifier,
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_enc.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZetoEncrypted} from "./lib/interfaces/izeto_encrypted.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckInputsOutputsValue} from "./lib/verifier_check_inputs_outputs_value.sol";
 import {Groth16Verifier_CheckInputsOutputsValueBatch} from "./lib/verifier_check_inputs_outputs_value_batch.sol";
@@ -59,17 +58,14 @@ contract Zeto_AnonEnc is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckInputsOutputsValue withdrawVerifier,
         Groth16Verifier_AnonEncBatch batchVerifier,
-        Groth16Verifier_CheckInputsOutputsValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckInputsOutputsValueBatch batchWithdrawVerifier
     ) public initializer {
         __ZetoBase_init(initialOwner);
         __ZetoFungibleWithdraw_init(
             depositVerifier,
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_enc_nullifier.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZetoEncrypted} from "./lib/interfaces/izeto_encrypted.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckNullifierValue} from "./lib/verifier_check_nullifier_value.sol";
 import {Groth16Verifier_CheckNullifierValueBatch} from "./lib/verifier_check_nullifier_value_batch.sol";
@@ -56,17 +55,14 @@ contract Zeto_AnonEncNullifier is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckNullifierValue withdrawVerifier,
         Groth16Verifier_AnonEncNullifierBatch batchVerifier,
-        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(
             depositVerifier,
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_enc_nullifier_kyc.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZetoEncrypted} from "./lib/interfaces/izeto_encrypted.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckNullifierValue} from "./lib/verifier_check_nullifier_value.sol";
 import {Groth16Verifier_CheckNullifierValueBatch} from "./lib/verifier_check_nullifier_value_batch.sol";
@@ -58,9 +57,7 @@ contract Zeto_AnonEncNullifierKyc is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckNullifierValue withdrawVerifier,
         Groth16Verifier_AnonEncNullifierKycBatch batchVerifier,
-        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier
     ) public initializer {
         __Registry_init();
         __ZetoNullifier_init(initialOwner);
@@ -69,7 +66,6 @@ contract Zeto_AnonEncNullifierKyc is
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_enc_nullifier_non_repudiation.sol

@@ -21,7 +21,6 @@ import {Groth16Verifier_CheckNullifierValue} from "./lib/verifier_check_nullifie
 import {Groth16Verifier_CheckNullifierValueBatch} from "./lib/verifier_check_nullifier_value_batch.sol";
 import {Groth16Verifier_AnonEncNullifierNonRepudiation} from "./lib/verifier_anon_enc_nullifier_non_repudiation.sol";
 import {Groth16Verifier_AnonEncNullifierNonRepudiationBatch} from "./lib/verifier_anon_enc_nullifier_non_repudiation_batch.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {ZetoNullifier} from "./lib/zeto_nullifier.sol";
 import {ZetoFungibleWithdrawWithNullifiers} from "./lib/zeto_fungible_withdraw_nullifier.sol";
 import {ZetoLock} from "./lib/zeto_lock.sol";
@@ -68,17 +67,14 @@ contract Zeto_AnonEncNullifierNonRepudiation is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckNullifierValue withdrawVerifier,
         Groth16Verifier_AnonEncNullifierNonRepudiationBatch batchVerifier,
-        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(
             depositVerifier,
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_nullifier.sol

@@ -17,7 +17,6 @@ pragma solidity ^0.8.27;
 
 import {IZeto} from "./lib/interfaces/izeto.sol";
 import {MAX_BATCH} from "./lib/interfaces/izeto_common.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckNullifierValue} from "./lib/verifier_check_nullifier_value.sol";
 import {Groth16Verifier_CheckNullifierValueBatch} from "./lib/verifier_check_nullifier_value_batch.sol";
@@ -56,17 +55,14 @@ contract Zeto_AnonNullifier is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckNullifierValue withdrawVerifier,
         Groth16Verifier_AnonNullifierBatch batchVerifier,
-        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
         __ZetoFungibleWithdrawWithNullifiers_init(
             depositVerifier,
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_anon_nullifier_kyc.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZeto} from "./lib/interfaces/izeto.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_CheckHashesValue} from "./lib/verifier_check_hashes_value.sol";
 import {Groth16Verifier_CheckNullifierValue} from "./lib/verifier_check_nullifier_value.sol";
 import {Groth16Verifier_CheckNullifierValueBatch} from "./lib/verifier_check_nullifier_value_batch.sol";
@@ -58,9 +57,7 @@ contract Zeto_AnonNullifierKyc is
         Groth16Verifier_CheckHashesValue depositVerifier,
         Groth16Verifier_CheckNullifierValue withdrawVerifier,
         Groth16Verifier_AnonNullifierKycBatch batchVerifier,
-        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier,
-        ILockVerifier lockVerifier,
-        IBatchLockVerifier batchLockVerifier
+        Groth16Verifier_CheckNullifierValueBatch batchWithdrawVerifier
     ) public initializer {
         __Registry_init();
         __ZetoNullifier_init(initialOwner);
@@ -69,7 +66,6 @@ contract Zeto_AnonNullifierKyc is
             withdrawVerifier,
             batchWithdrawVerifier
         );
-        __ZetoLock_init(lockVerifier, batchLockVerifier);
         _verifier = verifier;
         _batchVerifier = batchVerifier;
     }

solidity/contracts/zeto_nf_anon.sol

@@ -17,8 +17,6 @@ pragma solidity ^0.8.27;
 
 import {IZeto} from "./lib/interfaces/izeto.sol";
 import {Groth16Verifier_CheckUtxosNfOwner} from "./lib/verifier_check_utxos_nf_owner.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
-
 import {Groth16Verifier_NfAnon} from "./lib/verifier_nf_anon.sol";
 import {ZetoBase} from "./lib/zeto_base.sol";
 import {ZetoLock} from "./lib/zeto_lock.sol";
@@ -36,11 +34,9 @@ contract Zeto_NfAnon is IZeto, ZetoBase, ZetoLock, UUPSUpgradeable {
 
     function initialize(
         address initialOwner,
-        Groth16Verifier_NfAnon verifier,
-        ILockVerifier lockVerifier
+        Groth16Verifier_NfAnon verifier
     ) public initializer {
         __ZetoBase_init(initialOwner);
-        __ZetoLock_init(lockVerifier, IBatchLockVerifier(address(0)));
         _verifier = verifier;
     }
 

solidity/contracts/zeto_nf_anon_nullifier.sol

@@ -16,7 +16,6 @@
 pragma solidity ^0.8.27;
 
 import {IZeto} from "./lib/interfaces/izeto.sol";
-import {ILockVerifier, IBatchLockVerifier} from "./lib/interfaces/izeto_lockable.sol";
 import {Groth16Verifier_NfAnonNullifier} from "./lib/verifier_nf_anon_nullifier.sol";
 import {ZetoNullifier} from "./lib/zeto_nullifier.sol";
 import {ZetoLock} from "./lib/zeto_lock.sol";
@@ -41,11 +40,9 @@ contract Zeto_NfAnonNullifier is
 
     function initialize(
         address initialOwner,
-        Groth16Verifier_NfAnonNullifier verifier,
-        ILockVerifier lockVerifier
+        Groth16Verifier_NfAnonNullifier verifier
     ) public initializer {
         __ZetoNullifier_init(initialOwner);
-        __ZetoLock_init(lockVerifier, IBatchLockVerifier(address(0)));
         _verifier = verifier;
     }