@proto-kit/protocol 0.1.1-develop.254 → 0.1.1-develop.260

package/dist/utils/merkletree/RollupMerkleTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RollupMerkleTree.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/RollupMerkleTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,KAAK,EAA8B,MAAM,UAAU,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,CAAC;AAIjD,OAAO,EAAE,SAAS,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB;;;GAGG;AACH,cAAM,mBAAoB,SAAQ,wBAGhC;IACA,OAAc,MAAM,SAAO;IAEpB,MAAM,IAAI,MAAM;IAIvB;;;;OAIG;IACI,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAaxC;;;OAGG;IACI,cAAc,IAAI,KAAK;CAiB/B;AAED;;;;;;;;;;;;;GAaG;AACH,cAAM,gBAAgB;IACpB,OAAc,MAAM,SAAO;IAE3B,WAAkB,SAAS,IAAI,MAAM,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC,SAAgB,KAAK,EAAE,eAAe,CAAC;gBAEpB,KAAK,EAAE,eAAe;IAYzC;;;;;OAKG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK;IAInD;;;OAGG;IAEI,OAAO,IAAI,KAAK;IAMvB,OAAO,CAAC,OAAO;IAIf;;;OAGG;IAEH;;;;OAIG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK;IAgBzC;;;;;;OAMG;IAEI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB;IAqBrD;;;OAGG;IAEI,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE;IAM3B;;;OAGG;IACH,IAAW,SAAS,IAAI,MAAM,CAE7B;CACF;AAGD,yBAAiB,eAAe,CAAC;IAC/B,SAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,CAS9C;IAED,SAAgB,eAAe,CAC7B,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,IAAI,CAKN;IAED,SAAgB,WAAW,CACzB,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,KAAK,GACX,KAAK,CAEP;CACF;AAED;;;GAGG;AACH,iBAAS,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAK9D"}
+{"version":3,"file":"RollupMerkleTree.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/RollupMerkleTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,KAAK,EAA8B,MAAM,UAAU,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,CAAC;AAIjD,OAAO,EAAE,SAAS,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB;;;GAGG;AACH,cAAM,mBAAoB,SAAQ,wBAGhC;IACA,OAAc,MAAM,SAAO;IAEpB,MAAM,IAAI,MAAM;IAIvB;;;;OAIG;IACI,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAaxC;;;OAGG;IACI,cAAc,IAAI,KAAK;CAiB/B;AAED;;;;;;;;;;;;;GAaG;AACH,cAAM,gBAAgB;IACpB,OAAc,MAAM,SAAO;IAE3B,WAAkB,SAAS,IAAI,MAAM,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC,SAAgB,KAAK,EAAE,eAAe,CAAC;gBAEpB,KAAK,EAAE,eAAe;IAYzC;;;;;OAKG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK;IAInD;;;OAGG;IAEI,OAAO,IAAI,KAAK;IAMvB,OAAO,CAAC,OAAO;IAIf;;;OAGG;IAEH;;;;OAIG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK;IAgBzC;;;;;;OAMG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB;IAqBrD;;;OAGG;IAEI,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE;IAM3B;;;OAGG;IACH,IAAW,SAAS,IAAI,MAAM,CAE7B;CACF;AAGD,yBAAiB,eAAe,CAAC;IAC/B,SAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,CAS9C;IAED,SAAgB,eAAe,CAC7B,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,IAAI,CAKN;IAED,SAAgB,WAAW,CACzB,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,KAAK,GACX,KAAK,CAEP;CACF;AAED;;;GAGG;AACH,iBAAS,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAK9D"}

package/dist/utils/merkletree/RollupMerkleTree.js

