Add in MerkleWitnesses to Batch

proto-kit · Nov 8, 2024 · fd12704 · fd12704
1 parent f125d7e
commit fd12704
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/protocol/src/model/StateTransitionProvableBatch.ts b/packages/protocol/src/model/StateTransitionProvableBatch.ts
@@ -70,12 +70,11 @@ export class StateTransitionProvableBatch extends Struct({
     transitions: {
       transition: ProvableStateTransition;
       type: ProvableStateTransitionType;
-      merkleWitnesses: RollupMerkleTreeWitness;
-    }[]
+    }[],
+    merkleWitnesses: RollupMerkleTreeWitness[]
   ): StateTransitionProvableBatch {
     const batch = transitions.map((entry) => entry.transition);
     const transitionTypes = transitions.map((entry) => entry.type);
-    const merkleWitnesses = transitions.map((entry) => entry.merkleWitnesses);
 
     // Check that order is correct
     let normalSTsStarted = false;

diff --git a/packages/sequencer/src/protocol/production/tasks/StateTransitionTask.ts b/packages/sequencer/src/protocol/production/tasks/StateTransitionTask.ts
@@ -68,6 +68,7 @@ export class StateTransitionTask
     witnessProviderReference.setWitnessProvider(witnessProvider);
 
     const stBatch = input.stateTransitions.slice();
+    const merkleWitnesses = input.merkleWitnesses.slice();
     // Array.from({
     //   length: ProtocolConstants.stateTransitionProverBatchSize - stBatch.length,
     // }).forEach(() => {
@@ -78,7 +79,7 @@ export class StateTransitionTask
 
     const output = await this.stateTransitionProver.runBatch(
       input.publicInput,
-      StateTransitionProvableBatch.fromMappings(stBatch)
+      StateTransitionProvableBatch.fromMappings(stBatch, merkleWitnesses)
     );
     log.debug("STTask public io:", {
       input: StateTransitionProverPublicInput.toJSON(input.publicInput),