chore: cleanup napi types a little more

Author: bleepbloopsify

package.json

@@ -147,6 +147,6 @@
     "@o1js/native-win32-x64": "file:./native/win32-x64"
   },
   "o1js-internal": {
-    "native-version": "0.0.1-dev.3"
+    "native-version": "0.0.1-dev.4"
   }
 }

src/bindings/crypto/bindings/srs.ts

@@ -1,18 +1,18 @@
-import type { Wasm, RustConversion } from '../bindings.js';
-import { type WasmFpSrs, type WasmFqSrs } from '../../compiled/node_bindings/plonk_wasm.cjs';
-import { PolyComm } from './kimchi-types.js';
+import { MlArray } from '../../../lib/ml/base.js';
 import {
-  type CacheHeader,
-  type Cache,
+  readCache,
   withVersion,
   writeCache,
-  readCache,
+  type Cache,
+  type CacheHeader,
 } from '../../../lib/proof-system/cache.js';
 import { assert } from '../../../lib/util/errors.js';
-import { MlArray } from '../../../lib/ml/base.js';
+import { type WasmFpSrs, type WasmFqSrs } from '../../compiled/node_bindings/plonk_wasm.cjs';
+import type { RustConversion, Wasm } from '../bindings.js';
 import { OrInfinity, OrInfinityJson } from './curve.js';
+import { PolyComm } from './kimchi-types.js';
 
-export { srs, setSrsCache, unsetSrsCache };
+export { setSrsCache, srs, unsetSrsCache };
 
 type WasmSrs = WasmFpSrs | WasmFqSrs;
 

src/mina

@@ -0,0 +1,15 @@
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+
+const { platform, arch } = process;
+const slug = `@o1js/native-${platform}-${arch}`;
+
+export default (() => {
+  try {
+    return require(slug);
+  } catch (e) {
+    if (process.env.O1JS_REQUIRE_NATIVE_BINDINGS) {
+      throw e;
+    }
+  }
+})();

src/native/native.ts

@@ -1,4 +1,4 @@
-import native from '@o1js/native-darwin-arm64';
+import native from '../../src/native/native';
 import { Field, ZkProgram, verify } from 'o1js';
 
 let MyProgram = ZkProgram({

tests/native/native-integration.ts

@@ -1,5 +1,5 @@
-import native from '@o1js/native-darwin-arm64';
 import assert from 'node:assert';
+import native from '../../src/native/native';
 
 console.log(native);