Merge branch 'main' into florian/kimchi-proof-rust

Author: Trivo25

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 {}

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!');

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

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!');

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', () => {

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.

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!');

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),
         };
       },
     },

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!');

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!');