Merge pull request #975 from o1-labs/feature/update-proof-systems

Fixup deserialization of proof-systems JSON format
o1-labs · Jun 8, 2023 · 796c55f · 796c55f
2 parents 406f3ff + fe33005
commit 796c55f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml
@@ -4,10 +4,12 @@ on:
     branches:
       - main
       - berkeley
+      - develop
   pull_request:
     branches:
       - main
       - berkeley
+      - develop
   workflow_dispatch: {}
 
 jobs:

diff --git a/src/bindings b/src/bindings
diff --git a/src/lib/provable-context.ts b/src/lib/provable-context.ts
@@ -1,6 +1,6 @@
 import { Context } from './global-context.js';
 import { Gate, JsonGate, Snarky } from '../snarky.js';
-import { bytesToBigInt } from '../bindings/crypto/bigint-helpers.js';
+import { parseHexString } from '../bindings/crypto/bigint-helpers.js';
 import { prettifyStacktrace } from './errors.js';
 
 // internal API
@@ -105,12 +105,8 @@ function constraintSystem<T>(f: () => T) {
 // helpers
 
 function gatesFromJson(cs: { gates: JsonGate[]; public_input_size: number }) {
-  let gates: Gate[] = cs.gates.map(({ typ, wires, coeffs: byteCoeffs }) => {
-    let coeffs = [];
-    for (let coefficient of byteCoeffs) {
-      let arr = new Uint8Array(coefficient);
-      coeffs.push(bytesToBigInt(arr).toString());
-    }
+  let gates: Gate[] = cs.gates.map(({ typ, wires, coeffs: hexCoeffs }) => {
+    let coeffs = hexCoeffs.map(hex => parseHexString(hex).toString());
     return { type: typ, wires, coeffs };
   });
   return { publicInputSize: cs.public_input_size, gates };

diff --git a/src/snarky.d.ts b/src/snarky.d.ts
@@ -222,7 +222,7 @@ declare const Snarky: {
 type JsonGate = {
   typ: string;
   wires: { row: number; col: number }[];
-  coeffs: number[][];
+  coeffs: string[];
 };
 type JsonConstraintSystem = { gates: JsonGate[]; public_input_size: number };