v2 fixes

docs/zkapps/o1js/recursion.mdx

@@ -35,9 +35,9 @@ zkProgram is available as a top-level import. `Experimental.ZkProgram` is deprec
 
 In o1js, you can use `ZkProgram()` to define the steps of a recursive program. Like `SmartContract()` methods, `ZkProgram()` methods execute off-chain.
 
-After performing the desired recursive steps, you can settle the interaction on Mina's blockchain by embedding  `ZkProgram` within a `SmartContract` method that verifies the underlying proof of execution and extracts the output that can be used elsewhere in the method (like storing the output in app-state, for example).
+After performing the desired recursive steps, you can settle the interaction on Mina's blockchain by embedding `ZkProgram` within a `SmartContract` method that verifies the underlying proof of execution and extracts the output that can be used elsewhere in the method (like storing the output in app-state, for example).
 
-Similar to methods within the `SmartContract` class, inputs to `ZkProgram` are _private by default_ and are never seen by the Mina network.  Unlike `SmartContract` methods, as the zkApp developer you choose the shape of the public input to all methods within a `ZkProgram`.
+Similar to methods within the `SmartContract` class, inputs to `ZkProgram` are _private by default_ and are never seen by the Mina network. Unlike `SmartContract` methods, as the zkApp developer you choose the shape of the public input to all methods within a `ZkProgram`.
 
 ## Example: Recursively verify a simple program in a zkApp
 
@@ -47,18 +47,18 @@ This simple example has only one method that proves the public input it received
 import { Field, ZkProgram } from 'o1js';
 
 const SimpleProgram = ZkProgram({
-  name: "simple-program-example",
+  name: 'simple-program-example',
   publicInput: Field,
 
   methods: {
-   run: {
+    run: {
       privateInputs: [],
 
       async method(publicInput: Field) {
         publicInput.assertEquals(Field(0));
       },
-    }
-  }
+    },
+  },
 });
 ```
 
@@ -71,7 +71,7 @@ const { verificationKey } = await SimpleProgram.compile();
 Now, you can use it to create a proof:
 
 ```typescript
-const proof = await SimpleProgram.run(Field(0));
+const { proof } = await SimpleProgram.run(Field(0));
 ```
 
 To verify this proof from within any method of your `SmartContract` class:
@@ -98,7 +98,7 @@ This program describes a recursive operation of adding one repeatedly to a numbe
 import { SelfProof, Field, ZkProgram, verify } from 'o1js';
 
 const AddOne = ZkProgram({
-  name: "add-one-example",
+  name: 'add-one-example',
   publicInput: Field,
 
   methods: {
@@ -129,19 +129,19 @@ First, compile this program and make the base proof as before:
 ```typescript
 const { verificationKey } = await AddOne.compile();
 
-const proof = await AddOne.baseCase(Field(0));
+const { proof } = await AddOne.baseCase(Field(0));
 ```
 
 This time, use this proof as input to recursively add one again:
 
 ```typescript
-const proof1 = await AddOne.step(Field(1), proof);
+const { proof: proof1 } = await AddOne.step(Field(1), proof);
 ```
 
 Repeat this as many times as you want:
 
 ```typescript
-const proof2 = await AddOne.step(Field(2), proof1);
+const { proof: proof2 } = await AddOne.step(Field(2), proof1);
 ```
 
 Finally, verify the proof from within a SmartContract like the earlier example:
@@ -164,14 +164,14 @@ This example program describes a very simple rollup for adding numbers:
 import { SelfProof, Field, ZkProgram, verify } from 'o1js';
 
 let RollupAdd = ZkProgram({
-  name: "rollup-add-example",
+  name: 'rollup-add-example',
   publicInput: Field,
 
   methods: {
     baseCase: {
       privateInputs: [],
 
-      async method(publicInput: Field) { },
+      async method(publicInput: Field) {},
     },
 
     step: {
@@ -199,7 +199,7 @@ You can also use ZkProgram directly to prove and verify arbitrary zero knowledge
 ```typescript
 const { verificationKey } = await MyProgram.compile();
 
