Merge branch 'main' into shigoto/document-build-scripts

Shigoto-dev19 · Shigoto-dev19 · commit ec4f99b6fb38 · 2025-11-03T13:41:08.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,13 @@ This project adheres to
 
 ## [Unreleased](https://github.com/o1-labs/o1js/compare/3453d1e53...HEAD)
 
+### Added
+
+- Add `KimchiProof.toJSON()` and `KimchiProof.fromJSON()`
+  https://github.com/o1-labs/o1js/pull/2594
+- Add `KimchiVerificationKey.toString()` and
+  `KimchiVerificationKey.fromString()` https://github.com/o1-labs/o1js/pull/2594
+
 ### Internal
 
 - Change cache harness to only allow writes when `dump` mode is active.
diff --git a/src/bindings.d.ts b/src/bindings.d.ts
@@ -73,6 +73,7 @@ declare namespace Snarky {
   type Keypair = unknown;
   type VerificationKey = unknown;
   type Proof = unknown;
+  type ProofWithEvals = unknown;
 }
 
 /**
@@ -406,6 +407,11 @@ declare const Snarky: {
       verificationKey: Snarky.VerificationKey
     ): boolean;
 
+
+    proofToBackendProofEvals(publicInput: MlArray<FieldConst>, proof: Snarky.Proof): Snarky.ProofWithEvals;
+
+    proofFromBackendProofEvals(proof: Snarky.ProofWithEvals): Snarky.Proof;
+
     keypair: {
       getVerificationKey(keypair: Snarky.Keypair): Snarky.VerificationKey;
       /**
diff --git a/src/bindings/ocaml/lib/snarky_bindings.ml b/src/bindings/ocaml/lib/snarky_bindings.ml
@@ -406,6 +406,12 @@ module Circuit = struct
         Backend.Field.Vector.emplace_back public_input_vec x ) ;
     Backend.Proof.verify proof vk public_input_vec |> Js.bool
 
+  let proof_to_backend_proof_evals xs (t : Backend.Proof.with_public_evals) =
+    Backend.Proof.to_backend_with_public_evals' [] xs t
+
+  let proof_from_backend_proof_evals t =
+    Backend.Proof.of_backend_with_public_evals t
+
   module Keypair = struct
     let get_vk t = Impl.Keypair.vk t
 
@@ -582,6 +588,11 @@ let snarky =
 
         method verify = Circuit.verify
 
+        method proofToBackendProofEvals = Circuit.proof_to_backend_proof_evals
+
+        method proofFromBackendProofEvals =
+          Circuit.proof_from_backend_proof_evals
+
         val keypair =
           object%js
             method getVerificationKey = Circuit.Keypair.get_vk
diff --git a/src/bindings/ocaml/lib/snarky_bindings.mli b/src/bindings/ocaml/lib/snarky_bindings.mli
@@ -273,7 +273,10 @@ val snarky :
                 Kimchi_types.poly_comm )
               Kimchi_types.VerifierIndex.verifier_index
            -> bool Js.t )
-          Js.meth >
+          Js.meth 
+      ; proofToBackendProofEvals :
+          (field array -> Backend.Proof.with_public_evals -> Backend.Proof.Backend.with_public_evals) Js.meth
+       ; proofFromBackendProofEvals : (Backend.Proof.Backend.with_public_evals -> Backend.Proof.with_public_evals) Js.meth >
       Js.t
       Js.readonly_prop >
   Js.t
diff --git a/src/examples/crypto/ecdsa/ecdsa.ts b/src/examples/crypto/ecdsa/ecdsa.ts
@@ -1,6 +1,6 @@
-import { ZkProgram, Crypto, createEcdsa, createForeignCurve, Bool, Bytes, Hash } from 'o1js';
+import { Bool, Bytes, Crypto, Hash, ZkProgram, createEcdsa, createForeignCurve } from 'o1js';
 
-export { keccakAndEcdsa, ecdsa, Secp256k1, Ecdsa, Bytes32, ecdsaEthers };
+export { Bytes32, Ecdsa, Secp256k1, ecdsa, ecdsaEthers, keccakAndEcdsa };
 
 class Secp256k1 extends createForeignCurve(Crypto.CurveParams.Secp256k1) {}
 class Scalar extends Secp256k1.Scalar {}
diff --git a/src/examples/crypto/ecdsa/run.ts b/src/examples/crypto/ecdsa/run.ts
@@ -34,13 +34,13 @@ perfKeccakEcdsa.start('prove', 'verifyEcdsa');
 let { proof } = await keccakAndEcdsa.verifyEcdsa(message, signature, publicKey);
 perfKeccakEcdsa.end();
 
-proof.publicOutput.assertTrue('signature verifies');
+proof.publicOutput.assertTrue('signature verification failed!');
 
 perfKeccakEcdsa.start('verify', 'verifyEcdsa');
 const isValid = await keccakAndEcdsa.verify(proof);
 perfKeccakEcdsa.end();
 
-assert(isValid, 'proof verifies');
+assert(isValid, 'proof verification failed!');
 
 // Hardcoded ethers.js signature and inputs for verification in o1js
 
@@ -78,10 +78,10 @@ perfEcdsaEthers.start('prove', 'verifyEthers');
 let { proof: proofE } = await ecdsaEthers.verifyEthers(msgBytes, signatureE, publicKeyE);
 perfEcdsaEthers.end();
 
-proofE.publicOutput.assertTrue('signature verifies');
+proofE.publicOutput.assertTrue('signature verification failed!');
 
 perfEcdsaEthers.start('verify', 'verifyEthers');
 const isValidE = await ecdsaEthers.verify(proofE);
 perfEcdsaEthers.end();
 
-assert(isValidE, 'proof verifies');
+assert(isValidE, 'proof verification failed!');
diff --git a/src/examples/crypto/foreign-field.ts b/src/examples/crypto/foreign-field.ts
@@ -6,15 +6,15 @@
  */
 import assert from 'assert';
 import {
-  createForeignField,
   AlmostForeignField,
   CanonicalForeignField,
+  Provable,
   Scalar,
   SmartContract,
+  State,
+  createForeignField,
   method,
-  Provable,
   state,
-  State,
 } from 'o1js';
 
 // Let's create a small finite field: F_17
