Merge pull request #58 from o1-labs/feature/split-ocaml-bindings

Post refactor clean up: Split OCaml libs
o1-labs · Jun 28, 2023 · f52126e · f52126e
2 parents f1bba7d + 102172f
commit f52126e
Show file tree

Hide file tree

Showing 13 changed files with 92,960 additions and 92,971 deletions.
diff --git a/compiled/node_bindings/snarky_js_node.bc.cjs b/compiled/node_bindings/snarky_js_node.bc.cjs
diff --git a/compiled/node_bindings/snarky_js_node.bc.map b/compiled/node_bindings/snarky_js_node.bc.map
diff --git a/compiled/web_bindings/snarky_js_web.bc.js b/compiled/web_bindings/snarky_js_web.bc.js
diff --git a/crypto/poseidon.unit-test.ts b/crypto/poseidon.unit-test.ts
@@ -4,8 +4,9 @@ import { testPoseidonLegacyFp } from './test_vectors/poseidonLegacy.js';
 import { expect } from 'expect';
 import { bigIntToBytes } from './bigint-helpers.js';
 import { test, Random } from '../../lib/testing/property.js';
-import { Poseidon as SnarkyPoseidon } from '../../lib/hash.js';
-import { Field } from '../../lib/core.js';
+import { Test } from '../../snarky.js';
+import { FieldConst } from '../../lib/field.js';
+import { MlArray } from '../../lib/ml/base.js';
 
 let testVectors = testPoseidonKimchiFp.test_vectors;
 
@@ -30,14 +31,17 @@ for (let i = 0; i < testVectors.length; i++) {
 console.log('poseidon implementation matches the test vectors! 🎉');
 
 test(Random.array(Random.field, Random.nat(20)), (xs) => {
-  let g1 = Poseidon.hashToGroup(xs);
-  let g2 = SnarkyPoseidon.hashToGroup(xs.map(Field));
+  let g1 = Poseidon.hashToGroup(xs)!;
+  let [, g2x, g2y] = Test.poseidon.hashToGroup(
+    MlArray.to(xs.map(FieldConst.fromBigint))
+  );
 
   expect(g1).toBeDefined();
 
-  expect(g1?.x).toEqual(g2.x.toBigInt());
-  expect(g1?.y.x0).toEqual(g2.y.x0.toBigInt());
-  expect(g1?.y.x1).toEqual(g2.y.x1.toBigInt());
+  expect(g1.x).toEqual(FieldConst.toBigint(g2x));
+
+  let g2y_ = FieldConst.toBigint(g2y);
+  expect(g1.y.x0 === g2y_ || g1.y.x1 === g2y_).toEqual(true);
 });
 
 console.log('poseidon hashToGroup implementations match! 🎉');

diff --git a/js/snarky-class-spec.js b/js/snarky-class-spec.js
@@ -83,6 +83,10 @@ export default [
         name: 'tokenId',
         type: 'object',
       },
+      {
+        name: 'poseidon',
+        type: 'object',
+      },
       {
         name: 'signature',
         type: 'object',