Merge branch 'main' into feature/zkprogram-qol

Author: mitschabaude

.github/workflows/build-action.yml

@@ -311,6 +311,11 @@ jobs:
         env:
           INPUT_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      - name: Configure Git
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+
       - name: Tag new version
         if: ${{ steps.publish.outputs.type }} # https://github.com/JS-DevTools/npm-publish?tab=readme-ov-file#action-output
         env:

CHANGELOG.md

@@ -23,7 +23,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - `ZkProgram` to support non-pure provable types as inputs and outputs https://github.com/o1-labs/o1js/pull/1828
 - API for recursively proving a ZkProgram method from within another https://github.com/o1-labs/o1js/pull/1931
-  - `let recursive = Experimental.Recursive(program); recursive.<methodName>(...args): Promise<PublicOutput>`
+  - `let recursive = Experimental.Recursive(program);`
+  - `recursive.<methodName>(...args): Promise<PublicOutput>`
   - This also works within the same program, as long as the return value is type-annotated
 - Add `enforceTransactionLimits` parameter on Network https://github.com/o1-labs/o1js/issues/1910
 - Method for optional types to assert none https://github.com/o1-labs/o1js/pull/1922

src/lib/proof-system/recursive.ts

@@ -62,7 +62,7 @@ function Recursive<
 
   let methodKeys: MethodKey[] = Object.keys(methods);
 
-  let regularRecursiveProvers = mapObject(zkprogram, (prover, key) => {
+  let regularRecursiveProvers = mapToObject(methodKeys, (key) => {
     return async function proveRecursively_(
       publicInput: PublicInput,
       ...args: TupleToInstances<PrivateInputs[MethodKey]>
@@ -77,6 +77,9 @@ function Recursive<
         let constArgs = zip(args, privateInputs[key]).map(([arg, type]) =>
           Provable.toConstant(type, arg)
         );
+
+        let prover = zkprogram[key];
+
         if (hasPublicInput) {
           let { proof } = await prover(constInput, ...constArgs);
           return proof;