diff --git a/src/examples/crypto/rsa/run.ts b/src/examples/crypto/rsa/run.ts
@@ -28,5 +28,7 @@ let { proof } = await rsaZkProgram.verifyRsa65537(message, signature, modulus);
 perfRsa.end();
 
 perfRsa.start('verify', 'verifyRsa65537');
-await rsaZkProgram.verify(proof);
+let isValid = await rsaZkProgram.verify(proof);
 perfRsa.end();
+
+if (!isValid) throw Error('proof verification failed!');
diff --git a/src/examples/crypto/rsa/test.ts b/src/examples/crypto/rsa/test.ts
@@ -1,7 +1,7 @@
-import { Bigint2048, rsaVerify65537 } from './rsa.js';
-import { sha256Bigint, generateRsaParams, rsaSign, randomPrime } from './utils.js';
 import { expect } from 'expect';
-import { it, describe } from 'node:test';
+import { describe, it } from 'node:test';
+import { Bigint2048, rsaVerify65537 } from './rsa.js';
+import { generateRsaParams, randomPrime, rsaSign, sha256Bigint } from './utils.js';
 
 describe('RSA65537 verification tests', () => {
   it('should accept a simple RSA signature', () => {
diff --git a/src/examples/crypto/rsa/utils.ts b/src/examples/crypto/rsa/utils.ts
@@ -1,4 +1,4 @@
-export { sha256Bigint, generateRsaParams, rsaSign, randomPrime };
+export { generateRsaParams, randomPrime, rsaSign, sha256Bigint };
 
 /**
  * Generates an RSA signature for the given message using the private key and modulus.
diff --git a/src/examples/crypto/sha256/run.ts b/src/examples/crypto/sha256/run.ts
@@ -26,4 +26,4 @@ if (
   proof.publicOutput.toHex() !== '7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9'
 )
   throw new Error('Invalid sha256 digest!');
-if (!isValid) throw new Error('Invalid proof');
+if (!isValid) throw new Error('Invalid proof!');
diff --git a/src/examples/crypto/sha256/sha256.ts b/src/examples/crypto/sha256/sha256.ts
@@ -1,6 +1,6 @@
-import { Bytes, Gadgets, ZkProgram } from 'o1js';
+import { Bytes, Hash, ZkProgram } from 'o1js';
 
-export { SHA256Program, Bytes12 };
+export { Bytes12, SHA256Program };
 
 class Bytes12 extends Bytes(12) {}
 
@@ -12,7 +12,7 @@ let SHA256Program = ZkProgram({
       privateInputs: [Bytes12],
       async method(xs: Bytes12) {
         return {
-          publicOutput: Gadgets.SHA256.hash(xs),
+          publicOutput: Hash.SHA2_256.hash(xs),
         };
       },
     },
diff --git a/src/examples/zkfunction/ecdsa.ts b/src/examples/zkfunction/ecdsa.ts
@@ -1,7 +1,7 @@
-import { Experimental, Crypto, createForeignCurve, Bytes, assert, createEcdsa } from 'o1js';
+import { Bytes, Crypto, Experimental, createEcdsa, createForeignCurve } from 'o1js';
 const { ZkFunction } = Experimental;
 
-export { Secp256k1, Ecdsa, Bytes32, reserves };
+export { Bytes32, Ecdsa, Secp256k1, reserves };
 
 class Secp256k1 extends createForeignCurve(Crypto.CurveParams.Secp256k1) {}
 class Ecdsa extends createEcdsa(Secp256k1) {}
@@ -12,7 +12,7 @@ const reserves = ZkFunction({
   publicInputType: Bytes32,
   privateInputTypes: [Ecdsa, Secp256k1],
   main: (message: Bytes32, signature: Ecdsa, publicKey: Secp256k1) => {
-    assert(signature.verify(message, publicKey));
+    signature.verify(message, publicKey).assertTrue();
   },
 });
 
@@ -31,5 +31,6 @@ console.timeEnd('prove');
 
 console.time('verify');
 let isValid = await reserves.verify(proof, verificationKey);
-assert(isValid, 'verifies');
 console.timeEnd('verify');
+
+if (!isValid) throw Error('verification failed!');
diff --git a/src/examples/zkfunction/preimage.ts b/src/examples/zkfunction/preimage.ts
@@ -1,4 +1,4 @@
-import { Poseidon, Field, Experimental } from 'o1js';
+import { Experimental, Field, Poseidon } from 'o1js';
 const { ZkFunction } = Experimental;
 
 /**
@@ -26,7 +26,7 @@ console.log('prove...');
 const pi = await main.prove(hash, preimage);
 
 console.log('verify...');
-let ok = await main.verify(pi, verificationKey);
-console.log('ok?', ok);
+let isValid = await main.verify(pi, verificationKey);
+console.log('isValid?', isValid);
 
-if (!ok) throw Error('verification failed');
+if (!isValid) throw Error('verification failed!');
diff --git a/src/examples/zkfunction/root.ts b/src/examples/zkfunction/root.ts
@@ -1,4 +1,4 @@
-import { Field, Experimental, Gadgets } from 'o1js';
+import { assert, Experimental, Field, Gadgets } from 'o1js';
 const { ZkFunction } = Experimental;
 
 /**
@@ -22,14 +22,43 @@ console.time('compile...');
 const { verificationKey } = await main.compile();
 console.timeEnd('compile...');
 
-console.time('prove...');
 const x = Field(8);
 const y = Field(2);
+
+console.time('prove...');
 const proof = await main.prove(x, y);
 console.timeEnd('prove...');
 
 console.time('verify...');
 let ok = await main.verify(proof, verificationKey);
 console.timeEnd('verify...');
 
-console.log('ok?', ok);
+assert(ok, 'proof should verify');
+
+console.log('testing round trips');
+
+ok = await proofRoundTrip(proof).verify(verificationKey);
+assert(ok, 'proof should verify');
+
+console.log('verification key round trip...');
+
+ok = await proof.verify(verificationKeyRoundTrip(verificationKey));
+
+assert(ok, 'proof should verify');
+
+function proofRoundTrip(proof: Experimental.KimchiProof): Experimental.KimchiProof {
+  let json = proof.toJSON();
+  console.log('proof json:', {
+    proof: json.proof.slice(0, 10),
+    publicInputFields: json.publicInputFields,
+  });
+  return Experimental.KimchiProof.fromJSON(json);
+}
+
+function verificationKeyRoundTrip(
+  vk: Experimental.KimchiVerificationKey
+): Experimental.KimchiVerificationKey {
+  let json = vk.toString();
+  console.log('vk string:', json.slice(0, 10));
+  return Experimental.KimchiVerificationKey.fromString(json);
+}
diff --git a/src/examples/zkprogram/hash-chain.ts b/src/examples/zkprogram/hash-chain.ts
@@ -65,7 +65,7 @@ perfHashChain.end();
 perfHashChain.start('verify', 'chain');
 const isValid = await hashChain.verify(proof);
 perfHashChain.end();
-assert(isValid, 'Proof invalid');
+assert(isValid, 'Proof invalid!');
 
 // check that the output is correct
 let z = Array.from({ length: n }, () => 0).reduce((y) => Poseidon.hash([y]), x);
diff --git a/src/examples/zkprogram/mutual-recursion.ts b/src/examples/zkprogram/mutual-recursion.ts
@@ -76,6 +76,7 @@ perfAdd.start('verify', 'performAddition');
 const validBaseCase = await verify(baseCase, addVk);
 perfAdd.end();
 console.log('ok?', validBaseCase);
+if (!validBaseCase) throw new Error('proof verification failed!');
 
 perfMultiply.start('prove', 'performMultiplication');
 const { proof: multiply1 } = await multiply.performMultiplication(Field(3), baseCase);
@@ -85,6 +86,7 @@ perfMultiply.start('verify', 'performMultiplication');
 const validMultiplication = await verify(multiply1, multiplyVk);
 perfMultiply.end();
 console.log('ok?', validMultiplication);
+if (!validMultiplication) throw new Error('proof verification failed!');
 
 console.log('Proving second (recursive) addition');
 const { proof: add2 } = await add.performAddition(
@@ -95,5 +97,6 @@ const { proof: add2 } = await add.performAddition(
 
 const validAddition = await verify(add2, addVk);
 console.log('ok?', validAddition);
+if (!validAddition) throw new Error('proof verification failed!');
 
 console.log('Result (should be 19):', add2.publicOutput.toBigInt());
diff --git a/src/examples/zkprogram/program-no-proving.ts b/src/examples/zkprogram/program-no-proving.ts
@@ -1,14 +1,4 @@
-import {
-  SelfProof,
-  Field,
-  ZkProgram,
-  verify,
-  Proof,
-  JsonProof,
-  Provable,
-  Empty,
-  Cache,
-} from 'o1js';
+import { Field, ZkProgram } from 'o1js';
 
 let MyProgram = ZkProgram({
   name: 'example-without-proving',
diff --git a/src/examples/zkprogram/program-with-chunking.ts b/src/examples/zkprogram/program-with-chunking.ts
@@ -37,7 +37,8 @@ let { proof } = await MyProgram.baseCase(Field(0));
 perf.end();
 
 perf.start('verify', 'baseCase');
-let ok = await MyProgram.verify(proof);
+let isValid = await MyProgram.verify(proof);
 perf.end();
 
-console.log('ok?', ok);
+console.log('isValid?', isValid);
+if (!isValid) throw new Error('proof verification failed!');
diff --git a/src/examples/zkprogram/program-with-input.ts b/src/examples/zkprogram/program-with-input.ts
@@ -1,4 +1,4 @@
-import { SelfProof, Field, ZkProgram, verify, Proof, JsonProof, Provable } from 'o1js';
+import { Field, JsonProof, Proof, Provable, SelfProof, ZkProgram, verify } from 'o1js';
 
 let MyProgram = ZkProgram({
   name: 'example-with-input',
@@ -43,10 +43,12 @@ proof satisfies Proof<Field, void>;
 console.log('verify...');
 let ok = await verify(proof.toJSON(), verificationKey);
 console.log('ok?', ok);
+if (!ok) throw new Error('proof verification failed!');
 
 console.log('verify alternative...');
 ok = await MyProgram.verify(proof);
 console.log('ok (alternative)?', ok);
+if (!ok) throw new Error('proof verification failed!');
 
 console.log('proving step 1...');
 let { proof: proof1 } = await MyProgram.inductiveCase(1, proof);
@@ -55,19 +57,21 @@ proof1 = await testJsonRoundtrip(MyProgram.Proof, proof1);
 console.log('verify...');
 ok = await verify(proof1, verificationKey);
 console.log('ok?', ok);
+if (!ok) throw new Error('proof verification failed!');
 
 console.log('verify alternative...');
 ok = await MyProgram.verify(proof1);
 console.log('ok (alternative)?', ok);
+if (!ok) throw new Error('proof verification failed!');
 
 console.log('proving step 2...');
 let { proof: proof2 } = await MyProgram.inductiveCase(2, proof1);
 proof2 = await testJsonRoundtrip(MyProgram.Proof, proof2);
 
 console.log('verify...');
 ok = await verify(proof2.toJSON(), verificationKey);
-
 console.log('ok?', ok && proof2.publicInput.toString() === '2');
+if (!ok) throw new Error('proof verification failed!');
 
 function testJsonRoundtrip<
   P extends Proof<any, any>,
diff --git a/src/examples/zkprogram/program.ts b/src/examples/zkprogram/program.ts
@@ -26,3 +26,4 @@ console.timeEnd('proving');
 console.log('verifying');
 let ok = await verify(result.proof, verificationKey);
 console.log('ok', ok);
+if (!ok) throw new Error('proof verification failed!');
diff --git a/src/examples/zkprogram/recursive-program.ts b/src/examples/zkprogram/recursive-program.ts
@@ -1,4 +1,4 @@
-import { SelfProof, Field, ZkProgram } from 'o1js';
+import { Field, SelfProof, ZkProgram } from 'o1js';
 
 export const RecursiveProgram = ZkProgram({
   name: 'recursive-program',
diff --git a/src/examples/zkprogram/runtime-table/run.ts b/src/examples/zkprogram/runtime-table/run.ts
@@ -27,5 +27,7 @@ let { proof } = await PayrollRuntimeTableZkProgram.verifyPayroll(
 perfPayroll.end();
 
 perfPayroll.start('verify', 'verifyPayroll');
-await verify(proof, verificationKey);
+let isValid = await verify(proof, verificationKey);
 perfPayroll.end();
+
+if (!isValid) throw new Error('proof verification failed!');
diff --git a/src/examples/zkprogram/side-loading/dynamic-keys-merkletree.ts b/src/examples/zkprogram/side-loading/dynamic-keys-merkletree.ts
diff --git a/src/examples/zkprogram/side-loading/run.ts b/src/examples/zkprogram/side-loading/run.ts
diff --git a/src/examples/zkprogram/small-big/run.ts b/src/examples/zkprogram/small-big/run.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/lib/proof-system/zkfunction.ts b/src/lib/proof-system/zkfunction.ts
diff --git a/src/mina b/src/mina

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export { sha256Bigint, generateRsaParams, rsaSign, randomPrime };`
	`1`	`+export { generateRsaParams, randomPrime, rsaSign, sha256Bigint };`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Generates an RSA signature for the given message using the private key and modulus.`