@proto-kit/protocol 0.1.1-develop.263 → 0.1.1-develop.267

package/dist/state/StateServiceProvider.d.ts

@@ -1,10 +1,10 @@
 import { StateService } from "./StateService";
 export declare class StateServiceProvider {
-    private currentStateService?;
-    private readonly defaultStateService?;
-    constructor(currentStateService?: StateService | undefined);
+    private readonly baseStateService?;
+    private readonly stateServiceStack;
+    constructor(baseStateService?: StateService | undefined);
     get stateService(): StateService;
     setCurrentStateService(service: StateService): void;
-    resetToDefault(): void;
+    popCurrentStateService(): void;
 }
 //# sourceMappingURL=StateServiceProvider.d.ts.map

package/dist/state/StateServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StateServiceProvider.d.ts","sourceRoot":"","sources":["../../src/state/StateServiceProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAW9C,qBACa,oBAAoB;IAKL,OAAO,CAAC,mBAAmB,CAAC;IAJtD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CACV;gBAGO,mBAAmB,CAAC,0BAAc;IAGpE,IAAW,YAAY,IAAI,YAAY,CAKtC;IAEM,sBAAsB,CAAC,OAAO,EAAE,YAAY;IAI5C,cAAc;CAGtB"}
+{"version":3,"file":"StateServiceProvider.d.ts","sourceRoot":"","sources":["../../src/state/StateServiceProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAU9C,qBACa,oBAAoB;IAIL,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAH5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;gBAGb,gBAAgB,CAAC,0BAAc;IAO1E,IAAW,YAAY,IAAI,YAAY,CAQtC;IAEM,sBAAsB,CAAC,OAAO,EAAE,YAAY;IAI5C,sBAAsB;CAO9B"}

package/dist/state/StateServiceProvider.js

@@ -11,27 +11,35 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { inject, injectable } from "tsyringe";
+import { log } from "@proto-kit/common";
 const errors = {
-    stateServiceNotSet: () => new Error(`StateService has not been set yet. Be sure to either call your runtime or 
-      protocol function by creating them with an AppChain or by setting the 
-      stateService manually.`),
+    stateServiceNotSet: () => new Error("StateService has not been set yet. Be sure to either call your runtime or protocol function by creating them with an AppChain or by setting the stateService manually."),
 };
 let StateServiceProvider = class StateServiceProvider {
-    constructor(currentStateService) {
-        this.currentStateService = currentStateService;
-        this.defaultStateService = this.currentStateService;
+    constructor(baseStateService) {
+        this.baseStateService = baseStateService;
+        this.stateServiceStack = [];
+        if (baseStateService !== undefined) {
+            this.stateServiceStack.push(baseStateService);
+        }
     }
     get stateService() {
-        if (this.currentStateService === undefined) {
+        if (this.stateServiceStack.length === 0) {
             throw errors.stateServiceNotSet();
         }
-        return this.currentStateService;
+        // Assertion here is ok, because we check that the array is not empty above
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        return this.stateServiceStack.at(-1);
     }
     setCurrentStateService(service) {
-        this.currentStateService = service;
+        this.stateServiceStack.push(service);
     }
-    resetToDefault() {
-        this.currentStateService = this.defaultStateService;
+    popCurrentStateService() {
+        if (this.stateServiceStack.length === 1) {
+            log.trace("Trying to pop last available (root) stateservice");
+            return;
+        }
+        this.stateServiceStack.pop();
     }
 };
 StateServiceProvider = __decorate([

package/dist/state/assert/assert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/state/assert/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAMhC;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,QAWvD"}
+{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/state/assert/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAMhC;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,QAavD"}

package/dist/state/assert/assert.js

@@ -15,7 +15,9 @@ export function assert(condition, message) {
     const previousStatus = executionContext.current().result.status;
     const status = condition.and(previousStatus);
     if (!condition.toBoolean()) {
-        log.debug("Assertion failed: ", message);
+        if (!executionContext.current().isSimulated) {
+            log.debug("Assertion failed: ", message);
+        }
         executionContext.setStatusMessage(message);
     }
     executionContext.setStatus(status);

package/dist/state/context/RuntimeMethodExecutionContext.d.ts

@@ -55,6 +55,7 @@ export declare class RuntimeMethodExecutionContext extends ProvableMethodExecuti
         isFinished: boolean;
         result: RuntimeProvableMethodExecutionResult;
         input: RuntimeMethodExecutionData | undefined;
+        isSimulated: boolean;
     };
 }
 //# sourceMappingURL=RuntimeMethodExecutionContext.d.ts.map

package/dist/state/context/RuntimeMethodExecutionContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeMethodExecutionContext.d.ts","sourceRoot":"","sources":["../../../src/state/context/RuntimeMethodExecutionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAShE,qBAAa,oCAAqC,SAAQ,6BAA6B;IAE9E,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAM;IAE9C,MAAM,EAAE,IAAI,CAAc;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,kBAAkB,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED;;;;GAIG;AACH,qBACa,6BAA8B,SAAQ,8BAA8B;IACxE,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvB,KAAK,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAGrD,OAAO,CAAC,SAAS,CAAyC;IAE1C,MAAM,uCAA8C;IAEpE,OAAO,CAAC,WAAW,CAAkB;IAErC,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACI,kBAAkB,CAAC,KAAK,EAAE,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC;IAKxE;;OAEG;IACI,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM;IAQxC;;OAEG;IACI,SAAS,CAAC,MAAM,EAAE,IAAI;IAQ7B;;OAEG;IACI,KAAK,CAAC,KAAK,EAAE,0BAA0B;IAIvC,YAAY,CAAC,SAAS,EAAE,OAAO;IAItC;;OAEG;IACI,KAAK;IAIL,WAAW;IASlB;;;OAGG;IACI,OAAO;;;;;CAOf"}
+{"version":3,"file":"RuntimeMethodExecutionContext.d.ts","sourceRoot":"","sources":["../../../src/state/context/RuntimeMethodExecutionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAShE,qBAAa,oCAAqC,SAAQ,6BAA6B;IAE9E,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAM;IAE9C,MAAM,EAAE,IAAI,CAAc;IAE1B,aAAa,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,kBAAkB,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED;;;;GAIG;AACH,qBACa,6BAA8B,SAAQ,8BAA8B;IACxE,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvB,KAAK,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAGrD,OAAO,CAAC,SAAS,CAAyC;IAE1C,MAAM,uCAA8C;IAEpE,OAAO,CAAC,WAAW,CAAkB;IAErC,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACI,kBAAkB,CAAC,KAAK,EAAE,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC;IAKxE;;OAEG;IACI,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM;IAQxC;;OAEG;IACI,SAAS,CAAC,MAAM,EAAE,IAAI;IAQ7B;;OAEG;IACI,KAAK,CAAC,KAAK,EAAE,0BAA0B;IAIvC,YAAY,CAAC,SAAS,EAAE,OAAO;IAItC;;OAEG;IACI,KAAK;IAIL,WAAW;IASlB;;;OAGG;IACI,OAAO;;;;;;CAQf"}

package/dist/state/context/RuntimeMethodExecutionContext.js

@@ -96,6 +96,7 @@ let RuntimeMethodExecutionContext = class RuntimeMethodExecutionContext extends
             isFinished: this.isFinished,
             result: this.result,
             input: this.lastInput,
+            isSimulated: this.isSimulated,
         };
     }
 };

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

@@ -1,4 +1,4 @@
-import { AsyncMerkleTreeStore, MerkleTreeStore } from "./MerkleTreeStore";
+import { MerkleTreeStore } from "./MerkleTreeStore";
 export declare class InMemoryMerkleTreeStorage implements MerkleTreeStore {
     protected readonly nodes: {
         [key: number]: {
@@ -8,18 +8,4 @@ export declare class InMemoryMerkleTreeStorage implements MerkleTreeStore {
     getNode(key: bigint, level: number): bigint | undefined;
     setNode(key: bigint, level: number, value: bigint): void;
 }
-export declare class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
-    private readonly parent;
-    private writeCache;
-    constructor(parent: AsyncMerkleTreeStore);
-    setNode(key: bigint, level: number, value: bigint): void;
-    getWrittenNodes(): {
-        [key: number]: {
-            [key: string]: bigint;
-        };
-    };
-    resetWrittenNodes(): void;
-    preloadKey(index: bigint): Promise<void>;
-    mergeIntoParent(): Promise<void>;
-}
 //# sourceMappingURL=InMemoryMerkleTreeStorage.d.ts.map

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":"AAIA,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;IAKX,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB9C"}
+{"version":3,"file":"InMemoryMerkleTreeStorage.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/InMemoryMerkleTreeStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,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"}

package/dist/utils/merkletree/InMemoryMerkleTreeStorage.js

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-magic-numbers */
-import { log } from "@proto-kit/common";
-import { RollupMerkleTree } from "./RollupMerkleTree.js";
 export class InMemoryMerkleTreeStorage {
     constructor() {
         this.nodes = {};
@@ -13,71 +10,3 @@ export class InMemoryMerkleTreeStorage {
         ((_a = this.nodes)[level] ?? (_a[level] = {}))[key.toString()] = value;
     }
 }
-export class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
-    constructor(parent) {
-        super();
-        this.parent = parent;
-        this.writeCache = {};
-    }
-    setNode(key, level, value) {
-        var _a;
-        super.setNode(key, level, value);
-        ((_a = this.writeCache)[level] ?? (_a[level] = {}))[key.toString()] = value;
-    }
-    getWrittenNodes() {
-        return this.writeCache;
-    }
-    resetWrittenNodes() {
-        this.writeCache = {};
-    }
-    // eslint-disable-next-line sonarjs/cognitive-complexity
-    async preloadKey(index) {
-        // Algo from RollupMerkleTree.getWitness()
-        const { leafCount, height } = RollupMerkleTree;
-        if (index >= leafCount) {
-            index %= leafCount;
-        }
-        // eslint-disable-next-line no-warning-comments,max-len
-        // 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;
-            // Only preload node if it is not already preloaded.
-            // We also don't want to overwrite because changes will get lost (tracing)
-            if (this.getNode(key, level) === undefined) {
-                // eslint-disable-next-line no-await-in-loop
-                const value = await this.parent.getNode(key, level);
-                if (level === 0) {
-                    log.debug(`Preloaded ${key} @ ${level} -> ${value ?? "-"}`);
-                }
-                if (value !== undefined) {
-                    this.setNode(key, level, value);
-                }
-            }
-            if (this.getNode(siblingKey, level) === undefined) {
-                // eslint-disable-next-line no-await-in-loop
-                const sibling = await this.parent.getNode(siblingKey, level);
-                if (sibling !== undefined) {
-                    this.setNode(siblingKey, level, sibling);
-                }
-            }
-            index /= 2n;
-        }
-    }
-    async mergeIntoParent() {
-        // In case no state got set we can skip this step
-        if (Object.keys(this.writeCache).length === 0) {
-            return;
-        }
-        this.parent.openTransaction();
-        const { height } = RollupMerkleTree;
-        const nodes = this.getWrittenNodes();
-        const promises = Array.from({ length: height }).flatMap((ignored, level) => Object.entries(nodes[level]).map(async (entry) => {
-            await this.parent.setNode(BigInt(entry[0]), level, entry[1]);
-        }));
-        await Promise.all(promises);
-        this.parent.commit();
-        this.resetWrittenNodes();
-    }
-}

package/dist/utils/merkletree/MerkleTreeStore.d.ts

@@ -1,8 +1,8 @@
 export interface AsyncMerkleTreeStore {
     openTransaction: () => void;
     commit: () => void;
-    setNode: (key: bigint, level: number, value: bigint) => Promise<void>;
-    getNode: (key: bigint, level: number) => Promise<bigint | undefined>;
+    setNodeAsync: (key: bigint, level: number, value: bigint) => Promise<void>;
+    getNodeAsync: (key: bigint, level: number) => Promise<bigint | undefined>;
 }
 export interface MerkleTreeStore {
     setNode: (key: bigint, level: number, value: bigint) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"MerkleTreeStore.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/MerkleTreeStore.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAE5B,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC7D"}
+{"version":3,"file":"MerkleTreeStore.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/MerkleTreeStore.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAE5B,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3E,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC7D"}

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

@@ -54,6 +54,7 @@ declare class RollupMerkleWitness extends RollupMerkleWitness_base {
      * @returns Index of the leaf.
      */
     calculateIndex(): Field;
+    toShortenedEntries(): string[];
 }
 /**
  * A [Merkle Tree](https://en.wikipedia.org/wiki/Merkle_tree) is a binary tree in

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;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,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAKtB;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;AAKnE,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;IAkBvB,kBAAkB;CAO1B;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,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAKtB;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

@@ -12,6 +12,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 /* eslint-disable no-inline-comments */
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 import { Bool, Field, Poseidon, Provable, Struct } from "snarkyjs";
+import { range } from "@proto-kit/common";
 import { notInCircuit } from "../utils";
 // external API
 // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -60,6 +61,11 @@ class RollupMerkleWitness extends Struct({
         }
         return index;
     }
+    toShortenedEntries() {
+        return range(0, 5)
+            .concat(range(251, 255))
+            .map((index) => [this.path[index].toString(), this.isLeft[index].toString()].toString());
+    }
 }
 RollupMerkleWitness.height = 256;
 /**

package/package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.263+f167699",
+  "version": "0.1.1-develop.267+b252853",
   "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": "f167699bddb5831155c4aa9587b4da032c30db0d"
+  "gitHead": "b2528538c73747d000cc3ea99ee26ee415d8248d"
 }

package/src/state/StateServiceProvider.ts

@@ -1,37 +1,46 @@
 import { inject, injectable } from "tsyringe";
 
 import { StateService } from "./StateService";
+import { log } from "@proto-kit/common";
 
 const errors = {
   stateServiceNotSet: () =>
     new Error(
-      `StateService has not been set yet. Be sure to either call your runtime or 
-      protocol function by creating them with an AppChain or by setting the 
-      stateService manually.`
+      "StateService has not been set yet. Be sure to either call your runtime or protocol function by creating them with an AppChain or by setting the stateService manually."
     ),
 };
 
 @injectable()
 export class StateServiceProvider {
-  private readonly defaultStateService?: StateService =
-    this.currentStateService;
+  private readonly stateServiceStack: StateService[] = [];
 
   public constructor(
-    @inject("StateService") private currentStateService?: StateService
-  ) {}
+    @inject("StateService") private readonly baseStateService?: StateService
+  ) {
+    if (baseStateService !== undefined) {
+      this.stateServiceStack.push(baseStateService);
+    }
+  }
 
   public get stateService(): StateService {
-    if (this.currentStateService === undefined) {
+    if (this.stateServiceStack.length === 0) {
       throw errors.stateServiceNotSet();
     }
-    return this.currentStateService;
+
+    // Assertion here is ok, because we check that the array is not empty above
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return this.stateServiceStack.at(-1)!;
   }
 
   public setCurrentStateService(service: StateService) {
-    this.currentStateService = service;
+    this.stateServiceStack.push(service);
   }
 
-  public resetToDefault() {
-    this.currentStateService = this.defaultStateService;
+  public popCurrentStateService() {
+    if (this.stateServiceStack.length === 1) {
+      log.trace("Trying to pop last available (root) stateservice");
+      return;
+    }
+    this.stateServiceStack.pop();
   }
 }

package/src/state/assert/assert.ts

@@ -19,7 +19,9 @@ export function assert(condition: Bool, message?: string) {
   const status = condition.and(previousStatus);
 
   if (!condition.toBoolean()) {
-    log.debug("Assertion failed: ", message);
+    if (!executionContext.current().isSimulated) {
+      log.debug("Assertion failed: ", message);
+    }
     executionContext.setStatusMessage(message);
   }
 

package/src/state/context/RuntimeMethodExecutionContext.ts

@@ -119,6 +119,7 @@ export class RuntimeMethodExecutionContext extends ProvableMethodExecutionContex
       isFinished: this.isFinished,
       result: this.result,
       input: this.lastInput,
+      isSimulated: this.isSimulated,
     };
   }
 }

package/src/utils/merkletree/InMemoryMerkleTreeStorage.ts

@@ -1,8 +1,4 @@
-/* eslint-disable @typescript-eslint/no-magic-numbers */
-import { log } from "@proto-kit/common";
-
-import { RollupMerkleTree } from "./RollupMerkleTree.js";
-import { AsyncMerkleTreeStore, MerkleTreeStore } from "./MerkleTreeStore";
+import { MerkleTreeStore } from "./MerkleTreeStore";
 
 export class InMemoryMerkleTreeStorage implements MerkleTreeStore {
   protected readonly nodes: {
@@ -19,95 +15,3 @@ export class InMemoryMerkleTreeStorage implements MerkleTreeStore {
     (this.nodes[level] ??= {})[key.toString()] = value;
   }
 }
-
-export class CachedMerkleTreeStore extends InMemoryMerkleTreeStorage {
-  private writeCache: {
-    [key: number]: {
-      [key: string]: bigint;
-    };
-  } = {};
-
-  public constructor(private readonly parent: AsyncMerkleTreeStore) {
-    super();
-  }
-
-  public setNode(key: bigint, level: number, value: bigint) {
-    super.setNode(key, level, value);
-    (this.writeCache[level] ??= {})[key.toString()] = value;
-  }
-
-  public getWrittenNodes(): {
-    [key: number]: {
-      [key: string]: bigint;
-    };
-  } {
-    return this.writeCache;
-  }
-
-  public resetWrittenNodes() {
-    this.writeCache = {};
-  }
-
-  // eslint-disable-next-line sonarjs/cognitive-complexity
-  public async preloadKey(index: bigint): Promise<void> {
-    // Algo from RollupMerkleTree.getWitness()
-    const { leafCount, height } = RollupMerkleTree;
-
-    if (index >= leafCount) {
-      index %= leafCount;
-    }
-
-    // eslint-disable-next-line no-warning-comments,max-len
-    // 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;
-
-      // Only preload node if it is not already preloaded.
-      // We also don't want to overwrite because changes will get lost (tracing)
-      if (this.getNode(key, level) === undefined) {
-        // eslint-disable-next-line no-await-in-loop
-        const value = await this.parent.getNode(key, level);
-        if (level === 0) {
-          log.debug(`Preloaded ${key} @ ${level} -> ${value ?? "-"}`);
-        }
-        if (value !== undefined) {
-          this.setNode(key, level, value);
-        }
-      }
-
-      if (this.getNode(siblingKey, level) === undefined) {
-        // eslint-disable-next-line no-await-in-loop
-        const sibling = await this.parent.getNode(siblingKey, level);
-        if (sibling !== undefined) {
-          this.setNode(siblingKey, level, sibling);
-        }
-      }
-      index /= 2n;
-    }
-  }
-
-  public async mergeIntoParent(): Promise<void> {
-    // In case no state got set we can skip this step
-    if (Object.keys(this.writeCache).length === 0) {
-      return;
-    }
-
-    this.parent.openTransaction();
-    const { height } = RollupMerkleTree;
-    const nodes = this.getWrittenNodes();
-
-    const promises = Array.from({ length: height }).flatMap((ignored, level) =>
-      Object.entries(nodes[level]).map(async (entry) => {
-        await this.parent.setNode(BigInt(entry[0]), level, entry[1]);
-      })
-    );
-
-    await Promise.all(promises);
-
-    this.parent.commit();
-    this.resetWrittenNodes();
-  }
-}

package/src/utils/merkletree/MerkleTreeStore.ts

@@ -3,9 +3,9 @@ export interface AsyncMerkleTreeStore {
 
   commit: () => void;
 
-  setNode: (key: bigint, level: number, value: bigint) => Promise<void>;
+  setNodeAsync: (key: bigint, level: number, value: bigint) => Promise<void>;
 
-  getNode: (key: bigint, level: number) => Promise<bigint | undefined>;
+  getNodeAsync: (key: bigint, level: number) => Promise<bigint | undefined>;
 }
 
 export interface MerkleTreeStore {

package/src/utils/merkletree/RollupMerkleTree.ts

@@ -3,6 +3,7 @@
 /* eslint-disable no-inline-comments */
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 import { Bool, Field, Poseidon, Provable, Struct } from "snarkyjs";
+import { range } from "@proto-kit/common";
 
 import { notInCircuit } from "../utils";
 
@@ -69,6 +70,14 @@ class RollupMerkleWitness extends Struct({
 
     return index;
   }
+
+  public toShortenedEntries() {
+    return range(0, 5)
+      .concat(range(251, 255))
+      .map((index) =>
+        [this.path[index].toString(), this.isLeft[index].toString()].toString()
+      );
+  }
 }
 
 /**