Feature/pid 1054

.prettierignore

@@ -0,0 +1,3 @@
+**/lib/VerifierMTP.sol
+**/lib/VerifierSig.sol
+**/lib/VerifierStateTransition.sol

contracts/interfaces/ICircuitValidator.sol

@@ -2,24 +2,15 @@
 pragma solidity 0.8.16;
 
 interface ICircuitValidator {
-    struct CircuitQuery {
-        uint256 schema;
-        uint256 claimPathKey;
-        uint256 operator;
-        uint256[] value;
-        uint256 queryHash;
-        string circuitId;
-    }
-
     function verify(
         uint256[] memory inputs,
         uint256[2] memory a,
         uint256[2][2] memory b,
         uint256[2] memory c,
-        uint256 queryHash
-    ) external view returns (bool r);
+        bytes calldata data
+    ) external view;
 
-    function getCircuitId() external pure returns (string memory id);
+    function getSupportedCircuitIds() external view returns (string[] memory ids);
 
-    function getChallengeInputIndex() external pure returns (uint256 index);
+    function inputIndexOf(string memory name) external view returns (uint256);
 }

contracts/interfaces/IZKPVerifier.sol

@@ -5,34 +5,30 @@ pragma solidity 0.8.16;
 import {ICircuitValidator} from "./ICircuitValidator.sol";
 
 interface IZKPVerifier {
+    struct ZKPRequest {
+        string metadata;
+        ICircuitValidator validator;
+        bytes data;
+    }
+
     function submitZKPResponse(
         uint64 requestId,
         uint256[] memory inputs,
         uint256[2] memory a,
         uint256[2][2] memory b,
         uint256[2] memory c
-    ) external returns (bool);
+    ) external;
 
-    function setZKPRequest(
-        uint64 requestId,
-        ICircuitValidator validator,
-        uint256 schema,
-        uint256 slotIndex,
-        uint256 operator,
-        uint256[] calldata value
-    ) external returns (bool);
-
-    function setZKPRequestRaw(
-        uint64 requestId,
-        ICircuitValidator validator,
-        uint256 schema,
-        uint256 slotIndex,
-        uint256 operator,
-        uint256[] calldata value,
-        uint256 queryHash
-    ) external returns (bool);
-
-    function getZKPRequest(
-        uint64 requestId
-    ) external returns (ICircuitValidator.CircuitQuery memory);
+    function setZKPRequest(uint64 requestId, ZKPRequest calldata request) external;
+
+    function getZKPRequestsCount() external view returns (uint256);
+
+    function requestIdExists(uint64 requestId) external view returns (bool);
+
+    function getZKPRequest(uint64 requestId) external view returns (ZKPRequest memory);
+
+    function getZKPRequests(
+        uint256 startIndex,
+        uint256 length
+    ) external view returns (ZKPRequest[] memory);
 }

contracts/lib/VerifierMTP.sol

@@ -79,14 +79,18 @@ contract VerifierMTP {
     uint256 constant IC11x = 13613305841160720689914712433320508347546323189059844660259139894452538774575;
     uint256 constant IC11y = 5325101314795154200638690464360192908052407201796948025470533168336651686116;
 
-
     // 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[11] calldata _pubSignals) public view returns (bool) {
+    function verifyProof(
+        uint[2] calldata _pA,
+        uint[2][2] calldata _pB,
+        uint[2] calldata _pC,
+        uint[11] calldata _pubSignals
+    ) public view returns (bool) {
         assembly {
             function checkField(v) {
                 if iszero(lt(v, q)) {
@@ -95,7 +99,7 @@ contract VerifierMTP {
                 }
             }
 
-        // G1 function to multiply a G1 value(x,y) to value in an address
+            // 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)
@@ -128,7 +132,7 @@ contract VerifierMTP {
                 mstore(_pVk, IC0x)
                 mstore(add(_pVk, 32), IC0y)
 
-            // Compute the linear combination vk_x
+                // Compute the linear combination vk_x
 
                 g1_mulAccC(_pVk, IC1x, IC1y, calldataload(add(pubSignals, 0)))
 
@@ -152,49 +156,46 @@ contract VerifierMTP {
 
                 g1_mulAccC(_pVk, IC11x, IC11y, calldataload(add(pubSignals, 320)))
 
-
-            // -A
+                // -A
                 mstore(_pPairing, calldataload(pA))
                 mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q))
 
-            // B
+                // 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
+                // alpha1
                 mstore(add(_pPairing, 192), alphax)
                 mstore(add(_pPairing, 224), alphay)
 
-            // beta2
+                // beta2
                 mstore(add(_pPairing, 256), betax1)
                 mstore(add(_pPairing, 288), betax2)
                 mstore(add(_pPairing, 320), betay1)
                 mstore(add(_pPairing, 352), betay2)
 
-            // vk_x
+                // vk_x
                 mstore(add(_pPairing, 384), mload(add(pMem, pVk)))
                 mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32))))
 
-
-            // gamma2
+                // gamma2
                 mstore(add(_pPairing, 448), gammax1)
                 mstore(add(_pPairing, 480), gammax2)
                 mstore(add(_pPairing, 512), gammay1)
                 mstore(add(_pPairing, 544), gammay2)
 
-            // C
+                // C
                 mstore(add(_pPairing, 576), calldataload(pC))
                 mstore(add(_pPairing, 608), calldataload(add(pC, 32)))
 
