bindings: conversion bundle for rust between wasm and native

Author: querolita

src/bindings/crypto/bindings.ts

@@ -16,8 +16,15 @@ import { verifierIndexConversion } from './bindings/conversion-verifier-index.js
 import { oraclesConversion } from './bindings/conversion-oracles.js';
 import { jsEnvironment } from './bindings/env.js';
 import { srs } from './bindings/srs.js';
+// native
+import { conversionCore as conversionCoreNative } from './native/conversion-core.js';
+import { fieldsFromRustFlat as fieldsFromRustFlatNative, fieldsToRustFlat as fieldsToRustFlatNative } from './native/conversion-base.js';
+import { proofConversion as proofConversionNative } from './native/conversion-proof.js';
+import { verifierIndexConversion as verifierIndexConversionNative } from './native/conversion-verifier-index.js';
+import { oraclesConversion as oraclesConversionNative } from './native/conversion-oracles.js';
+import { srs as srsNative } from './native/srs.js';
 
-export { getRustConversion, RustConversion, Wasm, createNativeRustConversion };
+export { getRustConversion, type RustConversion, type NativeConversion, type Wasm };
 
 const tsBindings = {
   jsEnvironment,
@@ -31,28 +38,28 @@ const tsBindings = {
   ...FpVectorBindings,
   ...FqVectorBindings,
   rustConversion: createRustConversion,
-  nativeRustConversion: createNativeRustConversion,
-  srs: (wasm: Wasm) => srs(wasm, getRustConversion(wasm)),
+  srs: (wasm: Wasm) => {
+    const bundle = getConversionBundle(wasm);
+    return bundle.srsFactory(wasm, bundle.conversion);
+  },
 };
 
 // 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;
 
-function createNativeRustConversion(wasm: Wasm) {
-  return buildConversion(wasm);
+function createRustConversion(wasm: Wasm): RustConversion {
+  return shouldUseNativeConversion(wasm)
+    ? createNativeConversion(wasm)
+    : createWasmConversion(wasm);
 }
 
-function createRustConversion(wasm: Wasm) {
-  return buildConversion(wasm);
-}
-
-function buildConversion(wasm: Wasm) {
-  let core = conversionCore(wasm);
-  let verifierIndex = verifierIndexConversion(wasm, core);
-  let oracles = oraclesConversion(wasm);
-  let proof = proofConversion(wasm, core);
+function createWasmConversion(wasm: Wasm) {
+  const core = conversionCore(wasm);
+  const verifierIndex = verifierIndexConversion(wasm, core);
+  const oracles = oraclesConversion(wasm);
+  const proof = proofConversion(wasm, core);
 
   return {
     fp: { ...core.fp, ...verifierIndex.fp, ...oracles.fp, ...proof.fp },
@@ -64,10 +71,45 @@ function buildConversion(wasm: Wasm) {
   };
 }
 
-type RustConversion = ReturnType<typeof buildConversion>;
+type WasmConversion = ReturnType<typeof createWasmConversion>;
+type NativeConversion = ReturnType<typeof createNativeConversion>;
+type RustConversion = WasmConversion | NativeConversion;
+
+function getRustConversion(wasm: Wasm): RustConversion {
+  return createRustConversion(wasm);
+}
+
+function createNativeConversion(wasm: Wasm) {
+  const core = conversionCoreNative(wasm);
+  const verifierIndex = verifierIndexConversionNative(wasm, core);
+  const oracles = oraclesConversionNative(wasm);
+  const proof = proofConversionNative(wasm, core);
+
+  return {
+    fp: { ...core.fp, ...verifierIndex.fp, ...oracles.fp, ...proof.fp },
+    fq: { ...core.fq, ...verifierIndex.fq, ...oracles.fq, ...proof.fq },
+    fieldsToRustFlatNative,
+    fieldsFromRustFlatNative,
+    wireToRust: core.wireToRust,
+    mapMlArrayToRustVector: core.mapMlArrayToRustVector,
+  };
+}
+
+function shouldUseNativeConversion(wasm: Wasm): boolean {
+  const marker = (wasm as any).__kimchi_use_native;
+  const globalMarker =
+    typeof globalThis !== 'undefined' &&
+    (globalThis as any).__kimchi_use_native;
+  return Boolean(marker || globalMarker);
+}
 
-let rustConversion: RustConversion | undefined;
+type ConversionBundle =
+  | { conversion: WasmConversion; srsFactory: typeof srs }
+  | { conversion: NativeConversion; srsFactory: typeof srsNative };
 
-function getRustConversion(wasm: Wasm) {
-  return rustConversion ?? (rustConversion = createRustConversion(wasm));
+function getConversionBundle(wasm: Wasm): ConversionBundle {
+  if (shouldUseNativeConversion(wasm)) {
+    return { conversion: createNativeConversion(wasm), srsFactory: srsNative };
+  }
+  return { conversion: createWasmConversion(wasm), srsFactory: srs };
 }

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

@@ -0,0 +1,11 @@
+import type * as wasmNamespace from '../../compiled/node_bindings/plonk_wasm.cjs';
+
+import { conversionCore as conversionCoreWasm, ConversionCores } from '../bindings/conversion-core.js';
+
+export type NativeConversionCores = ConversionCores;
+
+type Wasm = typeof wasmNamespace;
+
+export function conversionCore(wasm: Wasm): NativeConversionCores {
+  return conversionCoreWasm(wasm);
+}