Merge branch 'main' into shigoto/performance-regression-framework

Author: Shigoto-dev19

package.json

@@ -83,7 +83,7 @@
     "e2e:run-server": "node dist/web/server.js",
     "e2e:install": "npx playwright install --with-deps",
     "e2e:show-report": "npx playwright show-report tests/report",
-    "update-changelog": "./update-changelog.sh",
+    "update-changelog": "./scripts/changelog/update-changelog.sh",
     "prepare": "husky"
   },
   "author": "O(1) Labs",

fix-changelog-links.cjs scripts/changelog/fix-changelog-links.cjsfix-changelog-links.cjs renamed to scripts/changelog/fix-changelog-links.cjs

@@ -19,7 +19,7 @@
 # Ensure that you have the necessary permissions to commit and push changes to the repository.
 
 # Step 1: Capture the latest version
-latest_version=$(grep -oP '\[\K[0-9]+\.[0-9]+\.[0-9]+(?=\])' CHANGELOG.md | head -1)
+latest_version=$(grep -o '\[\K[0-9]+\.[0-9]+\.[0-9]+(?=\])' CHANGELOG.md | head -1)
 echo "Latest version: $latest_version"
 
 # Step 2: Bump the patch version
@@ -37,11 +37,17 @@ current_date=$(date +%Y-%m-%d)
 echo "Current date: $current_date"
 
 # Step 5: Extract the second SHA from the compare URL of the latest version
-previous_commit=$(grep -m 1 -oP '\[.*?\]\(https://github.com/o1-labs/o1js/compare/[a-f0-9]+\.\.\.\K[a-f0-9]+(?=\))' CHANGELOG.md)
+previous_commit=$(grep -m 1 -o '\[.*?\]\(https://github.com/o1-labs/o1js/compare/[a-f0-9]+\.\.\.\K[a-f0-9]+(?=\))' CHANGELOG.md)
 echo "Previous commit: $previous_commit"
 
 # Step 6: Update the CHANGELOG
 sed -i "s/\[Unreleased\](.*\.\.\.HEAD)/\[Unreleased\](https:\/\/github.com\/o1-labs\/o1js\/compare\/$current_commit...HEAD)\n\n## \[$new_version\](https:\/\/github.com\/o1-labs\/o1js\/compare\/$previous_commit...$current_commit) - $current_date/" CHANGELOG.md
 
-# Step 7: Auto-fix compare URLs for all past versions
-node fix-changelog-links.cjs
+# Step 7: Auto-fix compare URLs for all past versions, if -r is set
+while getopts "r" opt; do
+  case $opt in
+    r)
+      node scripts/changelog/fix-changelog-links.cjs
+      ;;
+  esac
+done

update-changelog.sh scripts/changelog/update-changelog.shupdate-changelog.sh renamed to scripts/changelog/update-changelog.sh

@@ -2,7 +2,6 @@ import {
   DynamicProof,
   FeatureFlags,
   Field,
-  MerkleTree,
   MerkleWitness,
   Proof,
   SelfProof,
@@ -11,7 +10,13 @@ import {
   ZkProgram,
 } from 'o1js';
 
-export { mainProgram, sideloadedProgram, SideloadedProgramProof,MerkleTreeWitness, MainProgramState };
+export {
+  mainProgram,
+  sideloadedProgram,
+  SideloadedProgramProof,
+  MerkleTreeWitness,
+  MainProgramState,
+};
 
 /**
  * This example showcases how DynamicProofs can be used along with a merkletree that stores
@@ -127,4 +132,3 @@ const mainProgram = ZkProgram({
     },
   },
 });
-

src/examples/zkprogram/side-loading/dynamic-keys-merkletree.ts

@@ -1,36 +1,42 @@
-import { Field, MerkleTree, verify } from "o1js";
-import { sideloadedProgram, mainProgram, SideloadedProgramProof, MerkleTreeWitness, MainProgramState } from "./dynamic-keys-merkletree.js";
+import { Field, MerkleTree, verify } from 'o1js';
+import {
+  sideloadedProgram,
+  mainProgram,
+  SideloadedProgramProof,
+  MerkleTreeWitness,
+  MainProgramState,
+} from './dynamic-keys-merkletree.js';
 
 console.log('Compiling circuits...');
-const programVk = (await sideloadedProgram.compile()).verificationKey;
+const sideVk = (await sideloadedProgram.compile()).verificationKey;
 const mainVk = (await mainProgram.compile()).verificationKey;
 
 const tree = new MerkleTree(64);
 
 console.log('Proving deployment of side-loaded key');
 const rootBefore = tree.getRoot();
-tree.setLeaf(1n, programVk.hash);
+tree.setLeaf(1n, sideVk.hash);
 const witness = new MerkleTreeWitness(tree.getWitness(1n));
 
 const { proof: proof1 } = await mainProgram.addSideloadedProgram(
   new MainProgramState({
     treeRoot: rootBefore,
     state: Field(0),
   }),
-  programVk,
+  sideVk,
   witness
 );
 
 console.log('Proving child program execution');
-const { proof: childProof } = await sideloadedProgram.compute(Field(0), Field(10));
+const { proof: childProof1 } = await sideloadedProgram.compute(Field(0), Field(10));
 
 console.log('Proving verification inside main program');
 const { proof: proof2 } = await mainProgram.validateUsingTree(
   proof1.publicOutput,
   proof1,
-  programVk,
+  sideVk,
   witness,
-  SideloadedProgramProof.fromProof(childProof)
+  SideloadedProgramProof.fromProof(childProof1)
 );
 
 const validProof2 = await verify(proof2, mainVk);
@@ -40,13 +46,13 @@ console.log('Proving different method of child program');
 const { proof: childProof2 } = await sideloadedProgram.assertAndAdd(Field(0), Field(10));
 
 console.log('Proving verification inside main program');
-const proof3 = await mainProgram.validateUsingTree(
+const { proof: proof3 } = await mainProgram.validateUsingTree(
   proof1.publicOutput,
   proof1,
-  programVk,
+  sideVk,
   witness,
-  SideloadedProgramProof.fromProof(childProof)
+  SideloadedProgramProof.fromProof(childProof2)
 );
 
-const validProof3 = await verify(proof2, mainVk);
-console.log('ok?', validProof2);
+const validProof3 = await verify(proof3, mainVk);
+console.log('ok?', validProof3);