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

package/src/prover/block/BlockProvable.ts

@@ -1,23 +1,48 @@
-import { Bool, Field, Proof, Struct } from "o1js";
+import { Bool, Field, Proof, Signature, Struct } 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";
 
 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,
+}) {
+  public equals(
+    input: BlockProverPublicInput,
+    closed: Bool,
+    blockNumber: Field
+  ): Bool {
+    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 type BlockProverProof = Proof<
   BlockProverPublicInput,
@@ -25,9 +50,9 @@ export type BlockProverProof = Proof<
 >;
 
 export class BlockProverExecutionData extends Struct({
-  transaction: ProtocolTransaction,
+  transaction: RuntimeTransaction,
+  signature: Signature,
   networkState: NetworkState,
-  transactionPosition: BlockTransactionPosition,
 }) {}
 
 export interface BlockProvable
@@ -39,6 +64,14 @@ export interface BlockProvable
     executionData: BlockProverExecutionData
   ) => BlockProverPublicOutput;
 
+  proveBlock: (
+    publicInput: BlockProverPublicInput,
+    networkState: NetworkState,
+    blockWitness: BlockHashMerkleTreeWitness,
+    stateTransitionProof: StateTransitionProof,
+    transactionProof: BlockProverProof
+  ) => BlockProverPublicOutput;
+
   merge: (
     publicInput: BlockProverPublicInput,
     proof1: BlockProverProof,