zkjson 0.1.2 → 0.1.4

package/collection.js

@@ -1,9 +1,30 @@
 const newMemEmptyTrie = require("./circomlibjs").newMemEmptyTrie
 const { pad, str2val, val2str, id2str, encode, str2id } = require("./encoder")
+const Doc = require("./doc")
 
 class Collection {
-  constructor(size = 16) {
+  constructor({ size = 5, size_json = 16, level = 100 }) {
     this.size = size
+    this.size_json = size_json
+    this.level = level
+    this.doc = new Doc({ size: this.size, size_json: this.size_json })
+  }
+  async getInputs({ id, json, path, val }) {
+    const doc_inputs = await this.doc.getInputs({ json, path, val })
+    const res = await this.get(id)
+    let siblings = res.siblings
+    for (let i = 0; i < siblings.length; i++)
+      siblings[i] = this.tree.F.toObject(siblings[i])
+    while (siblings.length < this.level) siblings.push(0)
+    siblings = siblings.map(s => s.toString())
+    return {
+      json: doc_inputs.json,
+      path: doc_inputs.path,
+      val: doc_inputs.val,
+      root: this.tree.F.toObject(this.tree.root).toString(),
+      siblings,
+      key: str2id(id),
+    }
   }
   async init() {
     this.tree = await newMemEmptyTrie()
@@ -11,13 +32,13 @@ class Collection {
   async insert(_key, _val) {
     const doc = encode(_val)
     const id = str2id(_key)
-    const val = pad(val2str(doc), this.size)
+    const val = pad(val2str(doc), this.size_json)
     return await this.tree.insert(id, val)
   }
   async update(_key, _val) {
     const doc = encode(_val)
     const id = str2id(_key)
-    const val = pad(val2str(doc), this.size)
+    const val = pad(val2str(doc), this.size_json)
     return await this.tree.update(id, val)
   }
 

package/db.js

@@ -1,20 +1,190 @@
 const newMemEmptyTrie = require("./circomlibjs").newMemEmptyTrie
-const { str2val, val2str, id2str, encode, str2id } = require("./encoder")
+const { range } = require("ramda")
+const {
+  pad,
+  toSignal,
+  str2val,
+  val2str,
+  id2str,
+  encode,
+  str2id,
+} = require("./encoder")
 const Collection = require("./collection")
 
 class DB {
-  constructor(size = 16) {
+  constructor({ size = 5, level = 40, size_json = 16, size_txs = 10 }) {
     this.size = size
+    this.level = level
+    this.size_json = size_json
+    this.size_txs = size_txs
   }
+
   async init() {
     this.tree = await newMemEmptyTrie()
     this.cols = {}
   }
+
+  parse(res, tree) {
+    const isOld0 = res.isOld0 ? "1" : "0"
+    const oldRoot = tree.F.toObject(res.oldRoot).toString()
+    const newRoot = tree.F.toObject(res.newRoot).toString()
+    const oldKey = res.isOld0 ? "0" : tree.F.toObject(res.oldKey).toString()
+    const oldValue = res.isOld0 ? "0" : tree.F.toObject(res.oldValue).toString()
+    let siblings = res.siblings
+    for (let i = 0; i < siblings.length; i++)
+      siblings[i] = tree.F.toObject(siblings[i])
+    while (siblings.length < this.level) siblings.push(0)
+    siblings = siblings.map(s => s.toString())
+    return { isOld0, oldRoot, oldKey, oldValue, siblings, newRoot }
+  }
+
+  async getRollupInputs({ queries }) {
+    let write, _json
+    let oldRoot = []
+    let newRoot = []
+    let oldKey = []
+    let oldValue = []
+    let siblings = []
+    let isOld0 = []
+    let oldRoot_db = []
+    let newRoot_db = []
+    let oldKey_db = []
+    let oldValue_db = []
+    let siblings_db = []
+    let isOld0_db = []
+    let newKey_db = []
+    let newKey = []
+    let _res
+    let json = []
+    let fnc = []
+    for (let i = 0; i < this.size_txs; i++) {
+      const v = queries[i]
+      if (!v) {
+        json.push(range(0, this.size_json).map(() => "0"))
+        fnc.push([0, 0])
+        newRoot.push(newRoot[i - 1])
+        oldRoot.push("0")
+        oldKey.push("0")
+        oldValue.push("0")
+        siblings.push(range(0, this.level).map(() => "0"))
+        isOld0.push("0")
+        oldRoot_db.push(newRoot_db[i - 1])
+        oldKey_db.push("0")
+        oldValue_db.push("0")
+        siblings_db.push(range(0, this.level).map(() => "0"))
+        isOld0_db.push("0")
+        newKey_db.push("0")
+        newKey.push("0")
+        continue
+      }
+      _json = v[2]
+      const { update, tree, col: res2, doc: res } = await this.insert(...v)
+      const icol = this.parse(res, tree)
+      const idb = this.parse(res2, this.tree)
+      _res = idb
+      const _newKey = str2id(v[1])
+      json.push(pad(val2str(encode(_json)), this.size_json))
+      const _newKey_db = str2id(v[0])
+      fnc.push(update ? [0, 1] : [1, 0])
+      newRoot.push(idb.newRoot)
+      oldRoot.push(icol.oldRoot)
+      oldKey.push(icol.oldKey)
+      oldValue.push(icol.oldValue)
+      siblings.push(icol.siblings)
+      isOld0.push(icol.isOld0)
+      oldRoot_db.push(idb.oldRoot)
+      newRoot_db.push(idb.newRoot)
+      oldKey_db.push(idb.oldKey)
+      oldValue_db.push(idb.oldValue)
+      siblings_db.push(idb.siblings)
+      isOld0_db.push(idb.isOld0)
+      newKey_db.push(_newKey_db)
+      newKey.push(_newKey)
+    }
+
+    return {
+      fnc,
+      oldRoot,
+      newRoot,
+      oldKey,
+      oldValue,
+      siblings,
+      isOld0,
+      oldRoot_db,
+      oldKey_db,
+      oldValue_db,
+      siblings_db,
+      isOld0_db,
+      newKey_db,
+      newKey,
+      json,
+    }
+  }
+
+  async getQueryInputs({ id, col_id, json }) {
+    const {
+      update,
+      tree,
+      col: res2,
+      doc: res,
+    } = await this.insert(col_id, id, json)
+    const icol = this.parse(res, tree)
+    const idb = this.parse(res2, this.tree)
+    const newKey = str2id(id)
+    const newKey_db = str2id(col_id)
+    return {
+      fnc: update ? [0, 1] : [1, 0],
+      oldRoot: icol.oldRoot,
+      oldKey: icol.oldKey,
+      oldValue: icol.oldValue,
+      siblings: icol.siblings,
+      isOld0: icol.isOld0,
+      oldRoot_db: idb.oldRoot,
+      oldKey_db: idb.oldKey,
+      oldValue_db: idb.oldValue,
+      siblings_db: idb.siblings,
+      isOld0_db: idb.isOld0,
+      newRoot: idb.newRoot,
+      newKey_db,
+      newKey,
+      json: pad(toSignal(encode(json)), this.size_json),
+    }
+  }
+
+  async getInputs({ id, col_id, json, path, val }) {
+    const col_root = this.tree.F.toObject(this.tree.root).toString()
+    const col_res = await this.getCol(id)
+
+    let col_siblings = col_res.siblings
+    for (let i = 0; i < col_siblings.length; i++)
+      col_siblings[i] = this.tree.F.toObject(col_siblings[i])
+    while (col_siblings.length < this.level) col_siblings.push(0)
+    col_siblings = col_siblings.map(s => s.toString())
+    const col_key = str2id(col_id)
+    const col = this.getColTree(col_id)
+    const col_inputs = await col.getInputs({ id, json, path, val })
+    return {
+      path: col_inputs.path,
+      val: col_inputs.val,
+      json: col_inputs.json,
+      root: col_inputs.root,
+      siblings: col_inputs.siblings,
+      key: str2id(id),
+      col_key,
+      col_siblings,
+      col_root,
+    }
+  }
+
   async addCollection(_key) {
     const id = str2id(_key)
     const col = await this.tree.find(id)
     if (col.found) throw Error("collection exists")
-    const _col = new Collection(this.size)
+    const _col = new Collection({
+      size: this.size,
+      level: this.level,
+      size_json: this.size_json,
+    })
     await _col.init()
     this.cols[_key] = _col
     const root = _col.tree.F.toObject(_col.tree.root).toString()

package/doc.js

@@ -0,0 +1,15 @@
+const { pad, toSignal, encode, encodePath, encodeVal } = require("./encoder")
+
+module.exports = class Doc {
+  constructor({ size = 16, size_json = 100 }) {
+    this.size = size
+    this.size_json = size_json
+  }
+  async getInputs({ json, path, val }) {
+    return {
+      json: pad(toSignal(encode(json)), this.size_json),
+      path: pad(toSignal(encodePath(path)), this.size),
+      val: pad(toSignal(encodeVal(val)), this.size),
+    }
+  }
+}

package/encoder.js

@@ -441,6 +441,9 @@ function str2val(arr) {
   return _arr
 }
 
+const toSignal = val2str
+const fromSignal = str2val
+
 module.exports = {
   encode,
   decode,
@@ -455,4 +458,6 @@ module.exports = {
   val2str,
   str2val,
   id2str,
+  toSignal,
+  fromSignal,
 }

package/index.js

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

package/json.js

@@ -0,0 +1,15 @@
+const { pad, toSignal, encode, encodePath, encodeVal } = require("./encoder")
+
+module.exports = class Json {
+  constructor({ size = 16, size_json = 100 }) {
+    this.size = size
+    this.size_json = size_json
+  }
+  async getInputs({ json, path, val }) {
+    return {
+      json: pad(toSignal(encode(json)), this.size_json),
+      path: pad(toSignal(encodePath(path)), this.size),
+      val: pad(toSignal(encodeVal(val)), this.size),
+    }
+  }
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "zkjson",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Zero Knowledge Provable JSON",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "blake-hash": "^2.0.0",
-    "blake2b": "^2.1.4",
-    "ethers": "^6.10.0",
-    "ffjavascript": "^0.2.63",
+    "blake2b": "^2.1.3",
+    "ethers": "^5.5.1",
+    "ffjavascript": "^0.2.45",
     "ramda": "^0.29.1"
   }
 }