Merge pull request #252 from proto-kit/refactor/tasks

Refactored tasks for old proving pipeline

Author: rpanic

packages/sequencer/src/index.ts

@@ -24,12 +24,20 @@ export * from "./protocol/baselayer/MinaBaseLayer";
 export * from "./protocol/baselayer/NoopBaseLayer";
 export * from "./protocol/production/helpers/UntypedOption";
 export * from "./protocol/production/helpers/UntypedStateTransition";
-export * from "./protocol/production/tasks/BlockProvingTask";
+export * from "./protocol/production/tasks/TransactionProvingTask";
 export * from "./protocol/production/tasks/RuntimeProvingTask";
-export * from "./protocol/production/tasks/RuntimeTaskParameters";
 export * from "./protocol/production/tasks/StateTransitionTask";
-export * from "./protocol/production/tasks/StateTransitionTaskParameters";
+export * from "./protocol/production/tasks/StateTransitionReductionTask";
 export * from "./protocol/production/tasks/NewBlockTask";
+export * from "./protocol/production/tasks/serializers/ArtifactionRecordSerializer";
+export * from "./protocol/production/tasks/serializers/BlockProofSerializer";
+export * from "./protocol/production/tasks/serializers/DecodedStateSerializer";
+export * from "./protocol/production/tasks/serializers/NewBlockProvingParametersSerializer";
+export * from "./protocol/production/tasks/serializers/RuntimeProofParametersSerializer";
+export * from "./protocol/production/tasks/serializers/RuntimeVerificationKeyAttestationSerializer";
+export * from "./protocol/production/tasks/serializers/StateTransitionParametersSerializer";
+export * from "./protocol/production/tasks/serializers/TransactionProvingTaskParameterSerializer";
+export * from "./protocol/production/tasks/serializers/VerificationKeySerializer";
 export * from "./protocol/production/trigger/BlockTrigger";
 export * from "./protocol/production/trigger/ManualBlockTrigger";
 export * from "./protocol/production/trigger/TimedBlockTrigger";

packages/sequencer/src/protocol/production/BatchProducerModule.ts

@@ -24,13 +24,13 @@ import { BlockResult, BlockWithResult } from "../../storage/model/Block";
 import { VerificationKeyService } from "../runtime/RuntimeVerificationKeyService";
 import type { Database } from "../../storage/Database";
 
-import { BlockProverParameters } from "./tasks/BlockProvingTask";
-import { StateTransitionProofParameters } from "./tasks/StateTransitionTaskParameters";
-import { RuntimeProofParameters } from "./tasks/RuntimeTaskParameters";
 import { TransactionTraceService } from "./TransactionTraceService";
 import { BlockTaskFlowService } from "./BlockTaskFlowService";
 import { NewBlockProverParameters } from "./tasks/NewBlockTask";
-import { BlockProofSerializer } from "./helpers/BlockProofSerializer";
+import { BlockProofSerializer } from "./tasks/serializers/BlockProofSerializer";
+import { RuntimeProofParameters } from "./tasks/RuntimeProvingTask";
+import { StateTransitionProofParameters } from "./tasks/StateTransitionTask";
+import { BlockProverParameters } from "./tasks/TransactionProvingTask";
 
 export type StateRecord = Record<string, Field[] | undefined>;
 

packages/sequencer/src/protocol/production/BlockTaskFlowService.ts

@@ -15,23 +15,21 @@ import { TaskQueue } from "../../worker/queue/TaskQueue";
 import { Flow, FlowCreator } from "../../worker/flow/Flow";
 
 import type { BlockTrace } from "./BatchProducerModule";
-import {
-  StateTransitionReductionTask,
-  StateTransitionTask,
-} from "./tasks/StateTransitionTask";
+import { StateTransitionTask } from "./tasks/StateTransitionTask";
 import { RuntimeProvingTask } from "./tasks/RuntimeProvingTask";
-import {
-  BlockProverParameters,
-  BlockProvingTask,
-  BlockProvingTaskParameters,
-  BlockReductionTask,
-} from "./tasks/BlockProvingTask";
 import { ReductionTaskFlow } from "./flow/ReductionTaskFlow";
 import {
   NewBlockProverParameters,
   NewBlockProvingParameters,
   NewBlockTask,
 } from "./tasks/NewBlockTask";
+import { StateTransitionReductionTask } from "./tasks/StateTransitionReductionTask";
+import {
+  BlockProverParameters,
+  TransactionProvingTask,
+  TransactionProvingTaskParameters,
+} from "./tasks/TransactionProvingTask";
+import { BlockReductionTask } from "./tasks/BlockReductionTask";
 
 type RuntimeProof = Proof<undefined, MethodPublicOutput>;
 
@@ -50,7 +48,7 @@ interface BlockProductionFlowState {
 }
 
 /**
- * We could rename this into BlockCreationStategy and enable the injection of
+ * We could rename this into BlockCreationStrategy and enable the injection of
  * different creation strategies.
  */
 @injectable()
@@ -62,7 +60,7 @@ export class BlockTaskFlowService {
     private readonly stateTransitionTask: StateTransitionTask,
     private readonly stateTransitionReductionTask: StateTransitionReductionTask,
     private readonly runtimeProvingTask: RuntimeProvingTask,
-    private readonly transactionProvingTask: BlockProvingTask,
+    private readonly transactionProvingTask: TransactionProvingTask,
     private readonly blockProvingTask: NewBlockTask,
     private readonly blockReductionTask: BlockReductionTask,
     @inject("Protocol")
@@ -72,7 +70,7 @@ export class BlockTaskFlowService {
   public async pushPairing(
     flow: Flow<BlockProductionFlowState>,
     transactionReductionTask: ReductionTaskFlow<
-      BlockProvingTaskParameters,
+      TransactionProvingTaskParameters,
       BlockProof
     >,
     blockIndex: number,

packages/sequencer/src/protocol/production/TransactionTraceService.ts

@@ -26,8 +26,8 @@ import { AsyncMerkleTreeStore } from "../../state/async/AsyncMerkleTreeStore";
 import { VerificationKeyService } from "../runtime/RuntimeVerificationKeyService";
 
 import type { TransactionTrace, BlockTrace } from "./BatchProducerModule";
-import { StateTransitionProofParameters } from "./tasks/StateTransitionTaskParameters";
 import { UntypedStateTransition } from "./helpers/UntypedStateTransition";
+import { StateTransitionProofParameters } from "./tasks/StateTransitionTask";
 
 export type TaskStateRecord = Record<string, Field[]>;