Lock states

solidity/contracts/factory.sol

@@ -17,8 +17,8 @@ pragma solidity ^0.8.20;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {IZetoFungibleInitializable} from "./lib/interfaces/zeto_fungible_initializable.sol";
-import {IZetoNonFungibleInitializable} from "./lib/interfaces/zeto_nf_initializable.sol";
+import {IZetoFungibleInitializable} from "./lib/interfaces/izeto_fungible_initializable.sol";
+import {IZetoNonFungibleInitializable} from "./lib/interfaces/izeto_nf_initializable.sol";
 
 contract ZetoTokenFactory is Ownable {
     // all the addresses needed by the factory to
@@ -29,9 +29,11 @@ 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);
@@ -84,6 +86,14 @@ 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),
@@ -95,7 +105,9 @@ contract ZetoTokenFactory is Ownable {
             args.depositVerifier,
             args.withdrawVerifier,
             args.batchVerifier,
-            args.batchWithdrawVerifier
+            args.batchWithdrawVerifier,
+            args.lockVerifier,
+            args.batchLockVerifier
         );
         emit ZetoTokenDeployed(instance);
         return instance;
@@ -110,14 +122,19 @@ 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.verifier,
+            args.lockVerifier
         );
         emit ZetoTokenDeployed(instance);
         return instance;

solidity/contracts/lib/interfaces/zeto_fungible_initializable.sol → solidity/contracts/lib/interfaces/izeto_fungible_initializable.sol

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

solidity/contracts/lib/interfaces/izeto_lockable.sol

