Merge branch 'querolita/napi-proof' into shigoto/native/napi/oracles

Author: querolita

src/bindings/crypto/bindings.ts

@@ -16,11 +16,13 @@ import { jsEnvironment } from './bindings/env.js';
 import { FpBindings, FqBindings } from './bindings/field.js';
 import { napiOraclesConversion } from './bindings/napi-conversion-oracles.js';
 import { srs } from './bindings/srs.js';
+import { srs as napiSrs } from './napi-srs.js';
 import { FpVectorBindings, FqVectorBindings } from './bindings/vector.js';
 import { napiConversionCore } from './napi-conversion-core.js';
 import { napiProofConversion } from './napi-conversion-proof.js';
+import type * as napiNamespace from '../compiled/node_bindings/plonk_wasm.cjs';
 
-export { RustConversion, Wasm, createNativeRustConversion, getRustConversion };
+export { RustConversion, Wasm, Napi, createNativeRustConversion, getRustConversion };
 
 /* TODO: Uncomment in phase 2 of conversion layer 
 import { conversionCore as conversionCoreNative } from './native/conversion-core.js';
@@ -50,12 +52,14 @@ const tsBindings = {
     return bundle.srsFactory(wasm, bundle.conversion);
   },*/
   srs: (wasm: Wasm) => srs(wasm, getRustConversion(wasm)),
+  srsNative: (napi: Napi) => napiSrs(napi, createNativeRustConversion(napi) as any),
 };
 
 // this is put in a global variable so that mina/src/lib/crypto/kimchi_bindings/js/bindings.js finds it
 (globalThis as any).__snarkyTsBindings = tsBindings;
 
 type Wasm = typeof wasmNamespace;
+type Napi = typeof napiNamespace;
 
 type RustConversion = ReturnType<typeof buildWasmConversion>;
 

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

