@proto-kit/protocol 0.1.1-develop.160 → 0.1.1-develop.162

package/dist/prover/block/BlockProver.js

@@ -82,10 +82,10 @@ let BlockProver = class BlockProver extends ProtocolModule {
             stateRoot: publicInput.stateRoot,
             networkStateHash: publicInput.networkStateHash,
         };
-        this.applyTransaction(state, stateProof, appProof, executionData);
+        const stateTo = this.applyTransaction(state, stateProof, appProof, executionData);
         return new BlockProverPublicOutput({
-            stateRoot: state.stateRoot,
-            transactionsHash: state.transactionsHash,
+            stateRoot: stateTo.stateRoot,
+            transactionsHash: stateTo.transactionsHash,
         });
     }
     merge(publicInput, proof1, proof2) {

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

@@ -1 +1 @@
-{"version":3,"file":"InMemoryMerkleTreeStorage.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/InMemoryMerkleTreeStorage.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE1E,qBAAa,yBAA0B,YAAW,eAAe;IAC/D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH,CAAM;IAEA,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAGhE;AAED,qBAAa,qBAAsB,SAAQ,yBAAyB;IAO/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAN1C,OAAO,CAAC,UAAU,CAIX;gBAE6B,MAAM,EAAE,oBAAoB;IAIzD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKjD,eAAe,IAAI;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH;IAIM,iBAAiB;IAIX,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB9C"}
+{"version":3,"file":"InMemoryMerkleTreeStorage.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/InMemoryMerkleTreeStorage.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE1E,qBAAa,yBAA0B,YAAW,eAAe;IAC/D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH,CAAM;IAEA,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAGhE;AAED,qBAAa,qBAAsB,SAAQ,yBAAyB;IAO/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAN1C,OAAO,CAAC,UAAU,CAIX;gBAE6B,MAAM,EAAE,oBAAoB;IAIzD,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKjD,eAAe,IAAI;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH;IAIM,iBAAiB;IAIX,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB9C"}

package/dist/utils/merkletree/InMemoryMerkleTreeStorage.js

@@ -32,7 +32,6 @@ export class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
         this.writeCache = {};
     }
     async preloadKey(index) {
-        var _a;
         log.debug(`Preloading MT ${index}`);
         // Algo from RollupMerkleTree.getWitness()
         const { leafCount, height } = RollupMerkleTree;
@@ -43,13 +42,19 @@ export class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
         // TODO Not practical at the moment. Improve pattern when implementing DB storage
         for (let level = 0; level < height; level++) {
             const key = index;
+            const isLeft = index % 2n === 0n;
+            const siblingKey = isLeft ? index + 1n : index - 1n;
             // eslint-disable-next-line no-await-in-loop
             const value = await this.parent.getNode(key, level);
+            const sibling = await this.parent.getNode(siblingKey, level);
             if (level === 0) {
-                log.debug(`Preloaded ${key} -> ${value ?? "-"}`);
+                log.debug(`Preloaded ${key} @ ${level} -> ${value ?? "-"}`);
             }
             if (value !== undefined) {
-                ((_a = this.nodes)[level] ?? (_a[level] = {}))[key.toString()] = value;
+                this.setNode(key, level, value);
+            }
+            if (sibling !== undefined) {
+                this.setNode(siblingKey, level, sibling);
             }
             index /= 2n;
         }

package/package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.160+5120680",
+  "version": "0.1.1-develop.162+1fd6645",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
@@ -17,7 +17,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@proto-kit/common": "0.1.1-develop.160+5120680",
+    "@proto-kit/common": "0.1.1-develop.162+1fd6645",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
     "reflect-metadata": "^0.1.13",
@@ -31,5 +31,5 @@
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194"
   },
-  "gitHead": "51206808f0eba77c4ad8c1af476a6dbdd478d2a3"
+  "gitHead": "1fd6645b60e2b4c2db2ac35b53c1c5d0b66c5b91"
 }

package/src/prover/block/BlockProver.ts

@@ -182,11 +182,11 @@ export class BlockProver
       networkStateHash: publicInput.networkStateHash,
     };
 
-    this.applyTransaction(state, stateProof, appProof, executionData);
+    const stateTo = this.applyTransaction(state, stateProof, appProof, executionData);
 
     return new BlockProverPublicOutput({
-      stateRoot: state.stateRoot,
-      transactionsHash: state.transactionsHash,
+      stateRoot: stateTo.stateRoot,
+      transactionsHash: stateTo.transactionsHash,
     });
   }
 

package/src/utils/merkletree/InMemoryMerkleTreeStorage.ts

@@ -63,13 +63,20 @@ export class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
     for (let level = 0; level < height; level++) {
       const key = index;
 
+      const isLeft = index % 2n === 0n;
+      const siblingKey = isLeft ? index + 1n : index - 1n;
+
       // eslint-disable-next-line no-await-in-loop
       const value = await this.parent.getNode(key, level);
+      const sibling = await this.parent.getNode(siblingKey, level);
       if (level === 0) {
-        log.debug(`Preloaded ${key} -> ${value ?? "-"}`);
+        log.debug(`Preloaded ${key} @ ${level} -> ${value ?? "-"}`);
       }
       if (value !== undefined) {
-        (this.nodes[level] ??= {})[key.toString()] = value;
+        this.setNode(key, level, value);
+      }
+      if(sibling !== undefined) {
+        this.setNode(siblingKey, level, sibling);
       }
       index /= 2n;
     }

package/test/StateTransition.test.ts

@@ -6,7 +6,7 @@ import {
   Option,
   ProvableStateTransition,
   DefaultProvableHashList,
-  StateTransitionProvableBatch, CachedMerkleTreeStore
+  StateTransitionProvableBatch, CachedMerkleTreeStore, InMemoryMerkleTreeStorage
 } from "../src/index";
 import {
   RollupMerkleTree,
@@ -108,7 +108,7 @@ describe("stateTransition", () => {
   ])("should pass without throwing", async (transitions) => {
     expect.assertions(2);
 
-    const tree = new RollupMerkleTree(new MemoryMerkleTreeStorage());
+    const tree = new RollupMerkleTree(new InMemoryMerkleTreeStorage());
 
     // Is ignored because overwritten by first transition
     tree.setLeaf(1n, Option.fromValue(Field(1), Field).treeValue);
@@ -168,7 +168,7 @@ describe("stateTransition", () => {
     async (transitions, index) => {
       expect.assertions(1);
 
-      const tree = new RollupMerkleTree(new MemoryMerkleTreeStorage());
+      const tree = new RollupMerkleTree(new InMemoryMerkleTreeStorage());
 
       // Is ignored because overwritten by first transition
       tree.setLeaf(1n, Option.fromValue(Field(1), Field).treeValue);