zkjson 0.1.12 → 0.1.14

package/contracts/ZKJson.sol

@@ -1,16 +1,20 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity >=0.7.0 <0.9.0;
-import "hardhat/console.sol";
 import "./ZKQuery.sol";
 
 contract ZKJson is ZKQuery{
+  address public verifierJSON;
 
-  function _validateQueryJSON(uint[] memory path, uint[] calldata zkp, uint size) public pure returns(uint[] memory){
+  function _validateQueryJSON(uint[] memory path, uint[] calldata zkp, uint size_path, uint size_val) internal pure returns(uint[] memory){
     require(zkp[8] == 1, "value doesn't exist");
-    for(uint i = 10; i < 15; i++) require(path[i - 10] == zkp[i], "wrong path");
-    uint[] memory value = new uint[](size);
-    for(uint i = 15; i < 20; i++) value[i - 15] = zkp[i];
+    for(uint i = 10; i < 10 + size_path; i++){
+      require((path.length <= i - 10 && zkp[i] == 0) || path[i - 10] == zkp[i], "wrong path");
+    }
+    uint[] memory value = new uint[](size_val);
+    for(uint i = 10 + size_path; i < 10 + size_path + size_val; i++){
+      value[i - (10 + size_val)] = zkp[i];
+    }
     return toArr(value);
   }
 

package/contracts/ZKQuery.sol

@@ -315,22 +315,22 @@ contract ZKQuery {
     return (_pA, _pB, _pC, sigs);
   }
 
-  function getInt (uint[] memory path, uint[] memory raw) public pure returns (int) {
+  function getInt (uint[] memory path, uint[] memory raw) internal pure returns (int) {
     uint[] memory value = getVal(path, raw);
     return _qInt(value);
   }
 
-  function getString (uint[] memory path, uint[] memory raw) public pure returns (string memory) {
+  function getString (uint[] memory path, uint[] memory raw) internal pure returns (string memory) {
     uint[] memory value = getVal(path, raw);
     _qString(value);
   }
 
-  function getBool (uint[] memory path, uint[] memory raw) public pure returns (bool) {
+  function getBool (uint[] memory path, uint[] memory raw) internal pure returns (bool) {
     uint[] memory value = getVal(path, raw);
     _qBool(value);
   }
 
-  function getNull (uint[] memory path, uint[] memory raw) public pure returns (bool) {
+  function getNull (uint[] memory path, uint[] memory raw) internal pure returns (bool) {
     uint[] memory value = getVal(path, raw);
     _qNull(value);
   }

package/contracts/ZKRollup.sol

@@ -14,7 +14,7 @@ contract ZKRollup is ZKQuery {
   address public committer;
   uint public root;
   
-  function _verifyRU(uint[] calldata zkp) internal view returns (bool) {
+  function _verifyRU(uint[] calldata zkp) private view returns (bool) {
     uint[2] memory _pA;
     uint[2][2] memory _pB;
     uint[2] memory _pC;
@@ -48,7 +48,8 @@ contract ZKRollup is ZKQuery {
     return root;
   }
 
-  function verifyRU(uint[] calldata zkp) public view returns (bool) {
+  function verifyRU(uint[] calldata zkp) private view returns (bool) {
     return _verifyRU(zkp);
   }
+
 }

package/db.js

@@ -1,15 +1,7 @@
 const newMemEmptyTrie = require("./circomlibjs").newMemEmptyTrie
 const snarkjs = require("snarkjs")
 const { range } = require("ramda")
-const {
-  pad,
-  toSignal,
-  str2val,
-  val2str,
-  id2str,
-  encode,
-  toIndex,
-} = require("./encoder")
+const { pad, toSignal, encode, toIndex } = require("./encoder")
 const Collection = require("./collection")
 
 class DB {
@@ -113,6 +105,40 @@ class DB {
       ...publicSignals,
     ]
   }
+
+  async query(col_id, id, path, json) {
+    const val = tar[path]
+    const inputs = await this.genProof({ col_id, id, json, path })
+    const sigs = inputs.slice(8)
+    const params = [[sigs[12], sigs[13], ...sigs.slice(1, 6)], inputs]
+    let type =
+      val === null
+        ? 0
+        : typeof val === "string"
+        ? 3
+        : typeof val === "boolean"
+        ? 1
+        : typeof val === "number"
+        ? Number.isInteger(val)
+          ? 2
+          : 2.5
+        : 4
+    switch (type) {
+      case 0:
+        return await this.zkdb.qNull(...params)
+      case 1:
+        return await this.zkdb.qBool(...params)
+      case 2:
+        return (await this.zkdb.qInt(...params)).toString() * 1
+      case 2.5:
+        return (await this.zkdb.qFloat(...params)).map(n => n.toString() * 1)
+      case 3:
+        return await this.zkdb.qString(...params)
+      case 4:
+        return (await this.zkdb.qRaw(...params)).map(n => n.toString() * 1)
+    }
+  }
+
   async getRollupInputs({ queries }) {
     let write, _json
     let oldRoot = []
@@ -159,7 +185,7 @@ class DB {
       const idb = this.parse(res2, this.tree, this.level_col)
       _res = idb
       const _newKey = toIndex(v[1])
-      json.push(pad(val2str(encode(_json)), this.size_json))
+      json.push(pad(toSignal(encode(_json)), this.size_json))
       const _newKey_db = v[0].toString()
       fnc.push(update ? [0, 1] : [1, 0])
       newRoot.push(idb.newRoot)

package/index.js

@@ -1,7 +1,6 @@
 const encoder = require("./encoder")
 const DB = require("./db")
 const Doc = require("./doc")
-const Rollup = require("./rollup")
 const Collection = require("./collection")
 
-module.exports = { ...encoder, DB, Collection, Doc, Rollup }
+module.exports = { ...encoder, DB, Collection, Doc }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zkjson",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Zero Knowledge Provable JSON",
   "main": "index.js",
   "license": "MIT",

package/contracts/ZKDB.sol

@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.7.0 <0.9.0;
-
-import "hardhat/console.sol";
-import "./ZKRollup.sol";
-
-interface VerifierDB {
-  function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[14] calldata _pubSignals) view external returns (bool);
-}
-
-contract ZKDB is ZKRollup {
-  uint constant public SIZE = 5;
-  address public verifierDB;
-  
-  constructor (address _verifierRU, address _verifierDB, address _comitter){
-    verifierRU = _verifierRU;
-    verifierDB = _verifierDB;
-    comitter = _comitter;
-  }
-  
-  function verify(uint[] calldata zkp) public view returns (bool) {
-    uint[SIZE * 2 + 4] memory sigs;
-    (
-       uint[2] memory _pA,
-       uint[2][2] memory _pB,
-       uint[2] memory _pC,
-       uint[] memory _sigs
-    ) = _parseZKP(zkp);
-    for(uint i = 0; i < sigs.length; i++) sigs[i] = _sigs[i];
-    require(VerifierDB(verifierDB).verifyProof(_pA, _pB, _pC, sigs), "invalid proof");
-    return true;
-  }
-
-  function validateQuery(uint[] memory path, uint[] calldata zkp) public view returns(uint[] memory){
-    verify(zkp);
-    return _validateQueryRU(path, zkp, SIZE);
-  }
-
-  function qInt (uint[] memory path, uint[] calldata zkp) public view returns (int) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qInt(value);
-  }
-
-  function qFloat (uint[] memory path, uint[] calldata zkp) public view returns (uint[3] memory) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qFloat(value);
-  }
-
-  function qRaw (uint[] memory path, uint[] calldata zkp) public view returns (uint[] memory) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qRaw(value);
-  }
-  
-  function qString (uint[] memory path, uint[] calldata zkp) public view returns (string memory) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qString(value);
-  }
-
-  function qBool (uint[] memory path, uint[] calldata zkp) public view returns (bool) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qBool(value);
-  }
-  
-  function qNull (uint[] memory path, uint[] calldata zkp) public view returns (bool) {
-    uint[] memory value = validateQuery(path, zkp);
-    return _qNull(value);
-  }
-
-}