@proto-kit/protocol 0.1.1-develop.1316 → 0.1.1-develop.1347

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

package/dist/prover/block/BlockProvable.js

@@ -1,20 +1,61 @@
+// eslint-disable-next-line max-classes-per-file
 import { Bool, DynamicProof, Field, Signature, Struct, Void, } from "o1js";
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
 import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
 import { NetworkState } from "../../model/network/NetworkState";
-export class BlockProverPublicInput extends Struct({
+import { TransactionHashList } from "../accumulators/TransactionHashList";
+import { MinaActionsHashList } from "../../utils/MinaPrefixedProvableHashList";
+import { AppliedBatchHashList } from "../accumulators/AppliedBatchHashList";
+import { WitnessedRootHashList, } from "../accumulators/WitnessedRootHashList";
+import { RuntimeVerificationKeyAttestation } from "./accummulators/RuntimeVerificationKeyTree";
+// TODO Sort and organize public inputs and outputs
+export class BlockProverStateCommitments extends Struct({
     transactionsHash: Field,
     stateRoot: Field,
+    // Commitment to the list of unprocessed (pending) batches of STs that need to be proven
+    pendingSTBatchesHash: Field,
+    witnessedRootsHash: Field,
     networkStateHash: Field,
     blockHashRoot: Field,
     eternalTransactionsHash: Field,
     incomingMessagesHash: Field,
     blockNumber: Field,
 }) {
+    static fromBlockProverState(state) {
+        return {
+            networkStateHash: state.networkState.hash(),
+            stateRoot: state.stateRoot,
+            blockNumber: state.blockNumber,
+            blockHashRoot: state.blockHashRoot,
+            pendingSTBatchesHash: state.pendingSTBatches.commitment,
+            transactionsHash: state.transactionList.commitment,
+            eternalTransactionsHash: state.eternalTransactionsList.commitment,
+            incomingMessagesHash: state.incomingMessages.commitment,
+            witnessedRootsHash: state.witnessedRoots.commitment,
+        };
+    }
+    static toBlockProverState(publicInput, networkState) {
+        publicInput.networkStateHash.assertEquals(networkState.hash(), "ExecutionData Networkstate doesn't equal public input hash");
+        return {
+            networkState,
+            stateRoot: publicInput.stateRoot,
+            blockHashRoot: publicInput.blockHashRoot,
+            transactionList: new TransactionHashList(publicInput.transactionsHash),
+            eternalTransactionsList: new TransactionHashList(publicInput.eternalTransactionsHash),
+            incomingMessages: new MinaActionsHashList(publicInput.incomingMessagesHash),
+            pendingSTBatches: new AppliedBatchHashList(publicInput.pendingSTBatchesHash),
+            witnessedRoots: new WitnessedRootHashList(publicInput.witnessedRootsHash),
+            blockNumber: publicInput.blockNumber,
+        };
+    }
+}
+export class BlockProverPublicInput extends BlockProverStateCommitments {
 }
 export class BlockProverPublicOutput extends Struct({
     transactionsHash: Field,
     stateRoot: Field,
+    pendingSTBatchesHash: Field,
+    witnessedRootsHash: Field,
     networkStateHash: Field,
     blockHashRoot: Field,
     eternalTransactionsHash: Field,
@@ -33,10 +74,10 @@ export class BlockProverPublicOutput extends Struct({
             .reduce((a, b) => a.and(b));
     }
 }
-export class BlockProverExecutionData extends Struct({
+export class BlockProverTransactionArguments extends Struct({
     transaction: RuntimeTransaction,
     signature: Signature,
-    networkState: NetworkState,
+    verificationKeyAttestation: RuntimeVerificationKeyAttestation,
 }) {
 }
 export class DynamicRuntimeProof extends DynamicProof {
@@ -45,4 +86,15 @@ DynamicRuntimeProof.publicInputType = Void;
 DynamicRuntimeProof.publicOutputType = MethodPublicOutput;
 // TODO this won't be 0 for proofs-as-args
 DynamicRuntimeProof.maxProofsVerified = 0;
+export class BlockProverSingleTransactionExecutionData extends Struct({
+    transaction: BlockProverTransactionArguments,
+    networkState: NetworkState,
+}) {
+}
+export class BlockProverMultiTransactionExecutionData extends Struct({
+    transaction1: BlockProverTransactionArguments,
+    transaction2: BlockProverTransactionArguments,
+    networkState: NetworkState,
+}) {
+}
 //# sourceMappingURL=BlockProvable.js.map

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

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

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

@@ -1,73 +1,73 @@
-import { DynamicProof, Field, Proof, VerificationKey } from "o1js";
+import { Bool, Field, Proof } from "o1js";
 import { AreProofsEnabled, CompilableModule, CompileArtifact, CompileRegistry, PlainZkProgram, WithZkProgrammable, ZkProgrammable } from "@proto-kit/common";
 import { MethodPublicOutput } from "../../model/MethodPublicOutput";
 import { ProtocolModule } from "../../protocol/ProtocolModule";
 import { StateTransitionProof, StateTransitionProvable, StateTransitionProverPublicInput, StateTransitionProverPublicOutput } from "../statetransition/StateTransitionProvable";
+import { RuntimeTransaction } from "../../model/transaction/RuntimeTransaction";
 import { ProvableTransactionHook } from "../../protocol/ProvableTransactionHook";
-import { ProvableBlockHook } from "../../protocol/ProvableBlockHook";
+import { AfterBlockHookArguments, BeforeBlockHookArguments, ProvableBlockHook } from "../../protocol/ProvableBlockHook";
 import { NetworkState } from "../../model/network/NetworkState";
-import { BlockProvable, BlockProverExecutionData, BlockProverProof, BlockProverPublicInput, BlockProverPublicOutput, DynamicRuntimeProof } from "./BlockProvable";
+import { WitnessedRootWitness } from "../accumulators/WitnessedRootHashList";
+import { StateServiceProvider } from "../../state/StateServiceProvider";
+import { AppliedStateTransitionBatch } from "../../model/AppliedStateTransitionBatch";
+import { BlockProvable, BlockProverProof, BlockProverPublicInput, BlockProverPublicOutput, DynamicRuntimeProof, BlockProverMultiTransactionExecutionData, BlockProverTransactionArguments, BlockProverSingleTransactionExecutionData, BlockProverState } from "./BlockProvable";
 import { BlockHashMerkleTreeWitness } from "./accummulators/BlockHashMerkleTree";
-import { MinimalVKTreeService, RuntimeVerificationKeyAttestation } from "./accummulators/RuntimeVerificationKeyTree";
+import { MinimalVKTreeService } from "./accummulators/RuntimeVerificationKeyTree";
 import { RuntimeVerificationKeyRootService } from "./services/RuntimeVerificationKeyRootService";
-export interface BlockProverState {
-    /**
-     * The current state root of the block prover
-     */
-    stateRoot: Field;
-    /**
-     * The current commitment of the transaction-list which
-     * will at the end equal the bundle hash
-     */
-    transactionsHash: Field;
-    /**
-     * The network state which gives access to values such as blockHeight
-     * 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;
-}
+type ApplyTransactionArguments = Omit<BlockProverTransactionArguments, "verificationKeyAttestation">;
 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>;
-    readonly runtime: ZkProgrammable<undefined, MethodPublicOutput>;
     private readonly transactionHooks;
     private readonly blockHooks;
+    private readonly stateServiceProvider;
     private readonly verificationKeyService;
-    constructor(prover: BlockProver, stateTransitionProver: ZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtime: ZkProgrammable<undefined, MethodPublicOutput>, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[], verificationKeyService: MinimalVKTreeService);
+    constructor(prover: BlockProver, stateTransitionProver: ZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, transactionHooks: ProvableTransactionHook<unknown>[], blockHooks: ProvableBlockHook<unknown>[], stateServiceProvider: StateServiceProvider, verificationKeyService: MinimalVKTreeService);
     name: string;
     get areProofsEnabled(): AreProofsEnabled | undefined;
     /**
      * Applies and checks the two proofs and applies the corresponding state
-     * changes to the given state
+     * changes to the given state.
      *
-     * @param state The from-state of the BlockProver
-     * @param stateTransitionProof
-     * @param runtimeProof
+     * The rough high level workflow of this function:
+     * 1. Execute beforeTransaction hooks, pushing the ST batch
+     * 2. Add Transaction to bundle, meaning appending it to all the respective commitments
+     * 3. Push the runtime ST batch
+     * 4. Execute afterTransaction hooks, pushing the ST batch
+     * 5. Some consistency checks and signature verification
+     *
+     * @param fromState The from-state of the BlockProver
+     * @param runtimeOutput
      * @param executionData
-     * @param verificationKey
+     * @param networkState
      * @returns The new BlockProver-state to be used as public output
      */
-    applyTransaction(state: BlockProverState, stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, runtimeProof: DynamicRuntimeProof, executionData: BlockProverExecutionData, verificationKey: VerificationKey): Promise<BlockProverState>;
-    assertProtocolTransitions(stateTransitionProof: Proof<StateTransitionProverPublicInput, StateTransitionProverPublicOutput>, executionData: BlockProverExecutionData, runtimeProof: DynamicProof<void, MethodPublicOutput>): Promise<void>;
-    private executeBlockHooks;
-    private addTransactionToBundle;
-    proveTransaction(publicInput: BlockProverPublicInput, stateProof: StateTransitionProof, runtimeProof: DynamicRuntimeProof, executionData: BlockProverExecutionData, verificationKeyWitness: RuntimeVerificationKeyAttestation): Promise<BlockProverPublicOutput>;
-    private assertSTProofInput;
-    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
+    applyTransaction(fromState: BlockProverState, runtimeOutput: MethodPublicOutput, executionData: ApplyTransactionArguments, networkState: NetworkState): Promise<BlockProverState>;
+    /**
+     * Constructs a AppliedBatch based on a list of STs and the flag whether to
+     * be applied or not. The AppliedBatch is a condensed commitment to a batch
+     * of STs.
+     */
+    private constructBatch;
+    private executeTransactionHooks;
+    private executeHooks;
+    executeBlockHooks<T extends BeforeBlockHookArguments | AfterBlockHookArguments>(hook: (module: ProvableBlockHook<unknown>, networkState: NetworkState, args: T) => Promise<NetworkState>, hookArguments: T, inputNetworkState: NetworkState): Promise<{
+        batch: AppliedStateTransitionBatch;
+        result: NetworkState;
+    }>;
+    addTransactionToBundle<T extends Pick<BlockProverState, "transactionList" | "eternalTransactionsList" | "incomingMessages">>(state: T, isMessage: Bool, transaction: RuntimeTransaction): T;
+    private verifyVerificationKeyAttestation;
+    proveTransactionInternal(fromState: BlockProverState, runtimeProof: DynamicRuntimeProof, { transaction, networkState }: BlockProverSingleTransactionExecutionData): Promise<BlockProverState>;
+    private staticChecks;
+    proveTransaction(publicInput: BlockProverPublicInput, runtimeProof: DynamicRuntimeProof, executionData: BlockProverSingleTransactionExecutionData): Promise<BlockProverPublicOutput>;
+    proveTransactions(publicInput: BlockProverPublicInput, runtimeProof1: DynamicRuntimeProof, runtimeProof2: DynamicRuntimeProof, executionData: BlockProverMultiTransactionExecutionData): Promise<BlockProverPublicOutput>;
+    includeSTProof(stateTransitionProof: StateTransitionProof, apply: Bool, stateRoot: Field, pendingSTBatchesHash: Field, witnessedRootsHash: Field): {
+        stateRoot: Field;
+        pendingSTBatchesHash: Field;
+        witnessedRootsHash: Field;
+    };
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, deferSTProof: Bool, afterBlockRootWitness: WitnessedRootWitness, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
     merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): Promise<BlockProverPublicOutput>;
     /**
      * Creates the BlockProver ZkProgram.
@@ -85,10 +85,12 @@ export declare class BlockProver extends ProtocolModule implements BlockProvable
     readonly stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> & StateTransitionProvable;
     readonly runtime: WithZkProgrammable<undefined, MethodPublicOutput> & CompilableModule;
     zkProgrammable: BlockProverProgrammable;
-    constructor(stateTransitionProver: WithZkProgrammable<StateTransitionProverPublicInput, StateTransitionProverPublicOutput> & StateTransitionProvable, runtime: WithZkProgrammable<undefined, MethodPublicOutput> & CompilableModule, 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>[], stateServiceProvider: StateServiceProvider, 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, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
+    proveTransaction(publicInput: BlockProverPublicInput, runtimeProof: DynamicRuntimeProof, executionData: BlockProverSingleTransactionExecutionData): Promise<BlockProverPublicOutput>;
+    proveTransactions(publicInput: BlockProverPublicInput, runtimeProof1: DynamicRuntimeProof, runtimeProof2: DynamicRuntimeProof, executionData: BlockProverMultiTransactionExecutionData): Promise<BlockProverPublicOutput>;
+    proveBlock(publicInput: BlockProverPublicInput, networkState: NetworkState, blockWitness: BlockHashMerkleTreeWitness, stateTransitionProof: StateTransitionProof, deferSTs: Bool, afterBlockRootWitness: WitnessedRootWitness, transactionProof: BlockProverProof): Promise<BlockProverPublicOutput>;
     merge(publicInput: BlockProverPublicInput, proof1: BlockProverProof, proof2: BlockProverProof): Promise<BlockProverPublicOutput>;
 }
+export {};
 //# 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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"}