@@ -141,7 +141,7 @@ class RollupMerkleTree {
      */
     getWitness(index) {
         if (index >= this.leafCount) {
-            index %= this.leafCount;
+            throw new Error("Index too large for merkle height");
         }
         const path = [];
         const isLefts = [];
@@ -195,12 +195,6 @@ __decorate([
     __metadata("design:paramtypes", [BigInt, Field]),
     __metadata("design:returntype", void 0)
 ], RollupMerkleTree.prototype, "setLeaf", null);
-__decorate([
-    notInCircuit(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [BigInt]),
-    __metadata("design:returntype", RollupMerkleWitness)
-], RollupMerkleTree.prototype, "getWitness", null);
 __decorate([
     notInCircuit(),
     __metadata("design:type", Function),

package/package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.254+2fba72e",
+  "version": "0.1.1-develop.260+4c60192",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
@@ -31,5 +31,5 @@
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194"
   },
-  "gitHead": "2fba72ec580c20289658d5c831430ca601ea5a71"
+  "gitHead": "4c60192291eba37f98698b538ae893afaef7e835"
 }

package/src/utils/merkletree/RollupMerkleTree.ts

@@ -168,10 +168,9 @@ class RollupMerkleTree {
    * @param index Position of the leaf node.
    * @returns The witness that belongs to the leaf.
    */
-  @notInCircuit()
   public getWitness(index: bigint): RollupMerkleWitness {
     if (index >= this.leafCount) {
-      index %= this.leafCount;
+      throw new Error("Index too large for merkle height");
     }
     const path = [];
     const isLefts = [];

package/test/utils/MerkleTree.test.ts

@@ -0,0 +1,82 @@
+import { MockAsyncMerkleTreeStore } from "@proto-kit/module/test/state/MockAsyncMerkleStore";
+import { Field, Provable } from "snarkyjs";
+
+import { CachedMerkleTreeStore, RollupMerkleTree } from "../../src";
+import { log } from "@proto-kit/common";
+
+describe("merkle tree caching", () => {
+  it("should cache, merge and cache again correctly", async () => {
+    expect.assertions(1);
+    log.setLevel(log.levels.DEBUG);
+
+    const asyncService = new MockAsyncMerkleTreeStore();
+    const cachedStore1 = new CachedMerkleTreeStore(asyncService);
+    const tree = new RollupMerkleTree(cachedStore1);
+
+    tree.setLeaf(
+      BigInt(
+        "8315128407888076827747583618264069725166559532323886730251648126140875106375"
+      ),
+      Field(
+        "7555220006856562833147743033256142154591945963958408607501861037584894828141"
+      )
+    );
+    tree.setLeaf(
+      BigInt(
+        "1135724539086759849828193257478967224998007355448882542027535720593543464209"
+      ),
+      Field(
+        "1259702704738371196984972831885384469288156549426257425022876410209069764640"
+      )
+    );
+
+    await cachedStore1.mergeIntoParent();
+
+    const cachedStore2 = new CachedMerkleTreeStore(asyncService);
+
+    await cachedStore2.preloadKey(
+      BigInt(
+        "135413826711051814106331721573646171856233955198202976565146349582599235605"
+      )
+    );
+    await cachedStore2.preloadKey(
+      BigInt(
+        "187096936125835301165703149714221977896269014196675103496127974415786508468"
+      )
+    );
+
+    const tree2 = new RollupMerkleTree(cachedStore2);
+
+    tree2.setLeaf(
+      BigInt(
+        "135413826711051814106331721573646171856233955198202976565146349582599235605"
+      ),
+      Field(
+        "7555220006856562833147743033256142154591945963958408607501861037584894828141"
+      )
+    );
+    tree2.setLeaf(
+      BigInt(
+        "187096936125835301165703149714221977896269014196675103496127974415786508468"
+      ),
+      Field(
+        "12719911732789803963178147640045939094940211306984772742957499065837303164652"
+      )
+    );
+
+    const witness = tree2.getWitness(
+      BigInt(
+        "135413826711051814106331721573646171856233955198202976565146349582599235605"
+      )
+    );
+    expect(
+      witness
+        .calculateRoot(
+          Field(
+            "7555220006856562833147743033256142154591945963958408607501861037584894828141"
+          )
+        )
+        .toString()
+    ).toEqual(tree2.getRoot().toString());
+  });
+});