@proto-kit/protocol 0.1.1-develop.1087 → 0.1.1-develop.1309

package/dist/prover/block/services/RuntimeVerificationKeyRootService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeVerificationKeyRootService.js","sourceRoot":"","sources":["../../../../src/prover/block/services/RuntimeVerificationKeyRootService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMlD,WAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAGrC,OAAO,CAAC,IAAY;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF,CAAA;AAbY,iCAAiC;IAF7C,UAAU,EAAE;IACZ,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC;GACrB,iCAAiC,CAa7C"}

package/dist/prover/statetransition/StateTransitionProvable.d.ts

@@ -1,7 +1,6 @@
 import { Proof } from "o1js";
-import { WithZkProgrammable } from "@proto-kit/common";
+import { WithZkProgrammable, CompilableModule } from "@proto-kit/common";
 import { StateTransitionProvableBatch } from "../../model/StateTransitionProvableBatch";
-import { StateTransitionWitnessProviderReference } from "./StateTransitionWitnessProviderReference";
 declare const StateTransitionProverPublicInput_base: (new (value: {
     stateTransitionsHash: import("o1js/dist/node/lib/provable/field").Field;
     protocolTransitionsHash: import("o1js/dist/node/lib/provable/field").Field;
@@ -165,8 +164,7 @@ declare const StateTransitionProverPublicOutput_base: (new (value: {
 export declare class StateTransitionProverPublicOutput extends StateTransitionProverPublicOutput_base {
 }
 export type StateTransitionProof = Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>;
-export interface StateTransitionProvable extends WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> {
-    witnessProviderReference: StateTransitionWitnessProviderReference;
+export interface StateTransitionProvable extends WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, CompilableModule {
     runBatch: (publicInput: StateTransitionProverPublicInput, batch: StateTransitionProvableBatch) => Promise<StateTransitionProverPublicOutput>;
     merge: (publicInput: StateTransitionProverPublicInput, proof1: StateTransitionProof, proof2: StateTransitionProof) => Promise<StateTransitionProverPublicOutput>;
 }

package/dist/prover/statetransition/StateTransitionProvable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StateTransitionProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAU,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AAExF,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEpG,qBAAa,gCAAiC,SAAQ,qCAKpD;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,iCAAkC,SAAQ,sCAKrD;CAAG;AAEL,MAAM,MAAM,oBAAoB,GAAG,KAAK,CACtC,gCAAgC,EAChC,iCAAiC,CAClC,CAAC;AAEF,MAAM,WAAW,uBACf,SAAQ,kBAAkB,CACxB,gCAAgC,EAChC,iCAAiC,CAClC;IACD,wBAAwB,EAAE,uCAAuC,CAAC;IAElE,QAAQ,EAAE,CACR,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,iCAAiC,CAAC,CAAC;IAEhD,KAAK,EAAE,CACL,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,KACzB,OAAO,CAAC,iCAAiC,CAAC,CAAC;CACjD"}
+{"version":3,"file":"StateTransitionProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAU,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExF,qBAAa,gCAAiC,SAAQ,qCAKpD;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,iCAAkC,SAAQ,sCAKrD;CAAG;AAEL,MAAM,MAAM,oBAAoB,GAAG,KAAK,CACtC,gCAAgC,EAChC,iCAAiC,CAClC,CAAC;AAEF,MAAM,WAAW,uBACf,SAAQ,kBAAkB,CACtB,gCAAgC,EAChC,iCAAiC,CAClC,EACD,gBAAgB;IAClB,QAAQ,EAAE,CACR,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,iCAAiC,CAAC,CAAC;IAEhD,KAAK,EAAE,CACL,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,KACzB,OAAO,CAAC,iCAAiC,CAAC,CAAC;CACjD"}

package/dist/prover/statetransition/StateTransitionProvable.js

@@ -13,3 +13,4 @@ export class StateTransitionProverPublicOutput extends Struct({
     protocolStateRoot: Field,
 }) {
 }
+//# sourceMappingURL=StateTransitionProvable.js.map

package/dist/prover/statetransition/StateTransitionProvable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StateTransitionProvable.js","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,EAAE,MAAM,MAAM,CAAC;AAK5C,MAAM,OAAO,gCAAiC,SAAQ,MAAM,CAAC;IAC3D,oBAAoB,EAAE,KAAK;IAC3B,uBAAuB,EAAE,KAAK;IAC9B,SAAS,EAAE,KAAK;IAChB,iBAAiB,EAAE,KAAK;CACzB,CAAC;CAAG;AAEL,MAAM,OAAO,iCAAkC,SAAQ,MAAM,CAAC;IAC5D,oBAAoB,EAAE,KAAK;IAC3B,uBAAuB,EAAE,KAAK;IAC9B,SAAS,EAAE,KAAK;IAChB,iBAAiB,EAAE,KAAK;CACzB,CAAC;CAAG"}

package/dist/prover/statetransition/StateTransitionProver.d.ts

@@ -1,4 +1,4 @@
-import { AreProofsEnabled, PlainZkProgram, ZkProgrammable } from "@proto-kit/common";
+import { AreProofsEnabled, PlainZkProgram, RollupMerkleTreeWitness, ZkProgrammable, CompilableModule, type ArtifactRecord, type CompileRegistry } from "@proto-kit/common";
 import { Field } from "o1js";
 import { ProvableStateTransition } from "../../model/StateTransition";
 import { ProvableStateTransitionType, StateTransitionProvableBatch } from "../../model/StateTransitionProvableBatch";
@@ -6,7 +6,6 @@ import { StateTransitionProverType } from "../../protocol/Protocol";
 import { ProtocolModule } from "../../protocol/ProtocolModule";
 import { ProvableHashList } from "../../utils/ProvableHashList";
 import { StateTransitionProof, StateTransitionProvable, StateTransitionProverPublicInput, StateTransitionProverPublicOutput } from "./StateTransitionProvable";
-import { StateTransitionWitnessProviderReference } from "./StateTransitionWitnessProviderReference";
 interface StateTransitionProverExecutionState {
     stateRoot: Field;
     protocolStateRoot: Field;
@@ -19,11 +18,9 @@ interface StateTransitionProverExecutionState {
  */
 export declare class StateTransitionProverProgrammable extends ZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> {
     private readonly stateTransitionProver;
-    readonly witnessProviderReference: StateTransitionWitnessProviderReference;
-    constructor(stateTransitionProver: StateTransitionProver, witnessProviderReference: StateTransitionWitnessProviderReference);
-    get appChain(): AreProofsEnabled | undefined;
+    constructor(stateTransitionProver: StateTransitionProver);
+    get areProofsEnabled(): AreProofsEnabled | undefined;
     zkProgramFactory(): PlainZkProgram<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>[];
-    private get witnessProvider();
     /**
      * Applies the state transitions to the current stateRoot
      * and returns the new prover state
@@ -33,17 +30,17 @@ export declare class StateTransitionProverProgrammable extends ZkProgrammable<St
      * Applies a single state transition to the given state
      * and mutates it in place
      */
-    applyTransition(state: StateTransitionProverExecutionState, transition: ProvableStateTransition, type: ProvableStateTransitionType, index?: number): void;
+    applyTransition(state: StateTransitionProverExecutionState, transition: ProvableStateTransition, type: ProvableStateTransitionType, merkleWitness: RollupMerkleTreeWitness, index?: number): void;
     /**
      * Applies a whole batch of StateTransitions at once
      */
     runBatch(publicInput: StateTransitionProverPublicInput, batch: StateTransitionProvableBatch): Promise<StateTransitionProverPublicOutput>;
     merge(publicInput: StateTransitionProverPublicInput, proof1: StateTransitionProof, proof2: StateTransitionProof): Promise<StateTransitionProverPublicOutput>;
 }
-export declare class StateTransitionProver extends ProtocolModule implements StateTransitionProvable, StateTransitionProverType {
-    readonly witnessProviderReference: StateTransitionWitnessProviderReference;
+export declare class StateTransitionProver extends ProtocolModule implements StateTransitionProvable, StateTransitionProverType, CompilableModule {
     zkProgrammable: StateTransitionProverProgrammable;
-    constructor(witnessProviderReference: StateTransitionWitnessProviderReference);
+    constructor();
+    compile(registry: CompileRegistry): Promise<void | ArtifactRecord>;
     runBatch(publicInput: StateTransitionProverPublicInput, batch: StateTransitionProvableBatch): Promise<StateTransitionProverPublicOutput>;
     merge(publicInput: StateTransitionProverPublicInput, proof1: StateTransitionProof, proof2: StateTransitionProof): Promise<StateTransitionProverPublicOutput>;
 }

package/dist/prover/statetransition/StateTransitionProver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StateTransitionProver.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,EAGd,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAEL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;AAepG,UAAU,mCAAmC;IAC3C,SAAS,EAAE,KAAK,CAAC;IACjB,iBAAiB,EAAE,KAAK,CAAC;IACzB,mBAAmB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IAC/D,sBAAsB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;CACnE;AAOD;;;GAGG;AACH,qBAAa,iCAAkC,SAAQ,cAAc,CACnE,gCAAgC,EAChC,iCAAiC,CAClC;IAEG,OAAO,CAAC,QAAQ,CAAC,qBAAqB;aACtB,wBAAwB,EAAE,uCAAuC;gBADhE,qBAAqB,EAAE,qBAAqB,EAC7C,wBAAwB,EAAE,uCAAuC;IAKnF,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAEM,gBAAgB,IAAI,cAAc,CACvC,gCAAgC,EAChC,iCAAiC,CAClC,EAAE;IAuDH,OAAO,KAAK,eAAe,GAM1B;IAED;;;OAGG;IACI,gBAAgB,CACrB,SAAS,EAAE,KAAK,EAChB,iBAAiB,EAAE,KAAK,EACxB,6BAA6B,EAAE,KAAK,EACpC,gCAAgC,EAAE,KAAK,EACvC,eAAe,EAAE,4BAA4B,GAC5C,mCAAmC;IA6BtC;;;OAGG;IACI,eAAe,CACpB,KAAK,EAAE,mCAAmC,EAC1C,UAAU,EAAE,uBAAuB,EACnC,IAAI,EAAE,2BAA2B,EACjC,KAAK,SAAI;IAiDX;;OAEG;IAEU,QAAQ,CACnB,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iCAAiC,CAAC;IAkBhC,KAAK,CAChB,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAqE9C;AAED,qBACa,qBACX,SAAQ,cACR,YAAW,uBAAuB,EAAE,yBAAyB;aAM3C,wBAAwB,EAAE,uCAAuC;IAJ5E,cAAc,EAAE,iCAAiC,CAAC;gBAIvC,wBAAwB,EAAE,uCAAuC;IAS5E,QAAQ,CACb,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iCAAiC,CAAC;IAItC,KAAK,CACV,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAG9C"}
+{"version":3,"file":"StateTransitionProver.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,uBAAuB,EACvB,cAAc,EACd,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAEL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AA0BnC,UAAU,mCAAmC;IAC3C,SAAS,EAAE,KAAK,CAAC;IACjB,iBAAiB,EAAE,KAAK,CAAC;IACzB,mBAAmB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IAC/D,sBAAsB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;CACnE;AAOD;;;GAGG;AACH,qBAAa,iCAAkC,SAAQ,cAAc,CACnE,gCAAgC,EAChC,iCAAiC,CAClC;IAEG,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,qBAAqB;IAK/D,IAAW,gBAAgB,IAAI,gBAAgB,GAAG,SAAS,CAE1D;IAEM,gBAAgB,IAAI,cAAc,CACvC,gCAAgC,EAChC,iCAAiC,CAClC,EAAE;IAwDH;;;OAGG;IACI,gBAAgB,CACrB,SAAS,EAAE,KAAK,EAChB,iBAAiB,EAAE,KAAK,EACxB,6BAA6B,EAAE,KAAK,EACpC,gCAAgC,EAAE,KAAK,EACvC,eAAe,EAAE,4BAA4B,GAC5C,mCAAmC;IAoCtC;;;OAGG;IACI,eAAe,CACpB,KAAK,EAAE,mCAAmC,EAC1C,UAAU,EAAE,uBAAuB,EACnC,IAAI,EAAE,2BAA2B,EACjC,aAAa,EAAE,uBAAuB,EACtC,KAAK,SAAI;IAwCX;;OAEG;IAEU,QAAQ,CACnB,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iCAAiC,CAAC;IAkBhC,KAAK,CAChB,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAqE9C;AAED,qBACa,qBACX,SAAQ,cACR,YACE,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB;IAEX,cAAc,EAAE,iCAAiC,CAAC;;IAO5C,OAAO,CAClB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;IAI1B,QAAQ,CACb,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iCAAiC,CAAC;IAItC,KAAK,CACV,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAG9C"}

package/dist/prover/statetransition/StateTransitionProver.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { provableMethod, RollupMerkleTreeWitness, ZkProgrammable, } from "@proto-kit/common";
+import { provableMethod, ZkProgrammable, } from "@proto-kit/common";
 import { Field, Provable, SelfProof, ZkProgram } from "o1js";
 import { injectable } from "tsyringe";
 import { constants } from "../../Constants";
@@ -16,10 +16,15 @@ import { StateTransitionProvableBatch, } from "../../model/StateTransitionProvab
 import { ProtocolModule } from "../../protocol/ProtocolModule";
 import { DefaultProvableHashList, } from "../../utils/ProvableHashList";
 import { StateTransitionProverPublicInput, StateTransitionProverPublicOutput, } from "./StateTransitionProvable";
-import { StateTransitionWitnessProviderReference } from "./StateTransitionWitnessProviderReference";
 const errors = {
     propertyNotMatching: (property, step) => `${property} not matching ${step}`,
-    merkleWitnessNotCorrect: (index, type) => `MerkleWitness not valid for StateTransition (${index}, type ${type})`,
+    merkleWitnessNotCorrect: (index, type) => {
+        let s = `MerkleWitness not valid for StateTransition (${index}, type unknown)`;
+        Provable.asProver(() => {
+            s = s.replace("unknown", type.isNormal().toBoolean() ? "normal" : "protocol");
+        });
+        return s;
+    },
     noWitnessProviderSet: () => new Error("WitnessProvider not set, set it before you use StateTransitionProvider"),
 };
 const StateTransitionSelfProofClass = (SelfProof);
@@ -28,13 +33,12 @@ const StateTransitionSelfProofClass = (SelfProof);
  * transitions and checks and updates their merkle-tree entries
  */
 export class StateTransitionProverProgrammable extends ZkProgrammable {
-    constructor(stateTransitionProver, witnessProviderReference) {
+    constructor(stateTransitionProver) {
         super();
         this.stateTransitionProver = stateTransitionProver;
-        this.witnessProviderReference = witnessProviderReference;
     }
-    get appChain() {
-        return this.stateTransitionProver.appChain;
+    get areProofsEnabled() {
+        return this.stateTransitionProver.areProofsEnabled;
     }
     zkProgramFactory() {
         const instance = this;
@@ -43,7 +47,7 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
             publicInput: StateTransitionProverPublicInput,
             publicOutput: StateTransitionProverPublicOutput,
             methods: {
-                proveBatch: {
+                runBatch: {
                     privateInputs: [StateTransitionProvableBatch],
                     async method(publicInput, batch) {
                         return await instance.runBatch(publicInput, batch);
@@ -61,12 +65,13 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
             },
         });
         const methods = {
-            proveBatch: program.proveBatch.bind(program),
+            runBatch: program.runBatch.bind(program),
             merge: program.merge.bind(program),
         };
         const SelfProofClass = ZkProgram.Proof(program);
         return [
             {
+                name: program.name,
                 compile: program.compile.bind(program),
                 verify: program.verify.bind(program),
                 analyzeMethods: program.analyzeMethods.bind(program),
@@ -75,13 +80,6 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
             },
         ];
     }
-    get witnessProvider() {
-        const provider = this.witnessProviderReference.getWitnessProvider();
-        if (provider === undefined) {
-            throw errors.noWitnessProviderSet();
-        }
-        return provider;
-    }
     /**
      * Applies the state transitions to the current stateRoot
      * and returns the new prover state
@@ -95,8 +93,9 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
         };
         const transitions = transitionBatch.batch;
         const types = transitionBatch.transitionTypes;
+        const merkleWitness = transitionBatch.merkleWitnesses;
         for (let index = 0; index < constants.stateTransitionProverBatchSize; index++) {
-            this.applyTransition(state, transitions[index], types[index], index);
+            this.applyTransition(state, transitions[index], types[index], merkleWitness[index], index);
         }
         return state;
     }
@@ -104,13 +103,12 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
      * Applies a single state transition to the given state
      * and mutates it in place
      */
-    applyTransition(state, transition, type, index = 0) {
-        const witness = Provable.witness(RollupMerkleTreeWitness, () => this.witnessProvider.getWitness(transition.path));
-        const membershipValid = witness.checkMembership(state.stateRoot, transition.path, transition.from.value);
+    applyTransition(state, transition, type, merkleWitness, index = 0) {
+        const membershipValid = merkleWitness.checkMembership(state.stateRoot, transition.path, transition.from.value);
         membershipValid
             .or(transition.from.isSome.not())
-            .assertTrue(errors.merkleWitnessNotCorrect(index, type.isNormal().toBoolean() ? "normal" : "protocol"));
-        const newRoot = witness.calculateRoot(transition.to.value);
+            .assertTrue(errors.merkleWitnessNotCorrect(index, type));
+        const newRoot = merkleWitness.calculateRoot(transition.to.value);
         state.stateRoot = Provable.if(transition.to.isSome, newRoot, state.stateRoot);
         // Only update protocol state root if ST is also of type protocol
         // Since protocol STs are all at the start of the batch, this works
@@ -168,12 +166,12 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], StateTransitionProverProgrammable.prototype, "merge", null);
 export let StateTransitionProver = class StateTransitionProver extends ProtocolModule {
-    constructor(
-    // Injected
-    witnessProviderReference) {
+    constructor() {
         super();
-        this.witnessProviderReference = witnessProviderReference;
-        this.zkProgrammable = new StateTransitionProverProgrammable(this, witnessProviderReference);
+        this.zkProgrammable = new StateTransitionProverProgrammable(this);
+    }
+    async compile(registry) {
+        return await this.zkProgrammable.compile(registry);
     }
     runBatch(publicInput, batch) {
         return this.zkProgrammable.runBatch(publicInput, batch);
@@ -184,5 +182,6 @@ export let StateTransitionProver = class StateTransitionProver extends ProtocolM
 };
 StateTransitionProver = __decorate([
     injectable(),
-    __metadata("design:paramtypes", [StateTransitionWitnessProviderReference])
+    __metadata("design:paramtypes", [])
 ], StateTransitionProver);
+//# sourceMappingURL=StateTransitionProver.js.map

package/dist/prover/statetransition/StateTransitionProver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StateTransitionProver.js","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"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"}

package/dist/settlement/ContractModule.d.ts

@@ -1,4 +1,4 @@
-import { ConfigurableModule, NoConfig, TypedClass } from "@proto-kit/common";
+import { ArtifactRecord, type CompilableModule, CompileRegistry, ConfigurableModule, NoConfig, TypedClass } from "@proto-kit/common";
 import { SmartContract } from "o1js";
 export type SmartContractClassFromInterface<Type> = typeof SmartContract & TypedClass<Type>;
 /**
@@ -9,7 +9,8 @@ export type SmartContractClassFromInterface<Type> = typeof SmartContract & Typed
  * of SmartContract and implements a certain interface as specified by the
  * ContractType generic.
  */
-export declare abstract class ContractModule<ContractType, Arguments = undefined, Config = NoConfig> extends ConfigurableModule<Config> {
-    abstract contractFactory(args: Arguments): SmartContractClassFromInterface<ContractType>;
+export declare abstract class ContractModule<ContractType, Config = NoConfig> extends ConfigurableModule<Config> implements CompilableModule {
+    abstract contractFactory(): SmartContractClassFromInterface<ContractType>;
+    abstract compile(registry: CompileRegistry): Promise<ArtifactRecord | undefined>;
 }
 //# sourceMappingURL=ContractModule.d.ts.map

package/dist/settlement/ContractModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContractModule.d.ts","sourceRoot":"","sources":["../../src/settlement/ContractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAErC,MAAM,MAAM,+BAA+B,CAAC,IAAI,IAAI,OAAO,aAAa,GACtE,UAAU,CAAC,IAAI,CAAC,CAAC;AAEnB;;;;;;;GAOG;AACH,8BAAsB,cAAc,CAClC,YAAY,EAEZ,SAAS,GAAG,SAAS,EACrB,MAAM,GAAG,QAAQ,CACjB,SAAQ,kBAAkB,CAAC,MAAM,CAAC;aAClB,eAAe,CAC7B,IAAI,EAAE,SAAS,GACd,+BAA+B,CAAC,YAAY,CAAC;CACjD"}
+{"version":3,"file":"ContractModule.d.ts","sourceRoot":"","sources":["../../src/settlement/ContractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,gBAAgB,EACrB,eAAe,EACf,kBAAkB,EAClB,QAAQ,EACR,UAAU,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAErC,MAAM,MAAM,+BAA+B,CAAC,IAAI,IAAI,OAAO,aAAa,GACtE,UAAU,CAAC,IAAI,CAAC,CAAC;AAEnB;;;;;;;GAOG;AACH,8BAAsB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAClE,SAAQ,kBAAkB,CAAC,MAAM,CACjC,YAAW,gBAAgB;aAEX,eAAe,IAAI,+BAA+B,CAAC,YAAY,CAAC;aAEhE,OAAO,CACrB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CACvC"}

package/dist/settlement/ContractModule.js

@@ -1,4 +1,4 @@
-import { ConfigurableModule } from "@proto-kit/common";
+import { ConfigurableModule, } from "@proto-kit/common";
 /**
  * This module type is used to define a contract module that can be used to
  * construct and inject smart contract instances.
@@ -9,3 +9,4 @@ import { ConfigurableModule } from "@proto-kit/common";
  */
 export class ContractModule extends ConfigurableModule {
 }
+//# sourceMappingURL=ContractModule.js.map

package/dist/settlement/ContractModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContractModule.js","sourceRoot":"","sources":["../../src/settlement/ContractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,GAGnB,MAAM,mBAAmB,CAAC;AAM3B;;;;;;;GAOG;AACH,MAAM,OAAgB,cACpB,SAAQ,kBAA0B;CAQnC"}

package/dist/settlement/SettlementContractModule.d.ts

@@ -1,34 +1,46 @@
 import { AreProofsEnabled, ChildContainerProvider, ModuleContainer, ModulesRecord, TypedClass } from "@proto-kit/common";
-import { PublicKey, SmartContract } from "o1js";
+import { Field, PublicKey, SmartContract } from "o1js";
 import { ProtocolEnvironment } from "../protocol/ProtocolEnvironment";
 import { ProtocolModule } from "../protocol/ProtocolModule";
-import { ContractModule, SmartContractClassFromInterface } from "./ContractModule";
+import { ContractModule } from "./ContractModule";
 import { DispatchContractProtocolModule } from "./contracts/DispatchContractProtocolModule";
 import { DispatchContractType } from "./contracts/DispatchSmartContract";
 import { SettlementContractConfig, SettlementContractProtocolModule } from "./contracts/SettlementContractProtocolModule";
 import { SettlementContractType } from "./contracts/SettlementSmartContract";
-export type SettlementModulesRecord = ModulesRecord<TypedClass<ContractModule<unknown, unknown, unknown>>>;
+import { BridgeContractType } from "./contracts/BridgeContract";
+import { BridgeContractConfig, BridgeContractProtocolModule } from "./contracts/BridgeContractProtocolModule";
+import { GetContracts } from "./modularity/types";
+export type SettlementModulesRecord = ModulesRecord<TypedClass<ContractModule<unknown, unknown>>>;
 export type MandatorySettlementModulesRecord = {
-    SettlementContract: TypedClass<ContractModule<SettlementContractType, SmartContractClassFromInterface<DispatchContractType>, SettlementContractConfig>>;
-    DispatchContract: TypedClass<ContractModule<DispatchContractType, unknown, unknown>>;
+    SettlementContract: TypedClass<ContractModule<SettlementContractType, SettlementContractConfig>>;
+    DispatchContract: TypedClass<ContractModule<DispatchContractType, unknown>>;
+    BridgeContract: TypedClass<ContractModule<BridgeContractType, BridgeContractConfig>>;
 };
 export declare class SettlementContractModule<SettlementModules extends SettlementModulesRecord & MandatorySettlementModulesRecord> extends ModuleContainer<SettlementModules> implements ProtocolModule<unknown> {
     constructor(definition: {
         modules: SettlementModules;
     });
     static from<SettlementModules extends SettlementModulesRecord & MandatorySettlementModulesRecord>(modules: SettlementModules): TypedClass<SettlementContractModule<SettlementModules>>;
+    static mandatoryModules(): {
+        readonly SettlementContract: typeof SettlementContractProtocolModule;
+        readonly DispatchContract: typeof DispatchContractProtocolModule;
+        readonly BridgeContract: typeof BridgeContractProtocolModule;
+    };
     static fromDefaults(): TypedClass<SettlementContractModule<{
-        SettlementContract: typeof SettlementContractProtocolModule;
-        DispatchContract: typeof DispatchContractProtocolModule;
+        readonly SettlementContract: typeof SettlementContractProtocolModule;
+        readonly DispatchContract: typeof DispatchContractProtocolModule;
+        readonly BridgeContract: typeof BridgeContractProtocolModule;
     }>>;
+    static with<AdditionalModules extends SettlementModulesRecord>(additionalModules: AdditionalModules): TypedClass<SettlementContractModule<{
+        readonly SettlementContract: typeof SettlementContractProtocolModule;
+        readonly DispatchContract: typeof DispatchContractProtocolModule;
+        readonly BridgeContract: typeof BridgeContractProtocolModule;
+    } & AdditionalModules>>;
     protocol?: ProtocolEnvironment;
-    get appChain(): AreProofsEnabled | undefined;
+    get areProofsEnabled(): AreProofsEnabled | undefined;
     create(childContainerProvider: ChildContainerProvider): void;
     start(): Promise<void>;
-    getContractClasses(): {
-        settlement: SmartContractClassFromInterface<SettlementContractType>;
-        dispatch: SmartContractClassFromInterface<DispatchContractType>;
-    };
+    getContractClasses(): GetContracts<SettlementModules>;
     createContracts(addresses: {
         settlement: PublicKey;
         dispatch: PublicKey;
@@ -36,5 +48,6 @@ export declare class SettlementContractModule<SettlementModules extends Settleme
         settlement: SettlementContractType & SmartContract;
         dispatch: DispatchContractType & SmartContract;
     };
+    createBridgeContract(address: PublicKey, tokenId?: Field): BridgeContractType & SmartContract;
 }
 //# sourceMappingURL=SettlementContractModule.d.ts.map

package/dist/settlement/SettlementContractModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SettlementContractModule.d.ts","sourceRoot":"","sources":["../../src/settlement/SettlementContractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,aAAa,EACb,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAGhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EACL,cAAc,EACd,+BAA+B,EAChC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EACL,wBAAwB,EACxB,gCAAgC,EACjC,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,MAAM,MAAM,uBAAuB,GAAG,aAAa,CACjD,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CACtD,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,kBAAkB,EAAE,UAAU,CAC5B,cAAc,CACZ,sBAAsB,EACtB,+BAA+B,CAAC,oBAAoB,CAAC,EACrD,wBAAwB,CACzB,CACF,CAAC;IACF,gBAAgB,EAAE,UAAU,CAC1B,cAAc,CAAC,oBAAoB,EAAE,OAAO,EAAE,OAAO,CAAC,CACvD,CAAC;CACH,CAAC;AAEF,qBACa,wBAAwB,CACjC,iBAAiB,SAAS,uBAAuB,GAC/C,gCAAgC,CAEpC,SAAQ,eAAe,CAAC,iBAAiB,CACzC,YAAW,cAAc,CAAC,OAAO,CAAC;gBAEf,UAAU,EAAE;QAAE,OAAO,EAAE,iBAAiB,CAAA;KAAE;WAI/C,IAAI,CAChB,iBAAiB,SAAS,uBAAuB,GAC/C,gCAAgC,EAElC,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;WAQ5C,YAAY;;;;IAQnB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAEtC,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAGM,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;IAI/C,KAAK;IAIX,kBAAkB,IAAI;QAC3B,UAAU,EAAE,+BAA+B,CAAC,sBAAsB,CAAC,CAAC;QACpE,QAAQ,EAAE,+BAA+B,CAAC,oBAAoB,CAAC,CAAC;KACjE;IAkBM,eAAe,CAAC,SAAS,EAAE;QAChC,UAAU,EAAE,SAAS,CAAC;QACtB,QAAQ,EAAE,SAAS,CAAC;KACrB,GAAG;QACF,UAAU,EAAE,sBAAsB,GAAG,aAAa,CAAC;QACnD,QAAQ,EAAE,oBAAoB,GAAG,aAAa,CAAC;KAChD;CAaF"}
+{"version":3,"file":"SettlementContractModule.d.ts","sourceRoot":"","sources":["../../src/settlement/SettlementContractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,aAAa,EACb,UAAU,EAGX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EACL,wBAAwB,EACxB,gCAAgC,EACjC,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,MAAM,uBAAuB,GAAG,aAAa,CACjD,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAC7C,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,kBAAkB,EAAE,UAAU,CAC5B,cAAc,CAAC,sBAAsB,EAAE,wBAAwB,CAAC,CACjE,CAAC;IACF,gBAAgB,EAAE,UAAU,CAAC,cAAc,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,cAAc,EAAE,UAAU,CACxB,cAAc,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CACzD,CAAC;CACH,CAAC;AAEF,qBACa,wBAAwB,CACjC,iBAAiB,SAAS,uBAAuB,GAC/C,gCAAgC,CAEpC,SAAQ,eAAe,CAAC,iBAAiB,CACzC,YAAW,cAAc,CAAC,OAAO,CAAC;gBAEf,UAAU,EAAE;QAAE,OAAO,EAAE,iBAAiB,CAAA;KAAE;WAI/C,IAAI,CAChB,iBAAiB,SAAS,uBAAuB,GAC/C,gCAAgC,EAElC,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;WAQ5C,gBAAgB;;;;;WAQhB,YAAY;;;;;WAMZ,IAAI,CAAC,iBAAiB,SAAS,uBAAuB,EAClE,iBAAiB,EAAE,iBAAiB;;;;;IAS/B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAEtC,IAAW,gBAAgB,IAAI,gBAAgB,GAAG,SAAS,CAE1D;IAGM,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;IAI/C,KAAK;IAIX,kBAAkB,IAAI,YAAY,CAAC,iBAAiB,CAAC;IAUrD,eAAe,CAAC,SAAS,EAAE;QAChC,UAAU,EAAE,SAAS,CAAC;QACtB,QAAQ,EAAE,SAAS,CAAC;KACrB,GAAG;QACF,UAAU,EAAE,sBAAsB,GAAG,aAAa,CAAC;QACnD,QAAQ,EAAE,oBAAoB,GAAG,aAAa,CAAC;KAChD;IAYM,oBAAoB,CACzB,OAAO,EAAE,SAAS,EAClB,OAAO,CAAC,EAAE,KAAK,GACd,kBAAkB,GAAG,aAAa;CAKtC"}

package/dist/settlement/SettlementContractModule.js

@@ -12,6 +12,7 @@ import { ModuleContainer, noop, } from "@proto-kit/common";
 import { injectable } from "tsyringe";
 import { DispatchContractProtocolModule } from "./contracts/DispatchContractProtocolModule";
 import { SettlementContractProtocolModule, } from "./contracts/SettlementContractProtocolModule";
+import { BridgeContractProtocolModule, } from "./contracts/BridgeContractProtocolModule";
 export let SettlementContractModule = SettlementContractModule_1 = class SettlementContractModule extends ModuleContainer {
     constructor(definition) {
         super(definition);
@@ -23,13 +24,23 @@ export let SettlementContractModule = SettlementContractModule_1 = class Settlem
             }
         };
     }
-    static fromDefaults() {
-        return SettlementContractModule_1.from({
+    static mandatoryModules() {
+        return {
             SettlementContract: SettlementContractProtocolModule,
             DispatchContract: DispatchContractProtocolModule,
+            BridgeContract: BridgeContractProtocolModule,
+        };
+    }
+    static fromDefaults() {
+        return SettlementContractModule_1.from(SettlementContractModule_1.mandatoryModules());
+    }
+    static with(additionalModules) {
+        return SettlementContractModule_1.from({
+            ...SettlementContractModule_1.mandatoryModules(),
+            ...additionalModules,
         });
     }
-    get appChain() {
+    get areProofsEnabled() {
         return this.protocol?.getAreProofsEnabled();
     }
     // **
@@ -40,32 +51,30 @@ export let SettlementContractModule = SettlementContractModule_1 = class Settlem
         noop();
     }
     getContractClasses() {
-        const settlementContractKey = "SettlementContract";
-        const dispatchContractKey = "DispatchContract";
-        this.assertIsValidModuleName(settlementContractKey);
-        this.assertIsValidModuleName(dispatchContractKey);
-        const settlementModule = this.resolve(settlementContractKey);
-        const dispatchModule = this.resolve(dispatchContractKey);
-        const dispatch = dispatchModule.contractFactory(undefined);
-        const settlement = settlementModule.contractFactory(dispatch);
-        return {
-            settlement,
-            dispatch,
-        };
+        const contracts = 
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        this.moduleNames.map((name) => {
+            const module = this.resolve(name);
+            return [name, module.contractFactory()];
+        });
+        return Object.fromEntries(contracts);
     }
     createContracts(addresses) {
-        const { dispatch, settlement } = this.getContractClasses();
-        // eslint-disable-next-line new-cap
-        const dispatchInstance = new dispatch(addresses.dispatch);
-        // eslint-disable-next-line new-cap
-        const settlementInstance = new settlement(addresses.settlement);
+        const { DispatchContract, SettlementContract } = this.getContractClasses();
+        const dispatchInstance = new DispatchContract(addresses.dispatch);
+        const settlementInstance = new SettlementContract(addresses.settlement);
         return {
             dispatch: dispatchInstance,
             settlement: settlementInstance,
         };
     }
+    createBridgeContract(address, tokenId) {
+        const { BridgeContract } = this.getContractClasses();
+        return new BridgeContract(address, tokenId);
+    }
 };
 SettlementContractModule = SettlementContractModule_1 = __decorate([
     injectable(),
     __metadata("design:paramtypes", [Object])
 ], SettlementContractModule);
+//# sourceMappingURL=SettlementContractModule.js.map

package/dist/settlement/SettlementContractModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SettlementContractModule.js","sourceRoot":"","sources":["../../src/settlement/SettlementContractModule.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAGL,eAAe,EAGf,IAAI,GAEL,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAMtC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAE5F,OAAO,EAEL,gCAAgC,GACjC,MAAM,8CAA8C,CAAC;AAGtD,OAAO,EAEL,4BAA4B,GAC7B,MAAM,0CAA0C,CAAC;AAkB3C,WAAM,wBAAwB,gCAA9B,MAAM,wBAIX,SAAQ,eAAkC;IAG1C,YAAmB,UAA0C;QAC3D,KAAK,CAAC,UAAU,CAAC,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,IAAI,CAIhB,OAA0B;QAE1B,OAAO,MAAM,8BAA+B,SAAQ,0BAA2C;YAC7F;gBACE,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YACrB,CAAC;SACF,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB;QAC5B,OAAO;YACL,kBAAkB,EAAE,gCAAgC;YACpD,gBAAgB,EAAE,8BAA8B;YAChD,cAAc,EAAE,4BAA4B;SACpC,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,YAAY;QACxB,OAAO,0BAAwB,CAAC,IAAI,CAClC,0BAAwB,CAAC,gBAAgB,EAAE,CAC5C,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,IAAI,CAChB,iBAAoC;QAEpC,OAAO,0BAAwB,CAAC,IAAI,CAAC;YACnC,GAAG,0BAAwB,CAAC,gBAAgB,EAAE;YAC9C,GAAG,iBAAiB;SACZ,CAAC,CAAC;IACd,CAAC;IAKD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAC9C,CAAC;IACD,KAAK;IAEE,MAAM,CAAC,sBAA8C;QAC1D,KAAK,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,EAAE,CAAC;IACT,CAAC;IAEM,kBAAkB;QACvB,MAAM,SAAS;QACb,yEAAyE;QACxE,IAAI,CAAC,WAAgD,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACL,OAAO,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAEM,eAAe,CAAC,SAGtB;QAIC,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE3E,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAExE,OAAO;YACL,QAAQ,EAAE,gBAAgB;YAC1B,UAAU,EAAE,kBAAkB;SAC/B,CAAC;IACJ,CAAC;IAEM,oBAAoB,CACzB,OAAkB,EAClB,OAAe;QAEf,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAErD,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AAnGY,wBAAwB;IADpC,UAAU,EAAE;;GACA,wBAAwB,CAmGpC"}

package/dist/settlement/contracts/BridgeContract.d.ts

@@ -0,0 +1,97 @@
+import { AccountUpdate, Field, Permissions, PublicKey, SmartContract, State, TokenContractV2, VerificationKey } from "o1js";
+import { TypedClass } from "@proto-kit/common";
+import { OutgoingMessageArgumentBatch } from "../messages/OutgoingMessageArgument";
+import type { SettlementContractType } from "./SettlementSmartContract";
+export type BridgeContractType = {
+    stateRoot: State<Field>;
+    outgoingMessageCursor: State<Field>;
+    rollupOutgoingMessages: (batch: OutgoingMessageArgumentBatch) => Promise<Field>;
+    redeem: (additionUpdate: AccountUpdate) => Promise<void>;
+    deployProvable: (args: VerificationKey | undefined, signedSettlement: boolean, permissions: Permissions, settlementContractAddress: PublicKey) => Promise<AccountUpdate>;
+    updateStateRoot: (root: Field) => Promise<void>;
+};
+declare const OutgoingMessageKey_base: (new (value: {
+    index: import("o1js/dist/node/lib/provable/field").Field;
+    tokenId: import("o1js/dist/node/lib/provable/field").Field;
+}) => {
+    index: import("o1js/dist/node/lib/provable/field").Field;
+    tokenId: import("o1js/dist/node/lib/provable/field").Field;
+}) & {
+    _isStruct: true;
+} & Omit<import("o1js/dist/node/lib/provable/types/provable-intf").Provable<{
+    index: import("o1js/dist/node/lib/provable/field").Field;
+    tokenId: import("o1js/dist/node/lib/provable/field").Field;
+}, {
+    index: bigint;
+    tokenId: bigint;
+}>, "fromFields"> & {
+    fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    };
+} & {
+    fromValue: (value: {
+        index: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
+    }) => {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    };
+    toInput: (x: {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    }) => {
+        fields?: import("o1js/dist/node/lib/provable/field").Field[] | undefined;
+        packed?: [import("o1js/dist/node/lib/provable/field").Field, number][] | undefined;
+    };
+    toJSON: (x: {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    }) => {
+        index: string;
+        tokenId: string;
+    };
+    fromJSON: (x: {
+        index: string;
+        tokenId: string;
+    }) => {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    };
+    empty: () => {
+        index: import("o1js/dist/node/lib/provable/field").Field;
+        tokenId: import("o1js/dist/node/lib/provable/field").Field;
+    };
+};
+export declare class OutgoingMessageKey extends OutgoingMessageKey_base {
+}
+export declare abstract class BridgeContractBase extends TokenContractV2 {
+    static args: {
+        SettlementContract: (TypedClass<SettlementContractType> & typeof SmartContract) | undefined;
+        withdrawalStatePath: [string, string];
+    };
+    abstract settlementContractAddress: State<PublicKey>;
+    abstract stateRoot: State<Field>;
+    abstract outgoingMessageCursor: State<Field>;
+    /**
+     * Function to deploy the bridging contract in a provable way, so that it can be
+     * a provable process initiated by the settlement contract with a baked-in vk
+     *
+     * @returns Creates and returns an account update deploying the bridge contract
+     */
+    deployProvable(verificationKey: VerificationKey | undefined, signedSettlement: boolean, permissions: Permissions, settlementContractAddress: PublicKey): Promise<AccountUpdate>;
+    approveBase(): Promise<void>;
+    updateStateRootBase(root: Field): Promise<void>;
+    rollupOutgoingMessagesBase(batch: OutgoingMessageArgumentBatch): Promise<Field>;
+    protected redeemBase(additionUpdate: AccountUpdate): Promise<void>;
+}
+export declare class BridgeContract extends BridgeContractBase implements BridgeContractType {
+    settlementContractAddress: State<PublicKey>;
+    stateRoot: State<import("o1js/dist/node/lib/provable/field").Field>;
+    outgoingMessageCursor: State<import("o1js/dist/node/lib/provable/field").Field>;
+    updateStateRoot(root: Field): Promise<void>;
+    rollupOutgoingMessages(batch: OutgoingMessageArgumentBatch): Promise<Field>;
+    redeem(additionUpdate: AccountUpdate): Promise<void>;
+}
+export {};
+//# sourceMappingURL=BridgeContract.d.ts.map

package/dist/settlement/contracts/BridgeContract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BridgeContract.d.ts","sourceRoot":"","sources":["../../../src/settlement/contracts/BridgeContract.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,KAAK,EAEL,WAAW,EAGX,SAAS,EACT,aAAa,EACb,KAAK,EAGL,eAAe,EAEf,eAAe,EAChB,MAAM,MAAM,CAAC;AACd,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAEL,4BAA4B,EAC7B,MAAM,qCAAqC,CAAC;AAI7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,qBAAqB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAEpC,sBAAsB,EAAE,CACtB,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,EAAE,CAAC,cAAc,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,cAAc,EAAE,CACd,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,WAAW,EACxB,yBAAyB,EAAE,SAAS,KACjC,OAAO,CAAC,aAAa,CAAC,CAAC;IAE5B,eAAe,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGF,qBAAa,kBAAmB,SAAQ,uBAGtC;CAAG;AAEL,8BAAsB,kBAAmB,SAAQ,eAAe;IAC9D,OAAc,IAAI,EAAE;QAClB,kBAAkB,EACd,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,OAAO,aAAa,CAAC,GAC3D,SAAS,CAAC;QACd,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACvC,CAAC;IAEF,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAErD,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAEjC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAE7C;;;;;OAKG;IACU,cAAc,CACzB,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,WAAW,EACxB,yBAAyB,EAAE,SAAS;IAgCzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,mBAAmB,CAAC,IAAI,EAAE,KAAK;IAkB/B,0BAA0B,CACrC,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,KAAK,CAAC;cAiDD,UAAU,CAAC,cAAc,EAAE,aAAa;CA0BzD;AAED,qBAAa,cACX,SAAQ,kBACR,YAAW,kBAAkB;IAEJ,yBAAyB,mBAAsB;IAEnD,SAAS,2DAAkB;IAE3B,qBAAqB,2DAAkB;IAG/C,eAAe,CAAC,IAAI,EAAE,KAAK;IAK3B,sBAAsB,CACjC,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,KAAK,CAAC;IAKJ,MAAM,CAAC,cAAc,EAAE,aAAa;CAGlD"}