Merge pull request #2243 from o1-labs/florian/prettier-for-bindings

Adjust prettier for bindings

Author: Trivo25

.prettierignore

@@ -4,6 +4,7 @@ benchmark/
 dist/
 node_modules/
 o1js-reference/
-src/bindings/
+src/bindings/mina-transaction/gen/
+src/bindings/compiled/
 src/mina/
 **/*.d.ts

CHANGELOG.md

@@ -22,7 +22,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 
 - [PR! 1905](https://github.com/o1-labs/o1js/pull/1905) API support for circuit chunking
-  - work in progress - still requires memory optimizations to be fully functional
+  - 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)
 - [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)

README-nix.md

@@ -92,7 +92,6 @@ On macos the first time you run this command, you can expect it to take hours (o
 Then, you will observe that the current devshell becomes a Nix shell with the right
 configuration for `o1js` and `mina`.
 
-
 From within the shell, you can build o1js and update the bindings.
 
 ```console

src/bindings/README.md

@@ -2,7 +2,6 @@
 
 This directory collects code required by o1js to bind to lower layers of the proof system and the Mina transaction logic, which are written in Rust and OCaml.
 
-
 **Directory structure**
 
 - `/compiled` - compiled JS and Wasm artifacts produced by `js_of_ocaml` and `wasm-bindgen` from Rust and OCaml source code. We keep these artifacts in the source tree so that developing on o1js can be done with standard JS tooling and doesn't require setting up the full OCaml/Rust build pipeline.
@@ -12,4 +11,3 @@ This directory collects code required by o1js to bind to lower layers of the pro
 - `/mina-transaction` - TS types and modules that specialize the generic tooling in `/lib` to Mina's zkApp protocol; mostly auto-generated from OCaml.
 - `/ocaml` - OCaml library exposing Snarky, Pickles and parts of the Mina transaction logic to JS. Also, OCaml scripts that help auto-generate TypeScript for Mina- and crypto-related types and constants.
 - `/scripts` - scripts that build parts of o1js from their OCaml and Rust sources, including the contents of `/compiled` and other generated TS files.
-

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

@@ -37,9 +37,7 @@ test(Random.field, (x) => testBigintRoundtrip(x, fieldSize));
 // failure cases
 expect(() => bigIntToBytes(256n, 1)).toThrow(/does not fit in 1 bytes/);
 expect(() => bigIntToBytes(100_000n, 2)).toThrow(/does not fit in 2 bytes/);
-expect(() => bigIntToBytes(4n * Fp.modulus, 32)).toThrow(
-  /does not fit in 32 bytes/
-);
+expect(() => bigIntToBytes(4n * Fp.modulus, 32)).toThrow(/does not fit in 32 bytes/);
 
 // parseHexString32
 

src/bindings/crypto/bindings.ts

@@ -9,10 +9,7 @@ import { PallasBindings, VestaBindings } from './bindings/curve.js';
 import { FpBindings, FqBindings } from './bindings/field.js';
 import { FpVectorBindings, FqVectorBindings } from './bindings/vector.js';
 import type * as wasmNamespace from '../compiled/node_bindings/plonk_wasm.cjs';
-import {
-  fieldsFromRustFlat,
-  fieldsToRustFlat,
-} from './bindings/conversion-base.js';
+import { fieldsFromRustFlat, fieldsToRustFlat } from './bindings/conversion-base.js';
 import { proofConversion } from './bindings/conversion-proof.js';
 import { conversionCore } from './bindings/conversion-core.js';
 import { verifierIndexConversion } from './bindings/conversion-verifier-index.js';

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

@@ -16,13 +16,7 @@ import {
   toMlStringAscii,
 } from './bigint256.js';
 import { wasm } from '../../js/node/node-backend.js';
-import {
-  Spec,
-  ToSpec,
-  FromSpec,
-  defaultAssertEqual,
-  id,
-} from '../../../lib/testing/equivalent.js';
+import { Spec, ToSpec, FromSpec, defaultAssertEqual, id } from '../../../lib/testing/equivalent.js';
 import { Random } from '../../../lib/testing/property.js';
 import {
   WasmAffine,
@@ -35,18 +29,8 @@ import {
 import { equivalentRecord } from './test-utils.js';
 import { Field, FpBindings, FqBindings } from './field.js';
 import { MlBool, MlOption } from '../../../lib/ml/base.js';
-import {
-  OrInfinity,
-  PallasBindings,
-  VestaBindings,
-  toMlOrInfinity,
-} from './curve.js';
-import {
-  GroupProjective,
-  Pallas,
-  ProjectiveCurve,
-  Vesta,
-} from '../elliptic-curve.js';
+import { OrInfinity, PallasBindings, VestaBindings, toMlOrInfinity } from './curve.js';
+import { GroupProjective, Pallas, ProjectiveCurve, Vesta } from '../elliptic-curve.js';
 import {
   WasmGPallas,
   WasmGVesta,
@@ -189,13 +173,7 @@ function projective<WasmP extends WasmProjective, WasmA extends WasmAffine>(
   let randomScaled = Random(() => Curve.scale(Curve.one, Scalar.random()));
 
   return {
-    rng: Random.oneOf(
-      Curve.zero,
-      Curve.one,
-      randomScaled,
-      randomScaled,
-      randomScaled
-    ),
+    rng: Random.oneOf(Curve.zero, Curve.one, randomScaled, randomScaled, randomScaled),
     // excessively expensive to work around limited Rust API - only use for tests
     there(p: GroupProjective): WasmP {
       let { x, y, infinity } = Curve.toAffine(p);
@@ -233,13 +211,7 @@ function affine<WasmA extends WasmAffine>(
   affineOne: () => WasmA
 ): Spec<OrInfinity, WasmA> {
   let randomScaled = Random(() => Curve.scale(Curve.one, Scalar.random()));
-  let rngProjective = Random.oneOf(
-    Curve.zero,
-    Curve.one,
-    randomScaled,
-    randomScaled,
-    randomScaled
-  );
+  let rngProjective = Random.oneOf(Curve.zero, Curve.one, randomScaled, randomScaled, randomScaled);
   let rng = Random.map(rngProjective, (p) => toMlOrInfinity(Curve.toAffine(p)));
 
   return {

src/bindings/crypto/bindings/conversion-base.ts

@@ -78,10 +78,7 @@ function affineFromRust<A extends WasmAffine>(pt: A): OrInfinity {
 
 const tmpBytes = new Uint8Array(32);
 
-function affineToRust<A extends WasmAffine>(
-  pt: OrInfinity,
-  makeAffine: () => A
-) {
+function affineToRust<A extends WasmAffine>(pt: OrInfinity, makeAffine: () => A) {
   let res = makeAffine();
   if (pt === Infinity) {
     res.infinity = true;

src/bindings/crypto/bindings/conversion-core.ts

@@ -86,9 +86,7 @@ function conversionCorePerField(
 
     gateToRust(gate: Gate) {
       let [, typ, [, ...wires], coeffs] = gate;
-      let rustWires = new wasm.WasmGateWires(
-        ...mapTuple(wires, self.wireToRust)
-      );
+      let rustWires = new wasm.WasmGateWires(...mapTuple(wires, self.wireToRust));
       let rustCoeffs = fieldsToRustFlat(coeffs);
       return new Gate(typ, rustWires, rustCoeffs);
     },
@@ -104,14 +102,10 @@ function conversionCorePerField(
     pointFromRust: affineFromRust,
 
     pointsToRust([, ...points]: MlArray<OrInfinity>): Uint32Array {
-      return mapToUint32Array(points, (point) =>
-        unwrap(self.pointToRust(point))
-      );
+      return mapToUint32Array(points, (point) => unwrap(self.pointToRust(point)));
     },
     pointsFromRust(points: Uint32Array): MlArray<OrInfinity> {
-      let arr = mapFromUintArray(points, (ptr) =>
-        affineFromRust(wrap(ptr, CommitmentCurve))
-      );
+      let arr = mapFromUintArray(points, (ptr) => affineFromRust(wrap(ptr, CommitmentCurve)));
       return [0, ...arr];
     },
 
@@ -133,9 +127,7 @@ function conversionCorePerField(
       return mapToUint32Array(comms, (c) => unwrap(self.polyCommToRust(c)));
     },
     polyCommsFromRust(rustComms: Uint32Array): MlArray<PolyComm> {
-      let comms = mapFromUintArray(rustComms, (ptr) =>
-        self.polyCommFromRust(wrap(ptr, PolyComm))
-      );
+      let comms = mapFromUintArray(rustComms, (ptr) => self.polyCommFromRust(wrap(ptr, PolyComm)));
       return [0, ...comms];
     },
   };
@@ -176,18 +168,12 @@ function freeOnFinalize<T extends Freeable>(instance: T) {
   // directly, but unfortunately the destructor name is some mangled internal
   // string generated by wasm_bindgen. For now, this is the best,
   // least-brittle way to free once the original class instance gets collected.
-  let instanceRepresentative = wrap<T>(
-    (instance as any).__wbg_ptr,
-    (instance as any).constructor
-  );
+  let instanceRepresentative = wrap<T>((instance as any).__wbg_ptr, (instance as any).constructor);
   registry.register(instance, instanceRepresentative, instance);
   return instance;
 }
 
-function mapFromUintArray<T>(
-  array: Uint32Array | Uint8Array,
-  map: (i: number) => T
-) {
+function mapFromUintArray<T>(array: Uint32Array | Uint8Array, map: (i: number) => T) {
   let n = array.length;
   let result: T[] = Array(n);
   for (let i = 0; i < n; i++) {

src/bindings/crypto/bindings/conversion-oracles.ts

@@ -6,12 +6,7 @@ import type {
 } from '../../compiled/node_bindings/plonk_wasm.cjs';
 import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
 import { MlOption } from '../../../lib/ml/base.js';
-import {
-  Field,
-  Oracles,
-  RandomOracles,
-  ScalarChallenge,
-} from './kimchi-types.js';
+import { Field, Oracles, RandomOracles, ScalarChallenge } from './kimchi-types.js';
 import {
   fieldFromRust,
   fieldToRust,
@@ -80,11 +75,7 @@ function oraclesConversionPerField({ RandomOracles, Oracles }: WasmClasses) {
     let jointCombiner = ro.joint_combiner;
     let jointCombinerOption = MlOption<[0, ScalarChallenge, Field]>(
       jointCombinerChal &&
-        jointCombiner && [
-          0,
-          [0, fieldFromRust(jointCombinerChal)],
-          fieldFromRust(jointCombiner),
-        ]
+        jointCombiner && [0, [0, fieldFromRust(jointCombinerChal)], fieldFromRust(jointCombiner)]
     );
     let mlRo: RandomOracles = [
       0,