bindings: use native conversion for prover keys

Author: querolita

src/bindings/crypto/bindings.ts

@@ -14,12 +14,12 @@ import { verifierIndexConversion } from './bindings/conversion-verifier-index.js
 import { PallasBindings, VestaBindings } from './bindings/curve.js';
 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 { napiOraclesConversion } from './bindings/napi-conversion-oracles.js';
 import { napiVerifierIndexConversion } from './napi-conversion-verifier-index.js';
 import type * as napiNamespace from '../compiled/node_bindings/plonk_wasm.cjs';
 

src/lib/proof-system/prover-keys.ts

@@ -10,7 +10,8 @@ import {
   WasmPastaFpPlonkIndex,
   WasmPastaFqPlonkIndex,
 } from '../../bindings/compiled/node_bindings/plonk_wasm.cjs';
-import { getRustConversion } from '../../bindings/crypto/bindings.js';
+// TODO: include conversion bundle to decide between wasm and napi conversion
+import { createNativeRustConversion, getRustConversion } from '../../bindings/crypto/bindings.js';
 import { VerifierIndex } from '../../bindings/crypto/bindings/kimchi-types.js';
 import { MlString } from '../ml/base.js';
 import { CacheHeader, cacheHeaderVersion } from './cache.js';
@@ -95,21 +96,21 @@ function encodeProverKey(value: SnarkKey): Uint8Array {
     case KeyType.StepProvingKey: {
       let index = value[1][1];
       let encoded = wasm.caml_pasta_fp_plonk_index_encode(
-        (wasm as any).prover_index_fp_from_bytes(index.serialize())
+        (wasm as any).prover_index_fp_deserialize((wasm as any).prover_index_fp_serialize(index))
       );
       return encoded;
     }
     case KeyType.StepVerificationKey: {
       let vkMl = value[1];
-      const rustConversion = getRustConversion(wasm);
+      const rustConversion = createNativeRustConversion(wasm);
       let vkWasm = rustConversion.fp.verifierIndexToRust(vkMl);
       let string = wasm.caml_pasta_fp_plonk_verifier_index_serialize(vkWasm);
       return new TextEncoder().encode(string);
     }
     case KeyType.WrapProvingKey: {
       let index = value[1][1];
       let encoded = wasm.caml_pasta_fq_plonk_index_encode(
-        (wasm as any).prover_index_fq_from_bytes(index.serialize())
+        (wasm as any).prover_index_fq_deserialize((wasm as any).prover_index_fq_serialize(index))
       );
       return encoded;
     }
@@ -139,7 +140,7 @@ function decodeProverKey(header: SnarkKeyHeader, bytes: Uint8Array): SnarkKey {
       let srs = Pickles.loadSrsFp();
       let string = new TextDecoder().decode(bytes);
       let vkWasm = wasm.caml_pasta_fp_plonk_verifier_index_deserialize(srs, string);
-      const rustConversion = getRustConversion(wasm);
+      const rustConversion = createNativeRustConversion(wasm);
       let vkMl = rustConversion.fp.verifierIndexFromRust(vkWasm);
       return [KeyType.StepVerificationKey, vkMl];
     }