-const proof = await MyProgram.base(Field(0));
+const { proof } = await MyProgram.base(Field(0));
 ```
 
 Now you can directly verify a JSON-encoded version of the proof to get back a boolean value that tells you if the proof is valid:

docs/zkapps/tutorials/09-recursion.mdx

@@ -199,15 +199,15 @@ async function main() {
 
   console.log('making proof 0');
 
-  const proof0 = await Add.init(Field(0));
+  const { proof: proof0 } = await Add.init(Field(0));
 
   console.log('making proof 1');
 
-  const proof1 = await Add.addNumber(Field(4), proof0, Field(4));
+  const { proof: proof1 } = await Add.addNumber(Field(4), proof0, Field(4));
 
   console.log('making proof 2');
 
-  const proof2 = await Add.add(Field(4), proof1, proof0);
+  const { proof: proof2 } = await Add.add(Field(4), proof1, proof0);
 
   console.log('verifying proof 2');
   console.log('proof 2 data', proof2.publicInput.toString());

examples/zkapps/01-hello-world/package.json

@@ -43,6 +43,6 @@
     "typescript": "^5.6"
   },
   "peerDependencies": {
-    "o1js": "1.*"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   }
 }

examples/zkapps/02-private-inputs-and-hash-functions/package.json

@@ -43,6 +43,6 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "o1js": "1.*"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   }
 }

examples/zkapps/04-zkapp-browser-ui/contracts/package.json

@@ -36,7 +36,7 @@
     "typescript": "^5.6"
   },
   "peerDependencies": {
-    "o1js": "^1.*"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   },
   "engines": {
     "node": ">=18.14.0"

examples/zkapps/05-common-types-and-functions/package.json

@@ -43,6 +43,6 @@
     "typescript": "^5.6.3"
   },
   "peerDependencies": {
-    "o1js": "1.8.0"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   }
 }

examples/zkapps/07-oracles/contracts/package.json

@@ -43,6 +43,6 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "o1js": "1.0.*"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   }
 }

examples/zkapps/09-recursion/package.json

@@ -43,6 +43,6 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "o1js": "1.*"
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@b04520d"
   }
 }

examples/zkapps/09-recursion/src/Add.ts

@@ -51,15 +51,15 @@ async function main() {
 
   console.log('making proof 0');
 
-  const proof0 = await Add.init(Field(0));
+  const { proof: proof0 } = await Add.init(Field(0));
 
   console.log('making proof 1');
 
-  const proof1 = await Add.addNumber(Field(4), proof0, Field(4));
+  const { proof: proof1 } = await Add.addNumber(Field(4), proof0, Field(4));
 
   console.log('making proof 2');
 
-  const proof2 = await Add.add(Field(4), proof1, proof0);
+  const { proof: proof2 } = await Add.add(Field(4), proof1, proof0);
 
   console.log('verifying proof 2');
   console.log('proof 2 data', proof2.publicInput.toString());

examples/zkapps/09-recursion/src/rollup.ts

@@ -84,7 +84,7 @@ async function main() {
       increment,
       witness
     );
-    const proof = await Rollup.oneStep(
+    const { proof } = await Rollup.oneStep(
       rollup,
       initialRoot,
       latestRoot,
@@ -110,7 +110,11 @@ async function main() {
       proof.publicInput,
       rollupProofs[i].publicInput
     );
-    let mergedProof = await Rollup.merge(rollup, proof, rollupProofs[i]);
+    let { proof: mergedProof } = await Rollup.merge(
+      rollup,
+      proof,
+      rollupProofs[i]
+    );
     proof = mergedProof;
   }
 

examples/zkapps/09-recursion/src/vote.ts

@@ -33,7 +33,7 @@ async function main() {
   );
 
   const vote0 = VoteState.newVote(votersTree.getRoot());
-  const proof0 = await Vote.create(vote0);
+  const { proof: proof0 } = await Vote.create(vote0);
 
   console.log('making proof 1');
 
@@ -51,7 +51,7 @@ async function main() {
     voterTreeWitness1,
     nullifierWitness1
   );
-  const proof1 = await Vote.applyVote(
+  const { proof: proof1 } = await Vote.applyVote(
     vote1,
     proof0,
     Bool(true),
@@ -77,7 +77,7 @@ async function main() {
     voterTreeWitness2,
     nullifierWitness2
   );
-  const proof2 = await Vote.applyVote(
+  const { proof: proof2 } = await Vote.applyVote(
     vote2,
     proof1,
     Bool(false),