-            // delta2
+                // 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))
@@ -203,7 +204,7 @@ contract VerifierMTP {
             let pMem := mload(0x40)
             mstore(0x40, add(pMem, pLastMem))
 
-        // Validate that all evaluations ∈ F
+            // Validate that all evaluations ∈ F
 
             checkField(calldataload(add(_pubSignals, 0)))
 
@@ -229,8 +230,7 @@ contract VerifierMTP {
 
             checkField(calldataload(add(_pubSignals, 352)))
 
-
-        // Validate all evaluations
+            // Validate all evaluations
             let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem)
 
             mstore(0, isValid)

contracts/lib/VerifierMTPWrapper.sol

@@ -16,10 +16,9 @@ pragma solidity 0.8.16;
 import "./VerifierMTP.sol";
 import "../interfaces/IVerifier.sol";
 
-contract VerifierMTPWrapper is VerifierMTP,IVerifier {
-
+contract VerifierMTPWrapper is VerifierMTP, IVerifier {
     /**
-        * @dev Number of public signals for atomic mtp circuit
+     * @dev Number of public signals for atomic mtp circuit
      */
     uint constant PUBSIGNALS_LENGTH = 11;
 
@@ -30,7 +29,6 @@ contract VerifierMTPWrapper is VerifierMTP,IVerifier {
         uint256[2] calldata c,
         uint256[] calldata input
     ) public view returns (bool r) {
-
         uint[PUBSIGNALS_LENGTH] memory pubSignals;
 
         require(input.length == PUBSIGNALS_LENGTH, "expected array length is 11");
@@ -39,7 +37,6 @@ contract VerifierMTPWrapper is VerifierMTP,IVerifier {
             pubSignals[i] = input[i];
         }
 
-        return this.verifyProof(a,b,c,pubSignals) ;
-
+        return this.verifyProof(a, b, c, pubSignals);
     }
 }

contracts/lib/VerifierSig.sol

@@ -86,7 +86,12 @@ contract VerifierSig {
 
     uint16 constant pLastMem = 896;
 
-    function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[11] calldata _pubSignals) public view returns (bool) {
+    function verifyProof(
+        uint[2] calldata _pA,
+        uint[2][2] calldata _pB,
+        uint[2] calldata _pC,
+        uint[11] calldata _pubSignals
+    ) public view returns (bool) {
         assembly {
             function checkField(v) {
                 if iszero(lt(v, q)) {
@@ -95,7 +100,7 @@ contract VerifierSig {
                 }
             }
 
-        // G1 function to multiply a G1 value(x,y) to value in an address
+            // 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)
@@ -128,7 +133,7 @@ contract VerifierSig {
                 mstore(_pVk, IC0x)
                 mstore(add(_pVk, 32), IC0y)
 
-            // Compute the linear combination vk_x
+                // Compute the linear combination vk_x
 
                 g1_mulAccC(_pVk, IC1x, IC1y, calldataload(add(pubSignals, 0)))
 
@@ -152,49 +157,46 @@ contract VerifierSig {
 
                 g1_mulAccC(_pVk, IC11x, IC11y, calldataload(add(pubSignals, 320)))
 
-
-            // -A
+                // -A
                 mstore(_pPairing, calldataload(pA))
                 mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q))
 
-            // B
+                // 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
+                // alpha1
                 mstore(add(_pPairing, 192), alphax)
                 mstore(add(_pPairing, 224), alphay)
 
-            // beta2
+                // beta2
                 mstore(add(_pPairing, 256), betax1)
                 mstore(add(_pPairing, 288), betax2)
                 mstore(add(_pPairing, 320), betay1)
                 mstore(add(_pPairing, 352), betay2)
 
-            // vk_x
+                // vk_x
                 mstore(add(_pPairing, 384), mload(add(pMem, pVk)))
                 mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32))))
 
-
-            // gamma2
+                // gamma2
                 mstore(add(_pPairing, 448), gammax1)
                 mstore(add(_pPairing, 480), gammax2)
                 mstore(add(_pPairing, 512), gammay1)
                 mstore(add(_pPairing, 544), gammay2)
 
-            // C
+                // C
                 mstore(add(_pPairing, 576), calldataload(pC))
                 mstore(add(_pPairing, 608), calldataload(add(pC, 32)))
 
-            // delta2
+                // 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))
@@ -203,7 +205,7 @@ contract VerifierSig {
             let pMem := mload(0x40)
             mstore(0x40, add(pMem, pLastMem))
 
-        // Validate that all evaluations ∈ F
+            // Validate that all evaluations ∈ F
 
             checkField(calldataload(add(_pubSignals, 0)))
 
@@ -229,8 +231,7 @@ contract VerifierSig {
 
             checkField(calldataload(add(_pubSignals, 352)))
 
-
-        // Validate all evaluations
+            // Validate all evaluations
             let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem)
 
             mstore(0, isValid)

contracts/lib/VerifierSigWrapper.sol

@@ -17,7 +17,6 @@ import "./VerifierSig.sol";
 import "../interfaces/IVerifier.sol";
 
 contract VerifierSigWrapper is VerifierSig, IVerifier {
-
     /**
      * @dev Number of public signals for atomic sig circuit
      */
@@ -38,6 +37,6 @@ contract VerifierSigWrapper is VerifierSig, IVerifier {
         for (uint256 i = 0; i < PUBSIGNALS_LENGTH; i++) {
             pubSignals[i] = input[i];
         }
-        return  this.verifyProof(a,b,c,pubSignals) ;
+        return this.verifyProof(a, b, c, pubSignals);
     }
 }