@@ -0,0 +1,46 @@
+// Copyright © 2024 Kaleido, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+pragma solidity ^0.8.20;
+
+import {Commonlib} from "../common.sol";
+
+interface IZetoLockable {
+    error UTXOAlreadyLocked(uint256 utxo);
+    event UTXOsLocked(
+        uint256[] utxos,
+        address indexed delegate,
+        address indexed submitter,
+        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/zeto_nf_initializable.sol → solidity/contracts/lib/interfaces/izeto_nf_initializable.sol

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

solidity/contracts/lib/verifier_check_nullifiers_nf_owner.sol

@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: GPL-3.0
+/*
+    Copyright 2021 0KIMS association.
+
+    This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
+
+    snarkJS is a free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    snarkJS is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+    License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+pragma solidity >=0.7.0 <0.9.0;
+
+contract Groth16Verifier_CheckNullifiersNfOwner {
+    // Scalar field size
+    uint256 constant r    = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
+    // Base field size
+    uint256 constant q   = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
+
+    // Verification Key data
+    uint256 constant alphax  = 20491192805390485299153009773594534940189261866228447918068658471970481763042;
+    uint256 constant alphay  = 9383485363053290200918347156157836566562967994039712273449902621266178545958;
+    uint256 constant betax1  = 4252822878758300859123897981450591353533073413197771768651442665752259397132;
+    uint256 constant betax2  = 6375614351688725206403948262868962793625744043794305715222011528459656738731;
+    uint256 constant betay1  = 21847035105528745403288232691147584728191162732299865338377159692350059136679;
+    uint256 constant betay2  = 10505242626370262277552901082094356697409835680220590971873171140371331206856;
+    uint256 constant gammax1 = 11559732032986387107991004021392285783925812861821192530917403151452391805634;
+    uint256 constant gammax2 = 10857046999023057135944570762232829481370756359578518086990519993285655852781;
+    uint256 constant gammay1 = 4082367875863433681332203403145435568316851327593401208105741076214120093531;
+    uint256 constant gammay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;
+    uint256 constant deltax1 = 11559732032986387107991004021392285783925812861821192530917403151452391805634;
+    uint256 constant deltax2 = 10857046999023057135944570762232829481370756359578518086990519993285655852781;
+    uint256 constant deltay1 = 4082367875863433681332203403145435568316851327593401208105741076214120093531;
+    uint256 constant deltay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;
+
+
+    uint256 constant IC0x = 4309308528273276555069543879562573478975407913854086083779827033416284670724;
+    uint256 constant IC0y = 5817651292625894880399535368272757856426406145357248162801188302741402124546;
+
+    uint256 constant IC1x = 17224538472459936668342188732120409807794796861334686524777971239307689494925;
+    uint256 constant IC1y = 14212750221780665075930805194627428108087299328089222953442904533004160200955;
+
+    uint256 constant IC2x = 21500052851511985596831587241759129211123695069562820995499323777626243316126;
+    uint256 constant IC2y = 6037878515570259558330310553021098940773801877350844236400848654303871580548;
+
+
+    // Memory data
+    uint16 constant pVk = 0;
+    uint16 constant pPairing = 128;
+
+    uint16 constant pLastMem = 896;
+
+    function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[2] calldata _pubSignals) public view returns (bool) {
+        assembly {
+            function checkField(v) {
+                if iszero(lt(v, r)) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+
+            // G1 function to multiply a G1 value(x,y) to value in an address
+            function g1_mulAccC(pR, x, y, s) {
+                let success
+                let mIn := mload(0x40)
+                mstore(mIn, x)
+                mstore(add(mIn, 32), y)
+                mstore(add(mIn, 64), s)
+
+                success := staticcall(sub(gas(), 2000), 7, mIn, 96, mIn, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+
+                mstore(add(mIn, 64), mload(pR))
+                mstore(add(mIn, 96), mload(add(pR, 32)))
+
+                success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+
+            function checkPairing(pA, pB, pC, pubSignals, pMem) -> isOk {
+                let _pPairing := add(pMem, pPairing)
+                let _pVk := add(pMem, pVk)
+
+                mstore(_pVk, IC0x)
+                mstore(add(_pVk, 32), IC0y)
+
+                // Compute the linear combination vk_x
+
+                g1_mulAccC(_pVk, IC1x, IC1y, calldataload(add(pubSignals, 0)))
+
+                g1_mulAccC(_pVk, IC2x, IC2y, calldataload(add(pubSignals, 32)))
+
+
+                // -A
+                mstore(_pPairing, calldataload(pA))
+                mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q))
+
+                // B
+                mstore(add(_pPairing, 64), calldataload(pB))
+                mstore(add(_pPairing, 96), calldataload(add(pB, 32)))
+                mstore(add(_pPairing, 128), calldataload(add(pB, 64)))
+                mstore(add(_pPairing, 160), calldataload(add(pB, 96)))
+
+                // alpha1
+                mstore(add(_pPairing, 192), alphax)
+                mstore(add(_pPairing, 224), alphay)
+
+                // beta2
+                mstore(add(_pPairing, 256), betax1)
+                mstore(add(_pPairing, 288), betax2)
+                mstore(add(_pPairing, 320), betay1)
+                mstore(add(_pPairing, 352), betay2)
+
+                // vk_x
+                mstore(add(_pPairing, 384), mload(add(pMem, pVk)))
+                mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32))))
+
+
+                // gamma2
+                mstore(add(_pPairing, 448), gammax1)
+                mstore(add(_pPairing, 480), gammax2)
+                mstore(add(_pPairing, 512), gammay1)
+                mstore(add(_pPairing, 544), gammay2)
+
+                // C
+                mstore(add(_pPairing, 576), calldataload(pC))
+                mstore(add(_pPairing, 608), calldataload(add(pC, 32)))
+
+                // delta2
+                mstore(add(_pPairing, 640), deltax1)
+                mstore(add(_pPairing, 672), deltax2)
+                mstore(add(_pPairing, 704), deltay1)
+                mstore(add(_pPairing, 736), deltay2)
+
+
+                let success := staticcall(sub(gas(), 2000), 8, _pPairing, 768, _pPairing, 0x20)
+
+                isOk := and(success, mload(_pPairing))
+            }
+
+            let pMem := mload(0x40)
+            mstore(0x40, add(pMem, pLastMem))
+
+            // Validate that all evaluations ∈ F
+
+            checkField(calldataload(add(_pubSignals, 0)))
+
+            checkField(calldataload(add(_pubSignals, 32)))
+
+
+            // Validate all evaluations
+            let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem)
+
+            mstore(0, isValid)
+             return(0, 0x20)
+         }
+     }
+ }