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

package/dist/protocol/TransitioningProtocolModule.js

@@ -6,3 +6,4 @@ import { ProtocolModule } from "./ProtocolModule";
  */
 export class TransitioningProtocolModule extends ProtocolModule {
 }
+//# sourceMappingURL=TransitioningProtocolModule.js.map

package/dist/protocol/TransitioningProtocolModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TransitioningProtocolModule.js","sourceRoot":"","sources":["../../src/protocol/TransitioningProtocolModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;;GAIG;AACH,MAAM,OAAgB,2BAEpB,SAAQ,cAAsB;CAE/B"}

package/dist/prover/block/BlockProvable.d.ts

@@ -1,5 +1,5 @@
-import { Bool, DynamicProof, Field, Proof, Signature, Void } from "o1js";
-import { WithZkProgrammable } from "@proto-kit/common";
+import { Bool, DynamicProof, Proof, Signature, Void } from "o1js";
+import { WithZkProgrammable, CompilableModule } from "@proto-kit/common";
 import { StateTransitionProof } from "../statetransition/StateTransitionProvable";
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
 import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
@@ -13,6 +13,7 @@ declare const BlockProverPublicInput_base: (new (value: {
     blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
     eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
     incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+    blockNumber: import("o1js/dist/node/lib/provable/field").Field;
 }) => {
     transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
     stateRoot: import("o1js/dist/node/lib/provable/field").Field;
@@ -20,6 +21,7 @@ declare const BlockProverPublicInput_base: (new (value: {
     blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
     eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
     incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+    blockNumber: import("o1js/dist/node/lib/provable/field").Field;
 }) & {
     _isStruct: true;
 } & Omit<import("o1js/dist/node/lib/provable/types/provable-intf").Provable<{
@@ -29,6 +31,7 @@ declare const BlockProverPublicInput_base: (new (value: {
     blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
     eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
     incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+    blockNumber: import("o1js/dist/node/lib/provable/field").Field;
 }, {
     transactionsHash: bigint;
     stateRoot: bigint;
@@ -36,6 +39,7 @@ declare const BlockProverPublicInput_base: (new (value: {
     blockHashRoot: bigint;
     eternalTransactionsHash: bigint;
     incomingMessagesHash: bigint;
+    blockNumber: bigint;
 }>, "fromFields"> & {
     fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => {
         transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
@@ -44,6 +48,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: import("o1js/dist/node/lib/provable/field").Field;
     };
 } & {
     fromValue: (value: {
@@ -53,6 +58,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
     }) => {
         transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         stateRoot: import("o1js/dist/node/lib/provable/field").Field;
@@ -60,6 +66,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: import("o1js/dist/node/lib/provable/field").Field;
     };
     toInput: (x: {
         transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
@@ -68,6 +75,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: 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;
@@ -79,6 +87,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: import("o1js/dist/node/lib/provable/field").Field;
     }) => {
         transactionsHash: string;
         stateRoot: string;
@@ -86,6 +95,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: string;
         eternalTransactionsHash: string;
         incomingMessagesHash: string;
+        blockNumber: string;
     };
     fromJSON: (x: {
         transactionsHash: string;
@@ -94,6 +104,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: string;
         eternalTransactionsHash: string;
         incomingMessagesHash: string;
+        blockNumber: string;
     }) => {
         transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         stateRoot: import("o1js/dist/node/lib/provable/field").Field;
@@ -101,6 +112,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: import("o1js/dist/node/lib/provable/field").Field;
     };
     empty: () => {
         transactionsHash: import("o1js/dist/node/lib/provable/field").Field;
@@ -109,6 +121,7 @@ declare const BlockProverPublicInput_base: (new (value: {
         blockHashRoot: import("o1js/dist/node/lib/provable/field").Field;
         eternalTransactionsHash: import("o1js/dist/node/lib/provable/field").Field;
         incomingMessagesHash: import("o1js/dist/node/lib/provable/field").Field;
+        blockNumber: import("o1js/dist/node/lib/provable/field").Field;
     };
 };
 export declare class BlockProverPublicInput extends BlockProverPublicInput_base {
@@ -245,7 +258,7 @@ declare const BlockProverPublicOutput_base: (new (value: {
     };
 };
 export declare class BlockProverPublicOutput extends BlockProverPublicOutput_base {
-    equals(input: BlockProverPublicInput, closed: Bool, blockNumber: Field): Bool;
+    equals(input: BlockProverPublicInput, closed: Bool): Bool;
 }
 export type BlockProverProof = Proof<BlockProverPublicInput, BlockProverPublicOutput>;
 declare const BlockProverExecutionData_base: (new (value: {
@@ -385,10 +398,11 @@ export declare class BlockProverExecutionData extends BlockProverExecutionData_b
 export declare class DynamicRuntimeProof extends DynamicProof<Void, MethodPublicOutput> {
     static publicInputType: import("o1js/dist/node/lib/provable/types/struct").ProvablePureExtended<void, void, null>;
     static publicOutputType: typeof MethodPublicOutput;
+    static maxProofsVerified: 0;
 }
-export interface BlockProvable extends WithZkProgrammable<BlockProverPublicInput, BlockProverPublicOutput> {
+export interface BlockProvable extends WithZkProgrammable<BlockProverPublicInput, BlockProverPublicOutput>, CompilableModule {
     proveTransaction: (publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, appProof: DynamicRuntimeProof, executionData: BlockProverExecutionData, verificationKeyAttestation: RuntimeVerificationKeyAttestation) => Promise<BlockProverPublicOutput>;
-    proveBlock: (publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof) => Promise<BlockProverPublicOutput>;
+    proveBlock: (publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, transactionProof: BlockProverProof) => Promise<BlockProverPublicOutput>;
     merge: (publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof) => Promise<BlockProverPublicOutput>;
 }
 export {};

package/dist/prover/block/BlockProvable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,EACL,KAAK,EACL,SAAS,EAET,IAAI,EACL,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/F,qBAAa,sBAAuB,SAAQ,2BAO1C;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,uBAAwB,SAAQ,4BAS3C;IACO,MAAM,CACX,KAAK,EAAE,sBAAsB,EAC7B,MAAM,EAAE,IAAI,EACZ,WAAW,EAAE,KAAK,GACjB,IAAI;CAWR;AAED,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAClC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,qBAAa,wBAAyB,SAAQ,6BAI5C;CAAG;AAEL,qBAAa,mBAAoB,SAAQ,YAAY,CACnD,IAAI,EACJ,kBAAkB,CACnB;IACC,MAAM,CAAC,eAAe,4FAAQ;IAE9B,MAAM,CAAC,gBAAgB,4BAAsB;CAC9C;AAED,MAAM,WAAW,aACf,SAAQ,kBAAkB,CAAC,sBAAsB,EAAE,uBAAuB,CAAC;IAC3E,gBAAgB,EAAE,CAChB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,wBAAwB,EACvC,0BAA0B,EAAE,iCAAiC,KAC1D,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEtC,UAAU,EAAE,CACV,WAAW,EAAE,sBAAsB,EACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EACxC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,KAC/B,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEtC,KAAK,EAAE,CACL,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,KACrB,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACvC"}
+{"version":3,"file":"BlockProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,YAAY,EAEZ,KAAK,EACL,SAAS,EAET,IAAI,EACL,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/F,qBAAa,sBAAuB,SAAQ,2BAQ1C;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,uBAAwB,SAAQ,4BAS3C;IACO,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,IAAI,GAAG,IAAI;CAUjE;AAED,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAClC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,qBAAa,wBAAyB,SAAQ,6BAI5C;CAAG;AAEL,qBAAa,mBAAoB,SAAQ,YAAY,CACnD,IAAI,EACJ,kBAAkB,CACnB;IACC,MAAM,CAAC,eAAe,4FAAQ;IAE9B,MAAM,CAAC,gBAAgB,4BAAsB;IAG7C,MAAM,CAAC,iBAAiB,IAAc;CACvC;AAED,MAAM,WAAW,aACf,SAAQ,kBAAkB,CAAC,sBAAsB,EAAE,uBAAuB,CAAC,EACzE,gBAAgB;IAClB,gBAAgB,EAAE,CAChB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,wBAAwB,EACvC,0BAA0B,EAAE,iCAAiC,KAC1D,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEtC,UAAU,EAAE,CACV,WAAW,EAAE,sBAAsB,EACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EAExC,gBAAgB,EAAE,gBAAgB,KAC/B,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEtC,KAAK,EAAE,CACL,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,KACrB,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACvC"}

package/dist/prover/block/BlockProvable.js

@@ -9,6 +9,7 @@ export class BlockProverPublicInput extends Struct({
     blockHashRoot: Field,
     eternalTransactionsHash: Field,
     incomingMessagesHash: Field,
+    blockNumber: Field,
 }) {
 }
 export class BlockProverPublicOutput extends Struct({
@@ -21,11 +22,10 @@ export class BlockProverPublicOutput extends Struct({
     closed: Bool,
     blockNumber: Field,
 }) {
-    equals(input, closed, blockNumber) {
+    equals(input, closed) {
         const output2 = BlockProverPublicOutput.toFields({
             ...input,
             closed,
-            blockNumber,
         });
         const output1 = BlockProverPublicOutput.toFields(this);
         return output1
@@ -43,3 +43,6 @@ export class DynamicRuntimeProof extends DynamicProof {
 }
 DynamicRuntimeProof.publicInputType = Void;
 DynamicRuntimeProof.publicOutputType = MethodPublicOutput;
+// TODO this won't be 0 for proofs-as-args
+DynamicRuntimeProof.maxProofsVerified = 0;
+//# sourceMappingURL=BlockProvable.js.map

package/dist/prover/block/BlockProvable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockProvable.js","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,EAEL,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAKhE,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC;IACjD,gBAAgB,EAAE,KAAK;IACvB,SAAS,EAAE,KAAK;IAChB,gBAAgB,EAAE,KAAK;IACvB,aAAa,EAAE,KAAK;IACpB,uBAAuB,EAAE,KAAK;IAC9B,oBAAoB,EAAE,KAAK;IAC3B,WAAW,EAAE,KAAK;CACnB,CAAC;CAAG;AAEL,MAAM,OAAO,uBAAwB,SAAQ,MAAM,CAAC;IAClD,gBAAgB,EAAE,KAAK;IACvB,SAAS,EAAE,KAAK;IAChB,gBAAgB,EAAE,KAAK;IACvB,aAAa,EAAE,KAAK;IACpB,uBAAuB,EAAE,KAAK;IAC9B,oBAAoB,EAAE,KAAK;IAC3B,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC;IACO,MAAM,CAAC,KAA6B,EAAE,MAAY;QACvD,MAAM,OAAO,GAAG,uBAAuB,CAAC,QAAQ,CAAC;YAC/C,GAAG,KAAK;YACR,MAAM;SACP,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvD,OAAO,OAAO;aACX,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;CACF;AAOD,MAAM,OAAO,wBAAyB,SAAQ,MAAM,CAAC;IACnD,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,YAAY;CAC3B,CAAC;CAAG;AAEL,MAAM,OAAO,mBAAoB,SAAQ,YAGxC;;AACQ,mCAAe,GAAG,IAAI,CAAC;AAEvB,oCAAgB,GAAG,kBAAkB,CAAC;AAE7C,0CAA0C;AACnC,qCAAiB,GAAG,CAAU,CAAC"}

package/dist/prover/block/BlockProver.d.ts

@@ -1,8 +1,8 @@
 import { DynamicProof, Field, Proof, VerificationKey } from "o1js";
-import { AreProofsEnabled, PlainZkProgram, WithZkProgrammable, ZkProgrammable } from "@proto-kit/common";
+import { AreProofsEnabled, CompilableModule, CompileArtifact, CompileRegistry, PlainZkProgram, WithZkProgrammable, ZkProgrammable } from "@proto-kit/common";
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
 import { ProtocolModule } from "../../protocol/ProtocolModule";
-import { StateTransitionProof, StateTransitionProverPublicInput, StateTransitionProverPublicOutput } from "../statetransition/StateTransitionProvable";
+import { StateTransitionProof, StateTransitionProvable, StateTransitionProverPublicInput, StateTransitionProverPublicOutput } from "../statetransition/StateTransitionProvable";
 import { ProvableTransactionHook } from "../../protocol/ProvableTransactionHook";
 import { ProvableBlockHook } from "../../protocol/ProvableBlockHook";
 import { NetworkState } from "../../model/network/NetworkState";
@@ -48,7 +48,8 @@ export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverP
     private readonly blockHooks;
     private readonly verificationKeyService;
     constructor(prover: BlockProver, stateTransitionProver: ZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtime: ZkProgrammable<undefined, MethodPublicOutput>, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[], verificationKeyService: MinimalVKTreeService);
-    get appChain(): AreProofsEnabled | undefined;
+    name: string;
+    get areProofsEnabled(): AreProofsEnabled | undefined;
     /**
      * Applies and checks the two proofs and applies the corresponding state
      * changes to the given state
@@ -66,7 +67,7 @@ export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverP
     private addTransactionToBundle;
     proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, runtimeProof: DynamicRuntimeProof, executionData: BlockProverExecutionData, verificationKeyWitness: RuntimeVerificationKeyAttestation): Promise<BlockProverPublicOutput>;
     private assertSTProofInput;
-    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
     merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): Promise<BlockProverPublicOutput>;
     /**
      * Creates the BlockProver ZkProgram.
@@ -80,13 +81,14 @@ export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverP
  * a StateTransitionProof into a single BlockProof, that can
  * then be merged to be committed to the base-layer contract
  */
-export declare class BlockProver extends ProtocolModule implements BlockProvable {
-    readonly stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>;
-    readonly runtime: WithZkProgrammable<undefined, MethodPublicOutput>;
+export declare class BlockProver extends ProtocolModule implements BlockProvable, CompilableModule {
+    readonly stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> & StateTransitionProvable;
+    readonly runtime: WithZkProgrammable<undefined, MethodPublicOutput> & CompilableModule;
     zkProgrammable: BlockProverProgrammable;
-    constructor(stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtime: WithZkProgrammable<undefined, MethodPublicOutput>, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[], verificationKeyService: RuntimeVerificationKeyRootService);
+    constructor(stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> & StateTransitionProvable, runtime: WithZkProgrammable<undefined, MethodPublicOutput> & CompilableModule, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[], verificationKeyService: RuntimeVerificationKeyRootService);
+    compile(registry: CompileRegistry): Promise<Record<string, CompileArtifact> | undefined>;
     proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, appProof: DynamicRuntimeProof, executionData: BlockProverExecutionData, verificationKeyAttestation: RuntimeVerificationKeyAttestation): Promise<BlockProverPublicOutput>;
-    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
     merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): Promise<BlockProverPublicOutput>;
 }
 //# sourceMappingURL=BlockProver.d.ts.map

package/dist/prover/block/BlockProver.d.ts.map

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

package/dist/prover/block/BlockProver.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Bool, Field, Poseidon, Provable, SelfProof, ZkProgram, } from "o1js";
 import { container, inject, injectable, injectAll } from "tsyringe";
-import { provableMethod, ZkProgrammable, } from "@proto-kit/common";
+import { MAX_FIELD, provableMethod, ZkProgrammable, } from "@proto-kit/common";
 import { DefaultProvableHashList } from "../../utils/ProvableHashList";
 import { ProtocolModule } from "../../protocol/ProtocolModule";
 import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
@@ -37,9 +37,6 @@ const errors = {
     invalidZkProgramTreeRoot: () => "Root hash of the provided zkProgram config witness is invalid",
     invalidZkProgramConfigMethodId: () => "Method id of the provided zkProgram config does not match the executed transaction method id",
 };
-function maxField() {
-    return Field(Field.ORDER - 1n);
-}
 export class BlockProverProgrammable extends ZkProgrammable {
     constructor(prover, stateTransitionProver, runtime, transactionHooks, blockHooks, verificationKeyService) {
         super();
@@ -49,9 +46,10 @@ export class BlockProverProgrammable extends ZkProgrammable {
         this.transactionHooks = transactionHooks;
         this.blockHooks = blockHooks;
         this.verificationKeyService = verificationKeyService;
+        this.name = "BlockProver";
     }
-    get appChain() {
-        return this.prover.appChain;
+    get areProofsEnabled() {
+        return this.prover.areProofsEnabled;
     }
     /**
      * Applies and checks the two proofs and applies the corresponding state
@@ -182,6 +180,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
             ...publicInput,
         };
         state.networkStateHash.assertEquals(executionData.networkState.hash(), "ExecutionData Networkstate doesn't equal public input hash");
+        publicInput.blockNumber.assertEquals(MAX_FIELD, "blockNumber has to be MAX for transaction proofs");
         // Verify the [methodId, vk] tuple against the baked-in vk tree root
         const { verificationKey, witness: verificationKeyTreeWitness } = verificationKeyWitness;
         const root = Field(this.verificationKeyService.getRoot());
@@ -194,7 +193,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
         const stateTo = await this.applyTransaction(bundleInclusionState, stateProof, runtimeProof, executionData, verificationKey);
         return new BlockProverPublicOutput({
             ...stateTo,
-            blockNumber: maxField(),
+            blockNumber: publicInput.blockNumber,
             closed: Bool(false),
         });
     }
@@ -204,7 +203,9 @@ export class BlockProverProgrammable extends ZkProgrammable {
         // Assert from state roots
         stateRoot.assertEquals(stateTransitionProof.publicInput.stateRoot, errors.propertyNotMatching("from state root"));
     }
-    async proveBlock(publicInput, networkState, blockWitness, stateTransitionProof, transactionProof) {
+    async proveBlock(publicInput, networkState, blockWitness, 
+    // stateTransitionProof: StateTransitionProof,
+    transactionProof) {
         const state = {
             ...publicInput,
         };
@@ -217,25 +218,32 @@ export class BlockProverProgrammable extends ZkProgrammable {
         transactionProof.publicInput.networkStateHash.assertEquals(transactionProof.publicOutput.networkStateHash, "TransactionProof cannot alter the network state");
         transactionProof.publicInput.eternalTransactionsHash.assertEquals(state.eternalTransactionsHash, "TransactionProof starting eternalTransactionHash not matching");
         transactionProof.publicInput.incomingMessagesHash.assertEquals(state.incomingMessagesHash, "TransactionProof starting incomingMessagesHash not matching");
+        // TODO Reintroduce ST Proofs
         // Verify ST Proof only if STs have been emitted,
         // otherwise we can input a dummy proof
-        const stsEmitted = stateTransitionProof.publicOutput.stateTransitionsHash
-            .equals(0)
-            .and(stateTransitionProof.publicOutput.protocolTransitionsHash.equals(0))
-            .not();
-        stateTransitionProof.verifyIf(stsEmitted);
-        // Verify Transaction proof if it has at least 1 tx
+        // const stsEmitted = stateTransitionProof.publicOutput.stateTransitionsHash
+        //   .equals(0)
+        //   .and(stateTransitionProof.publicOutput.protocolTransitionsHash.equals(0))
+        //   .not();
+        // Provable.log("VerifyIf 1", stsEmitted);
+        // stateTransitionProof.verifyIf(Bool(false));
+        // stateTransitionProof.verifyIf(stsEmitted);
+        // Verify Transaction proof if it has at least 1 tx - i.e. the
+        // input and output doesn't match fully
         // We have to compare the whole input and output because we can make no
         // assumptions about the values, since it can be an arbitrary dummy-proof
         const txProofOutput = transactionProof.publicOutput;
-        const verifyTransactionProof = txProofOutput.equals(transactionProof.publicInput, txProofOutput.closed, txProofOutput.blockNumber);
-        transactionProof.verifyIf(verifyTransactionProof);
+        const isEmptyTransition = txProofOutput.equals(transactionProof.publicInput, txProofOutput.closed);
+        Provable.log("VerifyIf 2", isEmptyTransition.not());
+        transactionProof.verifyIf(isEmptyTransition.not());
         // 2. Execute beforeBlock hooks
         const beforeBlockResult = await this.executeBlockHooks(state, networkState, "beforeBlock");
-        const beforeBlockHashList = new StateTransitionReductionList(ProvableStateTransition);
-        beforeBlockResult.stateTransitions.forEach((st) => {
-            beforeBlockHashList.push(st.toProvable());
-        });
+        // const beforeBlockHashList = new StateTransitionReductionList(
+        //   ProvableStateTransition
+        // );
+        // beforeBlockResult.stateTransitions.forEach((st) => {
+        //   beforeBlockHashList.push(st.toProvable());
+        // });
         // We are reusing protocolSTs here as beforeBlock STs
         // TODO Not possible atm bcs we can't have a seperation between protocol/runtime state roots,
         // which we would for both before and after to be able to emit STs
@@ -244,7 +252,10 @@ export class BlockProverProgrammable extends ZkProgrammable {
         // );
         // state.stateRoot = stateTransitionProof.publicInput.protocolStateRoot;
         // TODO Only for now
-        beforeBlockHashList.commitment.assertEquals(Field(0), "beforeBlock() cannot emit state transitions yet");
+        // beforeBlockHashList.commitment.assertEquals(
+        //   Field(0),
+        //   "beforeBlock() cannot emit state transitions yet"
+        // );
         // 4. Apply TX-type BlockProof
         transactionProof.publicInput.networkStateHash.assertEquals(beforeBlockResult.networkState.hash(), "TransactionProof networkstate hash not matching beforeBlock hook result");
         transactionProof.publicInput.stateRoot.assertEquals(state.stateRoot, "TransactionProof input state root not matching blockprover state root");
@@ -255,7 +266,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
         state.incomingMessagesHash =
             transactionProof.publicOutput.incomingMessagesHash;
         // 5. Execute afterBlock hooks
-        this.assertSTProofInput(stateTransitionProof, state.stateRoot);
+        // this.assertSTProofInput(stateTransitionProof, state.stateRoot);
         const afterBlockResult = await this.executeBlockHooks(state, beforeBlockResult.networkState, "afterBlock");
         const afterBlockHashList = new StateTransitionReductionList(ProvableStateTransition);
         afterBlockResult.stateTransitions.forEach((st) => {
@@ -263,11 +274,19 @@ export class BlockProverProgrammable extends ZkProgrammable {
         });
         state.networkStateHash = afterBlockResult.networkState.hash();
         // We are reusing runtime STs here as afterBlock STs
-        stateTransitionProof.publicInput.stateTransitionsHash.assertEquals(afterBlockHashList.commitment, "STProof from-ST-hash not matching generated ST-hash from afterBlock hooks");
-        state.stateRoot = Provable.if(stsEmitted, stateTransitionProof.publicOutput.stateRoot, state.stateRoot);
+        // stateTransitionProof.publicInput.protocolTransitionsHash.assertEquals(
+        //   afterBlockHashList.commitment,
+        //   "STProof from-ST-hash not matching generated ST-hash from afterBlock hooks"
+        // );
+        // state.stateRoot = Provable.if(
+        //   stsEmitted,
+        //   stateTransitionProof.publicOutput.stateRoot,
+        //   state.stateRoot
+        // );
         // 6. Close block
         // Calculate the new block index
         const blockIndex = blockWitness.calculateIndex();
+        blockIndex.assertEquals(publicInput.blockNumber);
         blockWitness
             .calculateRoot(Field(0))
             .assertEquals(publicInput.blockHashRoot, "Supplied block hash witness not matching state root");
@@ -278,7 +297,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
         }).hash());
         return new BlockProverPublicOutput({
             ...state,
-            blockNumber: blockIndex,
+            blockNumber: blockIndex.add(1),
             closed: Bool(true),
         });
     }
@@ -326,17 +345,20 @@ export class BlockProverProgrammable extends ZkProgrammable {
         // }else if(proof1.closed || proof2.closed{
         //   assert proof1.height == proof2.height
         // }
-        const proof1Height = proof1.publicOutput.blockNumber;
         const proof1Closed = proof1.publicOutput.closed;
-        const proof2Height = proof2.publicOutput.blockNumber;
         const proof2Closed = proof2.publicOutput.closed;
-        const isValidTransactionMerge = proof1Height
-            .equals(maxField())
-            .and(proof2Height.equals(proof1Height))
+        const blockNumberProgressionValid = publicInput.blockNumber
+            .equals(proof1.publicInput.blockNumber)
+            .and(proof1.publicOutput.blockNumber.equals(proof2.publicInput.blockNumber));
+        // For tx proofs, we check that the progression starts and end with MAX
+        // in addition to that both proofs are non-closed
+        const isValidTransactionMerge = publicInput.blockNumber
+            .equals(MAX_FIELD)
+            .and(blockNumberProgressionValid)
             .and(proof1Closed.or(proof2Closed).not());
         const isValidClosedMerge = proof1Closed
             .and(proof2Closed)
-            .and(proof1Height.add(1).equals(proof2Height));
+            .and(blockNumberProgressionValid);
         isValidTransactionMerge
             .or(isValidClosedMerge)
             .assertTrue("Invalid BlockProof merge");
@@ -347,9 +369,8 @@ export class BlockProverProgrammable extends ZkProgrammable {
             blockHashRoot: proof2.publicOutput.blockHashRoot,
             eternalTransactionsHash: proof2.publicOutput.eternalTransactionsHash,
             incomingMessagesHash: proof2.publicOutput.incomingMessagesHash,
-            // Provable.if(isValidClosedMerge, Bool(true), Bool(false));
             closed: isValidClosedMerge,
-            blockNumber: proof2Height,
+            blockNumber: proof2.publicOutput.blockNumber,
         });
     }
     /**
@@ -360,7 +381,6 @@ export class BlockProverProgrammable extends ZkProgrammable {
     zkProgramFactory() {
         const { prover, stateTransitionProver } = this;
         const StateTransitionProofClass = stateTransitionProver.zkProgram[0].Proof;
-        const RuntimeProofClass = DynamicRuntimeProof;
         const proveTransaction = prover.proveTransaction.bind(prover);
         const proveBlock = prover.proveBlock.bind(prover);
         const merge = prover.merge.bind(prover);
@@ -372,7 +392,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
                 proveTransaction: {
                     privateInputs: [
                         StateTransitionProofClass,
-                        RuntimeProofClass,
+                        DynamicRuntimeProof,
                         BlockProverExecutionData,
                         RuntimeVerificationKeyAttestation,
                     ],
@@ -384,11 +404,15 @@ export class BlockProverProgrammable extends ZkProgrammable {
                     privateInputs: [
                         NetworkState,
                         BlockHashMerkleTreeWitness,
-                        StateTransitionProofClass,
+                        // StateTransitionProofClass,
                         (SelfProof),
                     ],
-                    async method(publicInput, networkState, blockWitness, stateTransitionProof, transactionProof) {
-                        return await proveBlock(publicInput, networkState, blockWitness, stateTransitionProof, transactionProof);
+                    async method(publicInput, networkState, blockWitness, 
+                    // stateTransitionProof: StateTransitionProof,
+                    transactionProof) {
+                        return await proveBlock(publicInput, networkState, blockWitness, 
+                        // stateTransitionProof,
+                        transactionProof);
                     },
                 },
                 merge: {
@@ -404,11 +428,13 @@ export class BlockProverProgrammable extends ZkProgrammable {
         });
         const methods = {
             proveTransaction: program.proveTransaction,
+            proveBlock: program.proveBlock,
             merge: program.merge,
         };
         const SelfProofClass = ZkProgram.Proof(program);
         return [
             {
+                name: program.name,
                 compile: program.compile.bind(program),
                 verify: program.verify.bind(program),
                 analyzeMethods: program.analyzeMethods.bind(program),
@@ -431,7 +457,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [BlockProverPublicInput,
         NetworkState,
-        BlockHashMerkleTreeWitness, Object, Object]),
+        BlockHashMerkleTreeWitness, Object]),
     __metadata("design:returntype", Promise)
 ], BlockProverProgrammable.prototype, "proveBlock", null);
 __decorate([
@@ -452,11 +478,22 @@ export let BlockProver = class BlockProver extends ProtocolModule {
         this.runtime = runtime;
         this.zkProgrammable = new BlockProverProgrammable(this, stateTransitionProver.zkProgrammable, runtime.zkProgrammable, transactionHooks, blockHooks, verificationKeyService);
     }
+    async compile(registry) {
+        await registry.forceProverExists(async () => {
+            await this.stateTransitionProver.compile(registry);
+            await this.runtime.compile(registry);
+        });
+        return await this.zkProgrammable.compile(registry);
+    }
     proveTransaction(publicInput, stateProof, appProof, executionData, verificationKeyAttestation) {
         return this.zkProgrammable.proveTransaction(publicInput, stateProof, appProof, executionData, verificationKeyAttestation);
     }
-    proveBlock(publicInput, networkState, blockWitness, stateTransitionProof, transactionProof) {
-        return this.zkProgrammable.proveBlock(publicInput, networkState, blockWitness, stateTransitionProof, transactionProof);
+    proveBlock(publicInput, networkState, blockWitness, 
+    // stateTransitionProof: StateTransitionProof,
+    transactionProof) {
+        return this.zkProgrammable.proveBlock(publicInput, networkState, blockWitness, 
+        // stateTransitionProof,
+        transactionProof);
     }
     merge(publicInput, proof1, proof2) {
         return this.zkProgrammable.merge(publicInput, proof1, proof2);
@@ -470,3 +507,4 @@ BlockProver = __decorate([
     __param(3, injectAll("ProvableBlockHook")),
     __metadata("design:paramtypes", [Object, Object, Array, Array, RuntimeVerificationKeyRootService])
 ], BlockProver);
+//# sourceMappingURL=BlockProver.js.map

package/dist/prover/block/BlockProver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockProver.js","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,IAAI,EAEJ,KAAK,EACL,QAAQ,EAER,QAAQ,EACR,SAAS,EAET,SAAS,GACV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAKL,SAAS,EAET,cAAc,EAEd,cAAc,GACf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAO/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EACL,uBAAuB,GAExB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAElG,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AAExF,OAAO,EAEL,wBAAwB,EAExB,sBAAsB,EACtB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAElB,iCAAiC,GAClC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AAEjG,MAAM,MAAM,GAAG;IACb,2BAA2B,EAAE,GAAG,EAAE,CAChC,+CAA+C;IAEjD,4BAA4B,EAAE,GAAG,EAAE,CACjC,gDAAgD;IAElD,uBAAuB,EAAE,CAAC,YAAoB,EAAE,IAAY,EAAE,EAAE,CAC9D,GAAG,YAAY,kBAAkB,IAAI,EAAE;IAEzC,mBAAmB,EAAE,CAAC,YAAoB,EAAE,EAAE,CAAC,GAAG,YAAY,eAAe;IAE7E,oBAAoB,EAAE,CAAC,IAAY,EAAE,EAAE,CACrC,MAAM,CAAC,uBAAuB,CAAC,YAAY,EAAE,IAAI,CAAC;IAEpD,2BAA2B,EAAE,CAAC,IAAY,EAAE,EAAE,CAC5C,MAAM,CAAC,uBAAuB,CAAC,mBAAmB,EAAE,IAAI,CAAC;IAE3D,2BAA2B,EAAE,CAAC,IAAY,EAAE,EAAE,CAC5C,MAAM,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAE5D,wBAAwB,EAAE,GAAG,EAAE,CAC7B,+DAA+D;IAEjE,8BAA8B,EAAE,GAAG,EAAE,CACnC,8FAA8F;CACjG,CAAC;AAwCF,MAAM,OAAO,uBAAwB,SAAQ,cAG5C;IACC,YACmB,MAAmB,EACpB,qBAGf,EACe,OAAsD,EACrD,gBAAoD,EACpD,UAAwC,EACxC,sBAA4C;QAE7D,KAAK,EAAE,CAAC;QAVS,WAAM,GAAN,MAAM,CAAa;QACpB,0BAAqB,GAArB,qBAAqB,CAGpC;QACe,YAAO,GAAP,OAAO,CAA+C;QACrD,qBAAgB,GAAhB,gBAAgB,CAAoC;QACpD,eAAU,GAAV,UAAU,CAA8B;QACxC,2BAAsB,GAAtB,sBAAsB,CAAsB;QAK/D,SAAI,GAAG,aAAa,CAAC;IAFrB,CAAC;IAID,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;IACtC,CAAC;IAED;;;;;;;;;;OAUG;IACI,KAAK,CAAC,gBAAgB,CAC3B,KAAuB,EACvB,oBAGC,EACD,YAAiC,EACjC,aAAuC,EACvC,eAAgC;QAEhC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;QAE/D,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC;QAEhD,YAAY,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACrC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAE7B,4DAA4D;QAC5D,oBAAoB,CAAC,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAChE,KAAK,CAAC,CAAC,CAAC,EACR,MAAM,CAAC,2BAA2B,EAAE,CACrC,CAAC;QACF,oBAAoB,CAAC,WAAW,CAAC,uBAAuB,CAAC,YAAY,CACnE,KAAK,CAAC,CAAC,CAAC,EACR,MAAM,CAAC,2BAA2B,EAAE,CACrC,CAAC;QAEF,YAAY,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CACzD,oBAAoB,CAAC,YAAY,CAAC,oBAAoB,EACtD,MAAM,CAAC,4BAA4B,EAAE,CACtC,CAAC;QAEF,0BAA0B;QAC1B,KAAK,CAAC,SAAS,CAAC,YAAY,CAC1B,oBAAoB,CAAC,WAAW,CAAC,SAAS,EAC1C,MAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAC9C,CAAC;QACF,KAAK,CAAC,SAAS,CAAC,YAAY,CAC1B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,EAClD,MAAM,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,CACvD,CAAC;QAEF,mCAAmC;QACnC,MAAM,IAAI,CAAC,yBAAyB,CAClC,oBAAoB,EACpB,aAAa,EACb,YAAY,CACb,CAAC;QAEF,gCAAgC;QAChC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC,EAAE,CAC7B,YAAY,CAAC,YAAY,CAAC,MAAM,EAChC,oBAAoB,CAAC,YAAY,CAAC,SAAS,EAC3C,oBAAoB,CAAC,YAAY,CAAC,iBAAiB,CACpD,CAAC;QAEF,+CAA+C;QAC/C,MAAM,oBAAoB,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAEhD,oBAAoB,CAAC,YAAY,CAC/B,YAAY,CAAC,YAAY,CAAC,eAAe,EACzC,+DAA+D,CAChE,CAAC;QAEF,8BAA8B;QAC9B,IAAI,iBAAiB,CAAC;YACpB,WAAW;YACX,SAAS;SACV,CAAC;aACC,iBAAiB,EAAE;aACnB,EAAE,CAAC,SAAS,CAAC;aACb,UAAU,CAAC,iCAAiC,CAAC,CAAC;QAEjD,yCAAyC;QACzC,WAAW,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAE7C,iDAAiD;QACjD,KAAK,CAAC,gBAAgB,CAAC,YAAY,CACjC,YAAY,CAAC,YAAY,CAAC,gBAAgB,EAC1C,qDAAqD,CACtD,CAAC;QACF,KAAK,CAAC,gBAAgB,CAAC,YAAY,CACjC,YAAY,CAAC,IAAI,EAAE,EACnB,sEAAsE,CACvE,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,mCAAmC;IACnC,oGAAoG;IAE7F,KAAK,CAAC,yBAAyB,CACpC,oBAGC,EACD,aAAuC,EACvC,YAAoD;QAEpD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QAC1E,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAEzB,wDAAwD;QACxD,0EAA0E;QAC1E,yBAAyB;QACzB,gBAAgB,CAAC,KAAK,CAAC;YACrB,6EAA6E;YAC7E,WAAW,EAAE,aAAa,CAAC,WAAW;YACtC,YAAY,EAAE,aAAa,CAAC,YAAY;SACzC,CAAC,CAAC;QACH,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAE1C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE;YAC1C,4CAA4C;YAC5C,MAAM,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;SAC3C;QAED,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAE/B,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,GAC/C,gBAAgB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QAEpC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAEjC,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACtD,UAAU,CAAC,UAAU,EAAE,CACxB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,4BAA4B,CAC/C,uBAAuB,EACvB,oBAAoB,CAAC,WAAW,CAAC,uBAAuB,CACzD,CAAC;QAEF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,oBAAoB,CAAC,YAAY,CAAC,uBAAuB,CAAC,YAAY,CACpE,QAAQ,CAAC,UAAU,EACnB,yEAAyE,CAC1E,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,KAAuB,EACvB,iBAA+B,EAC/B,IAAkC;QAKlC,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QAC1E,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACzB,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAE1C,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAExD,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,EAAE;YACzC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC;YAC/C,wDAAwD;YACxD,wEAAwE;YACxE,qEAAqE;YACrE,gBAAgB,CAAC,KAAK,CAAC;gBACrB,WAAW,EAAE,kBAAkB,CAAC,gBAAgB,EAAE;gBAClD,YAAY;aACb,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,aAAa,EAAE;gBAC1B,OAAO,MAAM,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;aACzD;YACD,IAAI,IAAI,KAAK,YAAY,EAAE;gBACzB,OAAO,MAAM,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;aACxD;YACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEvC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAE/B,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,GAC/C,gBAAgB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QAEpC,MAAM,CAAC,UAAU,CAAC,2BAA2B,aAAa,IAAI,GAAG,EAAE,CAAC,CAAC;QAErE,OAAO;YACL,YAAY,EAAE,qBAAqB;YACnC,gBAAgB;SACjB,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAC5B,KAAuB,EACvB,SAAe,EACf,WAA+B;QAE/B,MAAM,OAAO,GAAG;YACd,GAAG,KAAK;SACT,CAAC;QAEF,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAE3C,gCAAgC;QAChC,MAAM,eAAe,GAAG,IAAI,uBAAuB,CACjD,KAAK,EACL,KAAK,CAAC,gBAAgB,CACvB,CAAC;QAEF,eAAe,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC;QAEtD,wCAAwC;QACxC,yEAAyE;QACzE,MAAM,sBAAsB,GAAG,IAAI,uBAAuB,CACxD,KAAK,EACL,KAAK,CAAC,uBAAuB,CAC9B,CAAC;QAEF,sBAAsB,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,uBAAuB,GAAG,sBAAsB,CAAC,UAAU,CAAC;QAEpE,oCAAoC;QACpC,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElE,MAAM,oBAAoB,GAAG,IAAI,mBAAmB,CAClD,KAAK,CAAC,oBAAoB,CAC3B,CAAC;QACF,oBAAoB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEnD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,UAAU,CAAC;QAE/D,OAAO,OAAO,CAAC;IACjB,CAAC;IAGY,AAAN,KAAK,CAAC,gBAAgB,CAC3B,WAAmC,EACnC,UAAgC,EAChC,YAAiC,EACjC,aAAuC,EACvC,sBAAyD;QAEzD,MAAM,KAAK,GAAqB;YAC9B,GAAG,WAAW;SACf,CAAC;QAEF,KAAK,CAAC,gBAAgB,CAAC,YAAY,CACjC,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,EACjC,4DAA4D,CAC7D,CAAC;QAEF,WAAW,CAAC,WAAW,CAAC,YAAY,CAClC,SAAS,EACT,kDAAkD,CACnD,CAAC;QAEF,oEAAoE;QACpE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,0BAA0B,EAAE,GAC5D,sBAAsB,CAAC;QAEzB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,cAAc,GAAG,0BAA0B,CAAC,aAAa,CAC7D,IAAI,kBAAkB,CAAC;YACrB,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,QAAQ;YAC5C,MAAM,EAAE,eAAe,CAAC,IAAI;SAC7B,CAAC,CAAC,IAAI,EAAE,CACV,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,wBAAwB,EAAE,CAAC,CAAC;QAErE,MAAM,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,CACtD,KAAK,EACL,YAAY,CAAC,YAAY,CAAC,SAAS,EACnC,aAAa,CAAC,WAAW,CAC1B,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACzC,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,aAAa,EACb,eAAe,CAChB,CAAC;QAEF,OAAO,IAAI,uBAAuB,CAAC;YACjC,GAAG,OAAO;YACV,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC;SACpB,CAAC,CAAC;IACL,CAAC;IAEO,kBAAkB,CACxB,oBAA0C,EAC1C,SAAgB;QAEhB,oBAAoB,CAAC,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAChE,KAAK,CAAC,CAAC,CAAC,EACR,MAAM,CAAC,2BAA2B,EAAE,CACrC,CAAC;QACF,oBAAoB,CAAC,WAAW,CAAC,uBAAuB,CAAC,YAAY,CACnE,KAAK,CAAC,CAAC,CAAC,EACR,MAAM,CAAC,2BAA2B,EAAE,CACrC,CAAC;QAEF,0BAA0B;QAC1B,SAAS,CAAC,YAAY,CACpB,oBAAoB,CAAC,WAAW,CAAC,SAAS,EAC1C,MAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAC9C,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,UAAU,CACrB,WAAmC,EACnC,YAA0B,EAC1B,YAAwC;IACxC,8CAA8C;IAC9C,gBAAkC;QAElC,MAAM,KAAK,GAAqB;YAC9B,GAAG,WAAW;SACf,CAAC;QAEF,sCAAsC;QACtC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACvC,KAAK,CAAC,CAAC,CAAC,EACR,oCAAoC,CACrC,CAAC;QACF,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACvC,YAAY,CAAC,IAAI,EAAE,EACnB,6BAA6B,CAC9B,CAAC;QAEF,gBAAgB,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACxD,KAAK,CAAC,CAAC,CAAC,EACR,qDAAqD,CACtD,CAAC;QACF,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CACrD,KAAK,CAAC,CAAC,CAAC,EACR,+DAA+D,CAChE,CAAC;QACF,gBAAgB,CAAC,YAAY,CAAC,aAAa,CAAC,YAAY,CACtD,KAAK,CAAC,CAAC,CAAC,EACR,gEAAgE,CACjE,CAAC;QACF,gBAAgB,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACxD,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,EAC9C,iDAAiD,CAClD,CAAC;QACF,gBAAgB,CAAC,WAAW,CAAC,uBAAuB,CAAC,YAAY,CAC/D,KAAK,CAAC,uBAAuB,EAC7B,+DAA+D,CAChE,CAAC;QACF,gBAAgB,CAAC,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAC5D,KAAK,CAAC,oBAAoB,EAC1B,6DAA6D,CAC9D,CAAC;QAEF,6BAA6B;QAC7B,iDAAiD;QACjD,uCAAuC;QACvC,4EAA4E;QAC5E,eAAe;QACf,8EAA8E;QAC9E,YAAY;QACZ,0CAA0C;QAC1C,8CAA8C;QAC9C,6CAA6C;QAE7C,8DAA8D;QAC9D,uCAAuC;QACvC,uEAAuE;QACvE,yEAAyE;QACzE,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC;QACpD,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAC5C,gBAAgB,CAAC,WAAW,EAC5B,aAAa,CAAC,MAAM,CACrB,CAAC;QACF,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,GAAG,EAAE,CAAC,CAAC;QACpD,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,CAAC;QAEnD,+BAA+B;QAC/B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACpD,KAAK,EACL,YAAY,EACZ,aAAa,CACd,CAAC;QAEF,gEAAgE;QAChE,4BAA4B;QAC5B,KAAK;QACL,uDAAuD;QACvD,+CAA+C;QAC/C,MAAM;QAEN,qDAAqD;QACrD,6FAA6F;QAC7F,kEAAkE;QAElE,yEAAyE;QACzE,mCAAmC;QACnC,KAAK;QACL,wEAAwE;QAExE,oBAAoB;QACpB,+CAA+C;QAC/C,cAAc;QACd,sDAAsD;QACtD,KAAK;QAEL,8BAA8B;QAC9B,gBAAgB,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACxD,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,EACrC,yEAAyE,CAC1E,CAAC;QACF,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAAC,YAAY,CACjD,KAAK,CAAC,SAAS,EACf,uEAAuE,CACxE,CAAC;QAEF,KAAK,CAAC,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,SAAS,CAAC;QAC1D,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC;QACxE,KAAK,CAAC,uBAAuB;YAC3B,gBAAgB,CAAC,YAAY,CAAC,uBAAuB,CAAC;QACxD,KAAK,CAAC,oBAAoB;YACxB,gBAAgB,CAAC,YAAY,CAAC,oBAAoB,CAAC;QAErD,8BAA8B;QAC9B,kEAAkE;QAElE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACnD,KAAK,EACL,iBAAiB,CAAC,YAAY,EAC9B,YAAY,CACb,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAI,4BAA4B,CACzD,uBAAuB,CACxB,CAAC;QACF,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC/C,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAE9D,oDAAoD;QACpD,yEAAyE;QACzE,mCAAmC;QACnC,gFAAgF;QAChF,KAAK;QACL,iCAAiC;QACjC,gBAAgB;QAChB,iDAAiD;QACjD,oBAAoB;QACpB,KAAK;QAEL,iBAAiB;QAEjB,gCAAgC;QAChC,MAAM,UAAU,GAAG,YAAY,CAAC,cAAc,EAAE,CAAC;QAEjD,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAEjD,YAAY;aACT,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACvB,YAAY,CACX,WAAW,CAAC,aAAa,EACzB,qDAAqD,CACtD,CAAC;QAEJ,KAAK,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAC9C,IAAI,kBAAkB,CAAC;YACrB,iCAAiC;YACjC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAC9D,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC;SACnB,CAAC,CAAC,IAAI,EAAE,CACV,CAAC;QAEF,OAAO,IAAI,uBAAuB,CAAC;YACjC,GAAG,KAAK;YACR,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IAGY,AAAN,KAAK,CAAC,KAAK,CAChB,WAAmC,EACnC,MAAwB,EACxB,MAAwB;QAExB,MAAM,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,EAAE,CAAC;QAEhB,cAAc;QACd,WAAW,CAAC,SAAS,CAAC,YAAY,CAChC,MAAM,CAAC,WAAW,CAAC,SAAS,EAC5B,MAAM,CAAC,oBAAoB,CAAC,iCAAiC,CAAC,CAC/D,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CACxC,MAAM,CAAC,WAAW,CAAC,SAAS,EAC5B,MAAM,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CACxD,CAAC;QAEF,+BAA+B;QAC/B,kEAAkE;QAClE,WAAW,CAAC,gBAAgB;aACzB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC;aAC3C,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;aAC9B,UAAU,CACT,MAAM,CAAC,2BAA2B,CAAC,iCAAiC,CAAC,CACtE,CAAC;QACJ,MAAM,CAAC,YAAY,CAAC,gBAAgB;aACjC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC;aAC3C,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;aAC9B,UAAU,CACT,MAAM,CAAC,2BAA2B,CAAC,0BAA0B,CAAC,CAC/D,CAAC;QAEJ,oBAAoB;QACpB,WAAW,CAAC,gBAAgB,CAAC,YAAY,CACvC,MAAM,CAAC,WAAW,CAAC,gBAAgB,EACnC,MAAM,CAAC,2BAA2B,CAAC,iCAAiC,CAAC,CACtE,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAC/C,MAAM,CAAC,WAAW,CAAC,gBAAgB,EACnC,MAAM,CAAC,2BAA2B,CAAC,0BAA0B,CAAC,CAC/D,CAAC;QAEF,sBAAsB;QACtB,WAAW,CAAC,aAAa,CAAC,YAAY,CACpC,MAAM,CAAC,WAAW,CAAC,aAAa,EAChC,MAAM,CAAC,2BAA2B,CAAC,iCAAiC,CAAC,CACtE,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,YAAY,CAC5C,MAAM,CAAC,WAAW,CAAC,aAAa,EAChC,MAAM,CAAC,2BAA2B,CAAC,0BAA0B,CAAC,CAC/D,CAAC;QAEF,gCAAgC;QAChC,WAAW,CAAC,uBAAuB,CAAC,YAAY,CAC9C,MAAM,CAAC,WAAW,CAAC,uBAAuB,EAC1C,MAAM,CAAC,2BAA2B,CAAC,iCAAiC,CAAC,CACtE,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,uBAAuB,CAAC,YAAY,CACtD,MAAM,CAAC,WAAW,CAAC,uBAAuB,EAC1C,MAAM,CAAC,2BAA2B,CAAC,0BAA0B,CAAC,CAC/D,CAAC;QAEF,6BAA6B;QAC7B,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAC3C,MAAM,CAAC,WAAW,CAAC,oBAAoB,EACvC,MAAM,CAAC,uBAAuB,CAC5B,sBAAsB,EACtB,iCAAiC,CAClC,CACF,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CACnD,MAAM,CAAC,WAAW,CAAC,oBAAoB,EACvC,MAAM,CAAC,uBAAuB,CAC5B,sBAAsB,EACtB,0BAA0B,CAC3B,CACF,CAAC;QAEF,kCAAkC;QAClC,kEAAkE;QAClE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CACrC,MAAM,CAAC,YAAY,CAAC,MAAM,EAC1B,gCAAgC,CACjC,CAAC;QAEF,SAAS;QACT,oDAAoD;QACpD,yDAAyD;QACzD,sDAAsD;QAEtD,kCAAkC;QAClC,oDAAoD;QACpD,6CAA6C;QAC7C,4CAA4C;QAC5C,8CAA8C;QAC9C,iCAAiC;QACjC,2CAA2C;QAC3C,0CAA0C;QAC1C,IAAI;QAEJ,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;QAEhD,MAAM,2BAA2B,GAAG,WAAW,CAAC,WAAW;aACxD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC;aACtC,GAAG,CACF,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CACvE,CAAC;QAEJ,uEAAuE;QACvE,iDAAiD;QACjD,MAAM,uBAAuB,GAAG,WAAW,CAAC,WAAW;aACpD,MAAM,CAAC,SAAS,CAAC;aACjB,GAAG,CAAC,2BAA2B,CAAC;aAChC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAE5C,MAAM,kBAAkB,GAAG,YAAY;aACpC,GAAG,CAAC,YAAY,CAAC;aACjB,GAAG,CAAC,2BAA2B,CAAC,CAAC;QAEpC,uBAAuB;aACpB,EAAE,CAAC,kBAAkB,CAAC;aACtB,UAAU,CAAC,0BAA0B,CAAC,CAAC;QAE1C,OAAO,IAAI,uBAAuB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,gBAAgB;YACtD,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,gBAAgB;YACtD,aAAa,EAAE,MAAM,CAAC,YAAY,CAAC,aAAa;YAChD,uBAAuB,EAAE,MAAM,CAAC,YAAY,CAAC,uBAAuB;YACpE,oBAAoB,EAAE,MAAM,CAAC,YAAY,CAAC,oBAAoB;YAC9D,MAAM,EAAE,kBAAkB;YAC1B,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW;SAC7C,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,gBAAgB;QAIrB,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;QAC/C,MAAM,yBAAyB,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3E,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,SAAS,CAAC;YACxB,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,sBAAsB;YACnC,YAAY,EAAE,uBAAuB;YAErC,OAAO,EAAE;gBACP,gBAAgB,EAAE;oBAChB,aAAa,EAAE;wBACb,yBAAyB;wBACzB,mBAAmB;wBACnB,wBAAwB;wBACxB,iCAAiC;qBAClC;oBAED,KAAK,CAAC,MAAM,CACV,WAAmC,EACnC,UAAgC,EAChC,QAA6B,EAC7B,aAAuC,EACvC,0BAA6D;wBAE7D,OAAO,MAAM,gBAAgB,CAC3B,WAAW,EACX,UAAU,EACV,QAAQ,EACR,aAAa,EACb,0BAA0B,CAC3B,CAAC;oBACJ,CAAC;iBACF;gBAED,UAAU,EAAE;oBACV,aAAa,EAAE;wBACb,YAAY;wBACZ,0BAA0B;wBAC1B,6BAA6B;wBAC7B,CAAA,SAA0D,CAAA;qBAC3D;oBACD,KAAK,CAAC,MAAM,CACV,WAAmC,EACnC,YAA0B,EAC1B,YAAwC;oBACxC,8CAA8C;oBAC9C,gBAAkC;wBAElC,OAAO,MAAM,UAAU,CACrB,WAAW,EACX,YAAY,EACZ,YAAY;wBACZ,wBAAwB;wBACxB,gBAAgB,CACjB,CAAC;oBACJ,CAAC;iBACF;gBAED,KAAK,EAAE;oBACL,aAAa,EAAE;wBACb,CAAA,SAA0D,CAAA;wBAC1D,CAAA,SAA0D,CAAA;qBAC3D;oBAED,KAAK,CAAC,MAAM,CACV,WAAmC,EACnC,MAAwB,EACxB,MAAwB;wBAExB,OAAO,MAAM,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;oBAClD,CAAC;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG;YACd,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC;QAEF,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEhD,OAAO;YACL;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;gBACtC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,cAAc;gBACrB,OAAO;aACR;SACF,CAAC;IACJ,CAAC;CACF;AA7ec;IADZ,cAAc,EAAE;;qCAEF,sBAAsB,UAErB,mBAAmB;QAClB,wBAAwB;QACf,iCAAiC;;+DAgD1D;AAuBY;IADZ,cAAc,EAAE;;qCAEF,sBAAsB;QACrB,YAAY;QACZ,0BAA0B;;yDAwKzC;AAGY;IADZ,cAAc,EAAE;;qCAEF,sBAAsB;;oDAsIpC;AA8GH;;;;GAIG;AAEI,WAAM,WAAW,GAAjB,MAAM,WACX,SAAQ,cAAc;IAKtB,YAEkB,qBAIS,EAET,OACE,EAElB,gBAAoD,EAEpD,UAAwC,EACxC,sBAAyD;QAEzD,KAAK,EAAE,CAAC;QAdQ,0BAAqB,GAArB,qBAAqB,CAIZ;QAET,YAAO,GAAP,OAAO,CACL;QAQlB,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,CAC/C,IAAI,EACJ,qBAAqB,CAAC,cAAc,EACpC,OAAO,CAAC,cAAc,EACtB,gBAAgB,EAChB,UAAU,EACV,sBAAsB,CACvB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,QAAyB;QAEzB,MAAM,QAAQ,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEM,gBAAgB,CACrB,WAAmC,EACnC,UAAgC,EAChC,QAA6B,EAC7B,aAAuC,EACvC,0BAA6D;QAE7D,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,CACzC,WAAW,EACX,UAAU,EACV,QAAQ,EACR,aAAa,EACb,0BAA0B,CAC3B,CAAC;IACJ,CAAC;IAEM,UAAU,CACf,WAAmC,EACnC,YAA0B,EAC1B,YAAwC;IACxC,8CAA8C;IAC9C,gBAAkC;QAElC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,WAAW,EACX,YAAY,EACZ,YAAY;QACZ,wBAAwB;QACxB,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAEM,KAAK,CACV,WAAmC,EACnC,MAAwB,EACxB,MAAwB;QAExB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;CACF,CAAA;AAnFY,WAAW;IADvB,UAAU,EAAE;IAQR,WAAA,MAAM,CAAC,uBAAuB,CAAC,CAAA;IAM/B,WAAA,MAAM,CAAC,SAAS,CAAC,CAAA;IAGjB,WAAA,SAAS,CAAC,yBAAyB,CAAC,CAAA;IAEpC,WAAA,SAAS,CAAC,mBAAmB,CAAC,CAAA;mEAEP,iCAAiC;GApBhD,WAAW,CAmFvB"}

package/dist/prover/block/accummulators/BlockHashMerkleTree.js

@@ -14,3 +14,4 @@ export class BlockHashTreeEntry extends Struct({
         return Poseidon.hash([this.blockHash, ...this.closed.toFields()]);
     }
 }
+//# sourceMappingURL=BlockHashMerkleTree.js.map

package/dist/prover/block/accummulators/BlockHashMerkleTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockHashMerkleTree.js","sourceRoot":"","sources":["../../../../src/prover/block/accummulators/BlockHashMerkleTree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAErD,MAAM,OAAO,mBAAoB,SAAQ,gBAAgB,CAAC,EAAE,CAAC;CAAG;AAChE,MAAM,OAAO,0BAA2B,SAAQ,mBAAmB,CAAC,OAAO;CAAG;AAE9E,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC;IAC7C,SAAS,EAAE,KAAK;IAChB,MAAM,EAAE,IAAI;IACZ,kEAAkE;IAClE,kDAAkD;CACnD,CAAC;IACO,IAAI;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;CACF"}

package/dist/prover/block/accummulators/RuntimeVerificationKeyTree.d.ts

@@ -34,10 +34,10 @@ declare const RuntimeVerificationKeyAttestation_base: (new (value: {
             data: string;
             hash: bigint;
         };
-        witness: VKTreeWitness | {
+        witness: {
             path: import("o1js/dist/node/lib/provable/field").Field[] | bigint[];
             isLeft: import("o1js/dist/node/lib/provable/bool").Bool[] | boolean[];
-        };
+        } | VKTreeWitness;
     }) => {
         verificationKey: VerificationKey;
         witness: VKTreeWitness;

package/dist/prover/block/accummulators/RuntimeVerificationKeyTree.js

@@ -18,3 +18,4 @@ export class MethodVKConfigData extends Struct({
         return Poseidon.hash(MethodVKConfigData.toFields(this));
     }
 }
+//# sourceMappingURL=RuntimeVerificationKeyTree.js.map

package/dist/prover/block/accummulators/RuntimeVerificationKeyTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeVerificationKeyTree.js","sourceRoot":"","sources":["../../../../src/prover/block/accummulators/RuntimeVerificationKeyTree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAEhE,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAChC,MAAM,OAAO,MAAO,SAAQ,gBAAgB,CAAC,aAAa,CAAC;CAAG;AAC9D,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,OAAO;CAAG;AAEpD,MAAM,OAAO,iCAAkC,SAAQ,MAAM,CAAC;IAC5D,eAAe,EAAE,eAAe;IAChC,OAAO,EAAE,aAAa;CACvB,CAAC;CAAG;AAEL,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC;IAC7C,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,KAAK;CACd,CAAC;IACO,IAAI;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF"}

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

@@ -20,3 +20,4 @@ RuntimeVerificationKeyRootService = __decorate([
     injectable(),
     scoped(Lifecycle.ContainerScoped)
 ], RuntimeVerificationKeyRootService);
+//# sourceMappingURL=RuntimeVerificationKeyRootService.js.map