Merge branch 'main' into florian/prettier-for-bindings

Author: Trivo25

CHANGELOG.md

@@ -15,14 +15,16 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
     _Security_ in case of vulnerabilities.
  -->
 
-## [Unreleased](https://github.com/o1-labs/o1js/compare/4e23a60...HEAD)
+## [Unreleased](https://github.com/o1-labs/o1js/compare/3eef10d...HEAD)
+
+## [2.6.0](https://github.com/o1-labs/o1js/compare/4e23a60...3eef10d) - 2025-05-30
 
 ### Added
 
 - [PR! 1905](https://github.com/o1-labs/o1js/pull/1905) API support for circuit chunking
   - still requires memory optimizations to be fully functional, and
   - proof-systems version still needs to be updated to include [this commit](https://github.com/o1-labs/proof-systems/pull/3222/commits/8c37c293f8159eed3676964ba47fc5dc0ae6ea1e)
-    - that fixed the zero knowledge rows mismatch across Kimchi WASM bindings
+- [PR !1848](https://github.com/o1-labs/o1js/pull/1848) Dynamic array provable type
 
 ## [2.5.0](https://github.com/o1-labs/o1js/compare/6ff7f8470a...4e23a60)
 
@@ -32,8 +34,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Added
 
-- [PR !1848](https://github.com/o1-labs/o1js/pull/1848) Dynamic array provable type
-
 - [PR !2076](https://github.com/o1-labs/o1js/pull/2076)
   - o1js-bindings is no longer a submodule (same directory structure)
   - compiled artifacts are now gitignored

npmDepsHash

@@ -1 +1 @@
-sha256-m3NmZHhCuQxDpYHmB3sRLvitqu2bzbnNaAKY2KOCSIM=
+sha256-BbQaG1unSH42VqtTjETCpm7lU29C1DskfXAJbYBvO5A=

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "o1js",
   "description": "TypeScript framework for zk-SNARKs and zkApps",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "license": "Apache-2.0",
   "homepage": "https://github.com/o1-labs/o1js/",
   "repository": {

package.json

@@ -90,15 +90,13 @@ function option<T, S>(spec: Spec<T, S>): Spec<MlOption<T>, S | undefined> {
   };
 }
 
-equivalentRecord(Bigint256Bindings, wasm, {
+equivalentRecord(Bigint256Bindings as Omit<typeof Bigint256Bindings, "caml_bigint_256_print" | "caml_bigint_256_to_string">, wasm, {
   caml_bigint_256_of_numeral: undefined, // TODO
   caml_bigint_256_of_decimal_string: { from: [decimalString], to: bigint256 },
   caml_bigint_256_num_limbs: { from: [], to: number },
   caml_bigint_256_bytes_per_limb: { from: [], to: number },
   caml_bigint_256_div: { from: [bigint256, bigint256], to: bigint256 },
   caml_bigint_256_compare: { from: [bigint256, bigint256], to: number },
-  caml_bigint_256_print: undefined, // this would spam the console
-  caml_bigint_256_to_string: { from: [bigint256], to: decimalString },
   caml_bigint_256_test_bit: {
     from: [bigint256, numberLessThan(256)],
     to: boolean,
@@ -108,97 +106,8 @@ equivalentRecord(Bigint256Bindings, wasm, {
   caml_bigint_256_deep_copy: { from: [bigint256], to: bigint256 },
 });
 
-equivalentRecord(
-  FpBindings as Omit<
-    typeof FpBindings,
-    | 'caml_pasta_fp_copy'
-    | 'caml_pasta_fp_mut_add'
-    | 'caml_pasta_fp_mut_sub'
-    | 'caml_pasta_fp_mut_mul'
-    | 'caml_pasta_fp_mut_square'
-  >,
-  wasm,
-  {
-    caml_pasta_fp_size_in_bits: { from: [], to: number },
-    caml_pasta_fp_size: { from: [], to: fp },
-    caml_pasta_fp_add: { from: [fp, fp], to: fp },
-    caml_pasta_fp_sub: { from: [fp, fp], to: fp },
-    caml_pasta_fp_negate: { from: [fp], to: fp },
-    caml_pasta_fp_mul: { from: [fp, fp], to: fp },
-    caml_pasta_fp_div: { from: [fp, fp], to: fp },
-    caml_pasta_fp_inv: { from: [fp], to: option(fp) },
-    caml_pasta_fp_square: { from: [fp], to: fp },
-    caml_pasta_fp_is_square: { from: [fp], to: boolean },
-    caml_pasta_fp_sqrt: { from: [fp], to: option(fp) },
-    caml_pasta_fp_of_int: { from: [uint31], to: fp },
-    caml_pasta_fp_to_string: { from: [fp], to: decimalString },
-    caml_pasta_fp_of_string: { from: [decimalString], to: fp },
-    caml_pasta_fp_print: undefined, // this would spam the console
-    // these aren't defined in Rust
-    // caml_pasta_fp_copy: { from: [fp, fp], to: unit },
-    // caml_pasta_fp_mut_add: { from: [fp, fp], to: unit },
-    // caml_pasta_fp_mut_sub: { from: [fp, fp], to: unit },
-    // caml_pasta_fp_mut_mul: { from: [fp, fp], to: unit },
-    // caml_pasta_fp_mut_square: { from: [fp], to: unit },
-    caml_pasta_fp_compare: { from: [fp, fp], to: number },
-    caml_pasta_fp_equal: { from: [fp, fp], to: boolean },
-    caml_pasta_fp_random: undefined, // random outputs won't match
-    caml_pasta_fp_rng: undefined, // random outputs won't match
-    caml_pasta_fp_to_bigint: { from: [fp], to: bigint256 },
-    caml_pasta_fp_of_bigint: { from: [bigint256], to: fp },
-    caml_pasta_fp_two_adic_root_of_unity: { from: [], to: fp },
-    caml_pasta_fp_domain_generator: { from: [numberLessThan(32)], to: fp },
-    caml_pasta_fp_to_bytes: undefined, // not implemented
-    caml_pasta_fp_of_bytes: undefined, // not implemented
-    caml_pasta_fp_deep_copy: { from: [fp], to: fp },
-  }
-);
 
-equivalentRecord(
-  FqBindings as Omit<
-    typeof FqBindings,
-    | 'caml_pasta_fq_copy'
-    | 'caml_pasta_fq_mut_add'
-    | 'caml_pasta_fq_mut_sub'
-    | 'caml_pasta_fq_mut_mul'
-    | 'caml_pasta_fq_mut_square'
-  >,
-  wasm,
-  {
-    caml_pasta_fq_size_in_bits: { from: [], to: number },
-    caml_pasta_fq_size: { from: [], to: fq },
-    caml_pasta_fq_add: { from: [fq, fq], to: fq },
-    caml_pasta_fq_sub: { from: [fq, fq], to: fq },
-    caml_pasta_fq_negate: { from: [fq], to: fq },
-    caml_pasta_fq_mul: { from: [fq, fq], to: fq },
-    caml_pasta_fq_div: { from: [fq, fq], to: fq },
-    caml_pasta_fq_inv: { from: [fq], to: option(fq) },
-    caml_pasta_fq_square: { from: [fq], to: fq },
-    caml_pasta_fq_is_square: { from: [fq], to: boolean },
-    caml_pasta_fq_sqrt: { from: [fq], to: option(fq) },
-    caml_pasta_fq_of_int: { from: [uint31], to: fq },
-    caml_pasta_fq_to_string: { from: [fq], to: decimalString },
-    caml_pasta_fq_of_string: { from: [decimalString], to: fq },
-    caml_pasta_fq_print: undefined, // this would spam the console
-    // these aren't defined in Rust
-    // caml_pasta_fq_copy: { from: [fq, fq], to: unit },
-    // caml_pasta_fq_mut_add: { from: [fq, fq], to: unit },
-    // caml_pasta_fq_mut_sub: { from: [fq, fq], to: unit },
-    // caml_pasta_fq_mut_mul: { from: [fq, fq], to: unit },
-    // caml_pasta_fq_mut_square: { from: [fq], to: unit },
-    caml_pasta_fq_compare: { from: [fq, fq], to: number },
-    caml_pasta_fq_equal: { from: [fq, fq], to: boolean },
-    caml_pasta_fq_random: undefined, // random outputs won't match
-    caml_pasta_fq_rng: undefined, // random outputs won't match
-    caml_pasta_fq_to_bigint: { from: [fq], to: bigint256 },
-    caml_pasta_fq_of_bigint: { from: [bigint256], to: fq },
-    caml_pasta_fq_two_adic_root_of_unity: { from: [], to: fq },
-    caml_pasta_fq_domain_generator: { from: [numberLessThan(32)], to: fq },
-    caml_pasta_fq_to_bytes: undefined, // not implemented
-    caml_pasta_fq_of_bytes: undefined, // not implemented
-    caml_pasta_fq_deep_copy: { from: [fq], to: fq },
-  }
-);
+
 
 // elliptic curve
 

src/bindings/crypto/bindings/bindings.unit-test.ts

@@ -5,6 +5,7 @@ module Other_impl = Pickles.Impls.Wrap
 module Field = Impl.Field
 module Account_update = Mina_base.Account_update
 module Zkapp_command = Mina_base.Zkapp_command
+(*module Signed_command = Mina_base.Signed_command*)
 
 (* Test - functions that have a ts implementation, exposed for ts-ml consistency tests *)
 
@@ -339,7 +340,8 @@ module Transaction_hash = struct
           }
       }
     in
-    let payment = Signed_command.sign kp payload in
+    let signature_kind = Mina_signature_kind.t_DEPRECATED in
+    let payment = Signed_command.sign ~signature_kind kp payload in
     (payment :> Signed_command.t)
     |> Signed_command.to_yojson |> Yojson.Safe.to_string |> Js.string
 end

src/bindings/ocaml/lib/consistency_test.ml

@@ -139,11 +139,13 @@ let check_account_update_signatures zkapp_command =
     zkapp_command
   in
   let tx_commitment = Zkapp_command.commitment zkapp_command in
+  let signature_kind = Mina_signature_kind.t_DEPRECATED in
   let full_tx_commitment =
     Zkapp_command.Transaction_commitment.create_complete tx_commitment
       ~memo_hash:(Mina_base.Signed_command_memo.hash memo)
       ~fee_payer_hash:
         (Zkapp_command.Digest.Account_update.create
+           ~signature_kind
            (Account_update.of_fee_payer fee_payer) )
   in
   let key_to_string = Signature_lib.Public_key.Compressed.to_base58_check in