Merge pull request #700 from qwadratic/tutorial-9-fix

fix tutorial 9 typing errors added void type as a second param (where methods don’t return anything, and Field (where a method returns Field)
MinaProtocol · Nov 8, 2023 · b482165 · b482165 · vercel · Nov 8, 2023
2 parents 23f8069 + adb55d1
commit b482165
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/examples/zkapps/09-recursion/src/main.ts b/examples/zkapps/09-recursion/src/main.ts
@@ -68,7 +68,7 @@ const Add = ZkProgram({
     addNumber: {
       privateInputs: [SelfProof, Field ],
 
-      method(newState: Field, earlierProof: SelfProof<Field>, numberToAdd: Field) {
+      method(newState: Field, earlierProof: SelfProof<Field, void>, numberToAdd: Field) {
         earlierProof.verify();
         newState.assertEquals(earlierProof.publicInput.add(numberToAdd));
       },
@@ -79,8 +79,8 @@ const Add = ZkProgram({
 
       method(
         newState: Field, 
-        earlierProof1: SelfProof<Field>,
-        earlierProof2: SelfProof<Field>,
+        earlierProof1: SelfProof<Field, void>,
+        earlierProof2: SelfProof<Field, void>,
       ) {
         earlierProof1.verify();
         earlierProof2.verify();

diff --git a/examples/zkapps/09-recursion/src/rollup.ts b/examples/zkapps/09-recursion/src/rollup.ts
@@ -1,18 +1,9 @@
 import {
-  isReady,
-  shutdown,
   Field,
-  Mina,
-  PrivateKey,
-  AccountUpdate,
   SelfProof,
   ZkProgram,
   Struct,
-  Bool,
-  Circuit,
-  Poseidon,
   MerkleMap,
-  MerkleTree,
   MerkleWitness,
   MerkleMapWitness,
   verify,
@@ -23,14 +14,14 @@ import {
   DeployArgs,
   Proof,
   Permissions,
+  ZkProgram
 } from 'o1js';
 
 class MerkleWitness20 extends MerkleWitness(20) {}
 
 // ===============================================================
 
 async function main() {
-  await isReady;
 
   console.log('o1js loaded');
 
@@ -82,7 +73,7 @@ async function main() {
   //   const proof = await Rollup.oneStep(rollup, initialRoot, latestRoot, key, currentValue, increment, witness);
   //   return proof;
   // });
-  const rollupProofs: Proof<RollupState>[] = [];
+  const rollupProofs: Proof<RollupState, void>[] = [];
   for (var { initialRoot, latestRoot, key, currentValue, increment, witness } of rollupStepInfo) {
     const rollup = RollupState.createOneStep(initialRoot, latestRoot, key, currentValue, increment, witness);
     const proof = await Rollup.oneStep(rollup, initialRoot, latestRoot, key, currentValue, increment, witness);
@@ -97,7 +88,7 @@ async function main() {
   //   const rollup = RollupState.createMerged((await a).publicInput, (await b).publicInput);
   //   return await Rollup.merge(rollup, (await a), (await b));
   // });
-  var proof: Proof<RollupState> = rollupProofs[0];
+  var proof: Proof<RollupState, void> = rollupProofs[0];
   for (let i=1; i<rollupProofs.length; i++) {
     const rollup = RollupState.createMerged(proof.publicInput, rollupProofs[i].publicInput);
     let mergedProof = await Rollup.merge(rollup, proof, rollupProofs[i]);
@@ -111,8 +102,6 @@ async function main() {
   console.log('ok', ok);
 
   console.log('Shutting down');
-
-  await shutdown();
 };
 
 // ===============================================================
@@ -158,6 +147,7 @@ class RollupState extends Struct({
 // ===============================================================
 
 const Rollup = ZkProgram({
+  name: 'rollup',
   publicInput: RollupState,
 
   methods: {
@@ -190,8 +180,8 @@ const Rollup = ZkProgram({
 
       method(
         newState: RollupState,
-        rollup1proof: SelfProof<RollupState>,
-        rollup2proof: SelfProof<RollupState>,
+        rollup1proof: SelfProof<RollupState, void>,
+        rollup2proof: SelfProof<RollupState, void>,
       ) {
         rollup1proof.verify();
         rollup2proof.verify();

diff --git a/examples/zkapps/09-recursion/src/vote.ts b/examples/zkapps/09-recursion/src/vote.ts
@@ -160,7 +160,7 @@ const Vote = ZkProgram({
       privateInputs: [SelfProof, Bool, PrivateKey, MerkleWitness20, MerkleMapWitness],
 
       method(newState: VoteState, 
-             earlierProof: SelfProof<VoteState>, 
+             earlierProof: SelfProof<VoteState, void>, 
              voteFor: Bool, 
              voter: PrivateKey, 
              voterWitness: MerkleWitness20, 

diff --git a/examples/zkapps/09-recursion/src/zkProgram_wrapper.ts b/examples/zkapps/09-recursion/src/zkProgram_wrapper.ts
@@ -36,7 +36,7 @@ const main = () => {
       step: {
         privateInputs: [ SelfProof ],
 
-        method(earlierProof: SelfProof<Field>) {
+        method(earlierProof: SelfProof<Field, Field>) {
           earlierProof.verify();
           return earlierProof.publicInput.add(1);
         },