@@ -1,3 +1,5 @@
+import { MlArray } from '../../../lib/ml/base.js';
+import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
 import type {
   WasmFpGate,
   WasmFpPolyComm,
@@ -6,27 +8,25 @@ import type {
   WasmGPallas,
   WasmGVesta,
 } from '../../compiled/node_bindings/plonk_wasm.cjs';
-import { OrInfinity, Gate, PolyComm, Wire } from './kimchi-types.js';
-import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
-import { MlArray } from '../../../lib/ml/base.js';
-import { mapTuple } from './util.js';
 import {
   WasmAffine,
   affineFromRust,
   affineToRust,
   fieldsFromRustFlat,
   fieldsToRustFlat,
 } from './conversion-base.js';
+import { Gate, OrInfinity, PolyComm, Wire } from './kimchi-types.js';
+import { mapTuple } from './util.js';
 
 export {
   ConversionCore,
   ConversionCores,
   conversionCore,
   freeOnFinalize,
-  wrap,
-  unwrap,
   mapFromUintArray,
   mapToUint32Array,
+  unwrap,
+  wrap,
 };
 
 // basic conversion functions for each field
@@ -116,7 +116,9 @@ function conversionCorePerField(
       return new PolyComm(rustUnshifted, rustShifted);
     },
     polyCommFromRust(polyComm: WasmPolyComm): PolyComm {
+      console.log('polyComm', polyComm);
       let rustUnshifted = polyComm.unshifted;
+      console.log('polyCommFromRust', rustUnshifted);
       let mlUnshifted = mapFromUintArray(rustUnshifted, (ptr) => {
         return affineFromRust(wrap(ptr, CommitmentCurve));
       });
@@ -174,6 +176,7 @@ function freeOnFinalize<T extends Freeable>(instance: T) {
 }
 
 function mapFromUintArray<T>(array: Uint32Array | Uint8Array, map: (i: number) => T) {
+  console.log('array', array);
   let n = array.length;
   let result: T[] = Array(n);
   for (let i = 0; i < n; i++) {

src/bindings/crypto/bindings/conversion-verifier-index.ts

@@ -1,3 +1,5 @@
+import { MlArray, MlBool, MlOption } from '../../../lib/ml/base.js';
+import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
 import type {
   WasmFpDomain,
   WasmFpLookupSelectors,
@@ -13,11 +15,9 @@ import type {
   WasmFqShifts,
   LookupInfo as WasmLookupInfo,
 } from '../../compiled/node_bindings/plonk_wasm.cjs';
-import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
-import { MlBool, MlArray, MlOption } from '../../../lib/ml/base.js';
-import { Field, VerifierIndex, Domain, VerificationEvals, PolyComm } from './kimchi-types.js';
 import { fieldFromRust, fieldToRust } from './conversion-base.js';
 import { ConversionCore, ConversionCores, freeOnFinalize } from './conversion-core.js';
+import { Domain, Field, PolyComm, VerificationEvals, VerifierIndex } from './kimchi-types.js';
 import { Lookup, LookupInfo, LookupSelectors } from './lookup.js';
 
 export { verifierIndexConversion };
@@ -117,6 +117,8 @@ function verifierIndexConversionPerField(
     );
   }
   function verificationEvalsFromRust(evals: WasmVerificationEvals): VerificationEvals {
+    console.log('evals', evals.coefficients_comm);
+
     let mlEvals: VerificationEvals = [
       0,
       core.polyCommsFromRust(evals.sigma_comm),

src/bindings/crypto/bindings/gate-vector-napi.unit-test.ts

@@ -6,9 +6,11 @@ import type { Field, Gate, Wire } from './kimchi-types.js';
 const require = createRequire(import.meta.url);
 
 function loadNative() {
+  const slug = `${process.platform}-${process.arch}`;
   const candidates = [
-    '../../compiled/_node_bindings/plonk_napi.node',
+    `../../../../../native/${slug}/plonk_napi.node`,
     '../../compiled/node_bindings/plonk_napi.node',
+    '../../compiled/_node_bindings/plonk_napi.node',
   ];
   for (const path of candidates) {
     try {
@@ -23,6 +25,21 @@ function loadNative() {
 
 const native: any = loadNative();
 
+const gateVectorCreate =
+  native.caml_pasta_fp_plonk_gate_vector_create ?? native.camlPastaFpPlonkGateVectorCreate;
+const gateVectorLen =
+  native.caml_pasta_fp_plonk_gate_vector_len ?? native.camlPastaFpPlonkGateVectorLen;
+const gateVectorAdd =
+  native.caml_pasta_fp_plonk_gate_vector_add ?? native.camlPastaFpPlonkGateVectorAdd;
+const gateVectorGet =
+  native.caml_pasta_fp_plonk_gate_vector_get ?? native.camlPastaFpPlonkGateVectorGet;
+const gateVectorWrap =
+  native.caml_pasta_fp_plonk_gate_vector_wrap ?? native.camlPastaFpPlonkGateVectorWrap;
+const gateVectorDigest =
+  native.caml_pasta_fp_plonk_gate_vector_digest ?? native.camlPastaFpPlonkGateVectorDigest;
+const circuitSerialize =
+  native.caml_pasta_fp_plonk_circuit_serialize ?? native.camlPastaFpPlonkCircuitSerialize;
+
 const { fp } = napiConversionCore(native);
 
 const zeroField: Field = [0, 0n];
@@ -44,24 +61,24 @@ const sampleGate: Gate = [
   [0, zeroField, zeroField, zeroField, zeroField, zeroField, zeroField, zeroField],
 ];
 
-const vector = native.camlPastaFpPlonkGateVectorCreate();
-expect(native.camlPastaFpPlonkGateVectorLen(vector)).toBe(0);
+const vector = gateVectorCreate();
+expect(gateVectorLen(vector)).toBe(0);
 
-native.camlPastaFpPlonkGateVectorAdd(vector, fp.gateToRust(sampleGate));
-expect(native.camlPastaFpPlonkGateVectorLen(vector)).toBe(1);
+gateVectorAdd(vector, fp.gateToRust(sampleGate));
+expect(gateVectorLen(vector)).toBe(1);
 
-const gate0 = native.camlPastaFpPlonkGateVectorGet(vector, 0);
+const gate0 = gateVectorGet(vector, 0);
 expect(gate0.typ).toBe(sampleGate[1]);
 
 const rustTarget = fp.wireToRust(mlWire(0, 0));
 const rustHead = fp.wireToRust(mlWire(1, 2));
-native.camlPastaFpPlonkGateVectorWrap(vector, rustTarget, rustHead);
-const wrapped = native.camlPastaFpPlonkGateVectorGet(vector, 0);
+gateVectorWrap(vector, rustTarget, rustHead);
+const wrapped = gateVectorGet(vector, 0);
 expect(wrapped.wires.w0).toEqual({ row: 1, col: 2 });
 
-native.camlPastaFpPlonkGateVectorDigest(0, vector);
-native.camlPastaFpPlonkCircuitSerialize(0, vector);
+gateVectorDigest(0, vector);
+circuitSerialize(0, vector);
 
-console.log('{}', native.camlPastaFpPlonkGateVectorDigest(0, vector));
+console.log('{}', gateVectorDigest(0, vector));
 
 console.log('gate vector napi bindings (fp) are working ✔️');