fix batch reducer

o1-labs · Sep 24, 2024 · a91ed3a · a91ed3a
1 parent 73e509a
commit a91ed3a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/src/lib/mina/actions/batch-reducer-program.unit-test.ts b/src/lib/mina/actions/batch-reducer-program.unit-test.ts
@@ -52,7 +52,7 @@ await describe('action stack prover', async () => {
     let { isEmpty, proof } = await proveActionStack(
       endActionState,
       witnesses,
-      stackProgram as any
+      stackProgram
     );
     console.timeEnd('prove');
 
@@ -67,7 +67,7 @@ await describe('action stack prover', async () => {
     let { isEmpty, proof } = await proveActionStack(
       endActionState,
       witnesses,
-      stackProgram as any
+      stackProgram
     );
     console.timeEnd('prove');
 

diff --git a/src/lib/mina/actions/batch-reducer.ts b/src/lib/mina/actions/batch-reducer.ts
@@ -143,7 +143,7 @@ class BatchReducer<
     this.Batch = ActionBatch(this.actionType);
 
     this.maxUpdatesFinalProof = maxUpdatesFinalProof;
-    this.program = actionStackProgram(maxUpdatesPerProof) as any;
+    this.program = actionStackProgram(maxUpdatesPerProof);
     this.BatchProof = ZkProgram.Proof(this.program);
 
     assert(
@@ -689,12 +689,12 @@ async function proveActionStack(
 
   for (let i = nChunks - 1; i >= 0; i--) {
     let isRecursive = Bool(i < nChunks - 1);
-    proof = await program.proveChunk(
+    ({ proof } = await program.proveChunk(
       endActionState,
       proof,
       isRecursive,
       chunks[i]
-    );
+    ));
   }
   // sanity check
   proof.publicOutput.stack.assertEquals(stack.hash, 'Stack hash mismatch');
@@ -729,7 +729,7 @@ type ActionStackProgram = {
     proofSoFar: ActionStackProof,
     isRecursive: Bool,
     actionWitnesses: Unconstrained<ActionWitnesses>
-  ): Promise<ActionStackProof>;
+  ): Promise<{ proof: ActionStackProof }>;
 
   maxUpdatesPerProof: number;
 };
@@ -799,14 +799,12 @@ function actionStackProgram(maxUpdatesPerProof: number) {
             proofSoFar.publicOutput,
             initialState
           );
-
-          return {
-            publicOutput: actionStackChunk(
-              maxUpdatesPerProof,
-              startState,
-              witnesses
-            ),
-          };
+          let publicOutput = actionStackChunk(
+            maxUpdatesPerProof,
+            startState,
+            witnesses
+          );
+          return { publicOutput };
         },
       },
     },

diff --git a/src/lib/mina/actions/offchain-state-rollup.ts b/src/lib/mina/actions/offchain-state-rollup.ts
@@ -176,15 +176,13 @@ function OffchainStateRollup({
           actions: ActionIterator,
           tree: IndexedMerkleMapN
         ) {
-          let commitment = merkleUpdateBatch(
+          let commitments = merkleUpdateBatch(
             { maxActionsPerProof, maxActionsPerUpdate },
             stateA,
             actions,
             tree
           );
-          return {
-            publicOutput: commitment,
-          };
+          return { publicOutput: commitments };
         },
       },
       /**

diff --git a/src/lib/proof-system/zkprogram.ts b/src/lib/proof-system/zkprogram.ts
@@ -923,8 +923,7 @@ type ZkProgram<
       InferProvableOrVoid<Get<Config, 'publicOutput'>>,
       Config['methods'][I]
     >;
-  },
-  _Unused extends any = any // TODO remove, left here to be non-breaking
+  }
 > = ReturnType<typeof ZkProgram<Config, Methods>>;
 
 class SelfProof<PublicInput, PublicOutput> extends Proof<