@proto-kit/protocol 0.1.1-develop.457 → 0.1.1-develop.600

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

@@ -1,29 +1,41 @@
-import { Proof } from "o1js";
+import { Bool, Field, Proof, Signature } from "o1js";
 import { WithZkProgrammable } from "@proto-kit/common";
 import { StateTransitionProof } from "../statetransition/StateTransitionProvable";
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
-import { ProtocolTransaction } from "../../model/transaction/ProtocolTransaction";
+import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
 import { NetworkState } from "../../model/network/NetworkState";
-import { BlockTransactionPosition } from "./BlockTransactionPosition";
+import { BlockHashMerkleTreeWitness } from "./accummulators/BlockHashMerkleTree";
 declare const BlockProverPublicInput_base: (new (value: {
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
 }) => {
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
 }) & {
     _isStruct: true;
 } & import("o1js/dist/node/snarky").ProvablePure<{
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
 }> & {
     toInput: (x: {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
@@ -32,19 +44,31 @@ declare const BlockProverPublicInput_base: (new (value: {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
     }) => {
         transactionsHash: string;
         stateRoot: string;
         networkStateHash: string;
+        blockHashRoot: string;
+        eternalTransactionsHash: string;
+        incomingMessagesHash: string;
     };
     fromJSON: (x: {
         transactionsHash: string;
         stateRoot: string;
         networkStateHash: string;
+        blockHashRoot: string;
+        eternalTransactionsHash: string;
+        incomingMessagesHash: string;
     }) => {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
     };
 };
 export declare class BlockProverPublicInput extends BlockProverPublicInput_base {
@@ -53,21 +77,41 @@ declare const BlockProverPublicOutput_base: (new (value: {
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+    closed: import("o1js/dist/node/lib/bool").Bool;
+    blockNumber: import("o1js/dist/node/lib/field").Field;
 }) => {
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+    closed: import("o1js/dist/node/lib/bool").Bool;
+    blockNumber: import("o1js/dist/node/lib/field").Field;
 }) & {
     _isStruct: true;
 } & import("o1js/dist/node/snarky").ProvablePure<{
     transactionsHash: import("o1js/dist/node/lib/field").Field;
     stateRoot: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    blockHashRoot: import("o1js/dist/node/lib/field").Field;
+    eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+    incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+    closed: import("o1js/dist/node/lib/bool").Bool;
+    blockNumber: import("o1js/dist/node/lib/field").Field;
 }> & {
     toInput: (x: {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+        closed: import("o1js/dist/node/lib/bool").Bool;
+        blockNumber: import("o1js/dist/node/lib/field").Field;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
@@ -76,94 +120,128 @@ declare const BlockProverPublicOutput_base: (new (value: {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+        closed: import("o1js/dist/node/lib/bool").Bool;
+        blockNumber: import("o1js/dist/node/lib/field").Field;
     }) => {
         transactionsHash: string;
         stateRoot: string;
         networkStateHash: string;
+        blockHashRoot: string;
+        eternalTransactionsHash: string;
+        incomingMessagesHash: string;
+        closed: boolean;
+        blockNumber: string;
     };
     fromJSON: (x: {
         transactionsHash: string;
         stateRoot: string;
         networkStateHash: string;
+        blockHashRoot: string;
+        eternalTransactionsHash: string;
+        incomingMessagesHash: string;
+        closed: boolean;
+        blockNumber: string;
     }) => {
         transactionsHash: import("o1js/dist/node/lib/field").Field;
         stateRoot: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        blockHashRoot: import("o1js/dist/node/lib/field").Field;
+        eternalTransactionsHash: import("o1js/dist/node/lib/field").Field;
+        incomingMessagesHash: import("o1js/dist/node/lib/field").Field;
+        closed: import("o1js/dist/node/lib/bool").Bool;
+        blockNumber: import("o1js/dist/node/lib/field").Field;
     };
 };
 export declare class BlockProverPublicOutput extends BlockProverPublicOutput_base {
+    equals(input: BlockProverPublicInput, closed: Bool, blockNumber: Field): Bool;
 }
 export type BlockProverProof = Proof<BlockProverPublicInput, BlockProverPublicOutput>;
 declare const BlockProverExecutionData_base: (new (value: {
-    transaction: ProtocolTransaction;
+    transaction: RuntimeTransaction;
+    signature: Signature;
     networkState: NetworkState;
-    transactionPosition: BlockTransactionPosition;
 }) => {
-    transaction: ProtocolTransaction;
+    transaction: RuntimeTransaction;
+    signature: Signature;
     networkState: NetworkState;
-    transactionPosition: BlockTransactionPosition;
 }) & {
     _isStruct: true;
-} & import("o1js/dist/node/snarky").ProvablePure<{
-    transaction: ProtocolTransaction;
+} & import("o1js/dist/node/lib/provable").Provable<{
+    transaction: RuntimeTransaction;
+    signature: Signature;
     networkState: NetworkState;
-    transactionPosition: BlockTransactionPosition;
 }> & {
     toInput: (x: {
-        transaction: ProtocolTransaction;
+        transaction: RuntimeTransaction;
+        signature: Signature;
         networkState: NetworkState;
-        transactionPosition: BlockTransactionPosition;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
     };
     toJSON: (x: {
-        transaction: ProtocolTransaction;
+        transaction: RuntimeTransaction;
+        signature: Signature;
         networkState: NetworkState;
-        transactionPosition: BlockTransactionPosition;
     }) => {
         transaction: {
             methodId: string;
-            nonce: string;
-            sender: string;
             argsHash: string;
-            signature: any;
+            nonce: {
+                isSome: boolean;
+                value: any;
+            };
+            sender: {
+                isSome: boolean;
+                value: any;
+            };
         };
+        signature: any;
         networkState: {
             block: {
                 height: string;
             };
-        };
-        transactionPosition: {
-            type: string;
+            previous: {
+                rootHash: string;
+            };
         };
     };
     fromJSON: (x: {
         transaction: {
             methodId: string;
-            nonce: string;
-            sender: string;
             argsHash: string;
-            signature: any;
+            nonce: {
+                isSome: boolean;
+                value: any;
+            };
+            sender: {
+                isSome: boolean;
+                value: any;
+            };
         };
+        signature: any;
         networkState: {
             block: {
                 height: string;
             };
-        };
-        transactionPosition: {
-            type: string;
+            previous: {
+                rootHash: string;
+            };
         };
     }) => {
-        transaction: ProtocolTransaction;
+        transaction: RuntimeTransaction;
+        signature: Signature;
         networkState: NetworkState;
-        transactionPosition: BlockTransactionPosition;
     };
 };
 export declare class BlockProverExecutionData extends BlockProverExecutionData_base {
 }
 export interface BlockProvable extends WithZkProgrammable<BlockProverPublicInput, BlockProverPublicOutput> {
     proveTransaction: (publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, appProof: Proof<void, MethodPublicOutput>, executionData: BlockProverExecutionData) => BlockProverPublicOutput;
+    proveBlock: (publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof) => BlockProverPublicOutput;
     merge: (publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof) => 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,EAAe,KAAK,EAAU,MAAM,MAAM,CAAC;AAClD,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,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtE,qBAAa,sBAAuB,SAAQ,2BAI1C;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,uBAAwB,SAAQ,4BAI3C;CAAG;AAEL,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAClC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,qBAAa,wBAAyB,SAAQ,6BAI5C;CAAG;AAEL,MAAM,WAAW,aACf,SAAQ,kBAAkB,CAAC,sBAAsB,EAAE,uBAAuB,CAAC;IAC3E,gBAAgB,EAAE,CAChB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,EACzC,aAAa,EAAE,wBAAwB,KACpC,uBAAuB,CAAC;IAE7B,KAAK,EAAE,CACL,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,KACrB,uBAAuB,CAAC;CAC9B"}
+{"version":3,"file":"BlockProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAU,MAAM,MAAM,CAAC;AAC7D,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEjF,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,MAAM,WAAW,aACf,SAAQ,kBAAkB,CAAC,sBAAsB,EAAE,uBAAuB,CAAC;IAC3E,gBAAgB,EAAE,CAChB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,EACzC,aAAa,EAAE,wBAAwB,KACpC,uBAAuB,CAAC;IAE7B,UAAU,EAAE,CACV,WAAW,EAAE,sBAAsB,EACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EACxC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,KAC/B,uBAAuB,CAAC;IAE7B,KAAK,EAAE,CACL,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,KACrB,uBAAuB,CAAC;CAC9B"}

package/dist/prover/block/BlockProvable.js

@@ -1,22 +1,40 @@
-import { Field, Struct } from "o1js";
-import { ProtocolTransaction } from "../../model/transaction/ProtocolTransaction";
+import { Bool, Field, Signature, Struct } from "o1js";
+import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
 import { NetworkState } from "../../model/network/NetworkState";
-import { BlockTransactionPosition } from "./BlockTransactionPosition";
 export class BlockProverPublicInput extends Struct({
     transactionsHash: Field,
     stateRoot: Field,
     networkStateHash: Field,
+    blockHashRoot: Field,
+    eternalTransactionsHash: Field,
+    incomingMessagesHash: Field,
 }) {
 }
 export class BlockProverPublicOutput extends Struct({
     transactionsHash: Field,
     stateRoot: Field,
     networkStateHash: Field,
+    blockHashRoot: Field,
+    eternalTransactionsHash: Field,
+    incomingMessagesHash: Field,
+    closed: Bool,
+    blockNumber: Field,
 }) {
+    equals(input, closed, blockNumber) {
+        const output2 = BlockProverPublicOutput.toFields({
+            ...input,
+            closed,
+            blockNumber,
+        });
+        const output1 = BlockProverPublicOutput.toFields(this);
+        return output1
+            .map((value1, index) => value1.equals(output2[index]))
+            .reduce((a, b) => a.and(b));
+    }
 }
 export class BlockProverExecutionData extends Struct({
-    transaction: ProtocolTransaction,
+    transaction: RuntimeTransaction,
+    signature: Signature,
     networkState: NetworkState,
-    transactionPosition: BlockTransactionPosition,
 }) {
 }

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

@@ -3,10 +3,15 @@ import { AreProofsEnabled, PlainZkProgram, WithZkProgrammable, ZkProgrammable }
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
 import { ProtocolModule } from "../../protocol/ProtocolModule";
 import { StateTransitionProof, StateTransitionProverPublicInput, StateTransitionProverPublicOutput } from "../statetransition/StateTransitionProvable";
-import { BlockProvable, BlockProverExecutionData, BlockProverProof, BlockProverPublicInput, BlockProverPublicOutput } from "./BlockProvable";
 import { ProvableTransactionHook } from "../../protocol/ProvableTransactionHook";
 import { ProvableBlockHook } from "../../protocol/ProvableBlockHook";
+import { NetworkState } from "../../model/network/NetworkState";
+import { BlockProvable, BlockProverExecutionData, BlockProverProof, BlockProverPublicInput, BlockProverPublicOutput } from "./BlockProvable";
+import { BlockHashMerkleTreeWitness } from "./accummulators/BlockHashMerkleTree";
 export interface BlockProverState {
+    /**
+     * The current state root of the block prover
+     */
     stateRoot: Field;
     /**
      * The current commitment of the transaction-list which
@@ -18,7 +23,21 @@ export interface BlockProverState {
      * This value is the same for the whole batch (L2 block)
      */
     networkStateHash: Field;
+    /**
+     * The root of the merkle tree encoding all block hashes,
+     * see `BlockHashMerkleTree`
+     */
+    blockHashRoot: Field;
+    /**
+     * A variant of the transactionsHash that is never reset.
+     * Thought for usage in the sequence state mempool.
+     * In comparison, transactionsHash restarts at 0 for every new block
+     */
+    eternalTransactionsHash: Field;
+    incomingMessagesHash: Field;
 }
+export type BlockProof = Proof<BlockProverPublicInput, BlockProverPublicOutput>;
+export type RuntimeProof = Proof<void, MethodPublicOutput>;
 export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverPublicInput, BlockProverPublicOutput> {
     private readonly prover;
     readonly stateTransitionProver: ZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>;
@@ -33,16 +52,17 @@ export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverP
      *
      * @param state The from-state of the BlockProver
      * @param stateTransitionProof
-     * @param appProof
+     * @param runtimeProof
      * @param executionData
      * @returns The new BlockProver-state to be used as public output
      */
-    applyTransaction(state: BlockProverState, stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, appProof: Proof<void, MethodPublicOutput>, executionData: BlockProverExecutionData): BlockProverState;
-    assertProtocolTransitions(stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, executionData: BlockProverExecutionData): void;
-    private getBeforeBlockNetworkState;
-    private getAfterBlockNetworkState;
+    applyTransaction(state: BlockProverState, stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtimeProof: RuntimeProof, executionData: BlockProverExecutionData): BlockProverState;
+    assertProtocolTransitions(stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, executionData: BlockProverExecutionData, runtimeProof: Proof<void, MethodPublicOutput>): void;
+    private executeBlockHooks;
     private addTransactionToBundle;
-    proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, appProof: Proof<void, MethodPublicOutput>, executionData: BlockProverExecutionData): BlockProverPublicOutput;
+    proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, runtimeProof: RuntimeProof, executionData: BlockProverExecutionData): BlockProverPublicOutput;
+    private assertSTProofInput;
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof): BlockProverPublicOutput;
     merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): BlockProverPublicOutput;
     /**
      * Creates the BlockProver ZkProgram.
@@ -61,7 +81,8 @@ export declare class BlockProver extends ProtocolModule implements BlockProvable
     readonly runtime: WithZkProgrammable<undefined, MethodPublicOutput>;
     zkProgrammable: BlockProverProgrammable;
     constructor(stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtime: WithZkProgrammable<undefined, MethodPublicOutput>, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[]);
-    merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): BlockProverPublicOutput;
     proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, appProof: Proof<void, MethodPublicOutput>, executionData: BlockProverExecutionData): BlockProverPublicOutput;
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, transactionProof: BlockProverProof): BlockProverPublicOutput;
+    merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): 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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"}