Merge pull request #1839 from o1-labs/merge-main-v2

Merge main into V2 to fix CI
o1-labs · Sep 26, 2024 · eb56a56 · eb56a56
2 parents 5f761df + cea574d
commit eb56a56
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml
@@ -168,9 +168,11 @@ jobs:
           shopt -s globstar
           test_files=(./dist/node/**/*.unit-test.js)
 
+          set -o pipefail
+
           for ((i=start_index; i<end_index && i<${#test_files[@]}; i++)); do
-            echo "Running test: ${test_files[$i]}"
-            node --enable-source-maps "${test_files[$i]}" | tee -a profiling.md
+              echo "Running test: ${test_files[$i]}"
+              node --enable-source-maps "${test_files[$i]}" | tee -a profiling.md
           done
         continue-on-error: false
 

diff --git a/.github/workflows/live-tests.yml b/.github/workflows/live-tests.yml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - v2
   pull_request:
     branches:
       - main
+      - v2
   workflow_dispatch: {}
 
 jobs:

diff --git a/audits/VAR_o1js_240318_o1js_V3.pdf b/audits/VAR_o1js_240318_o1js_V3.pdf
diff --git a/src/bindings b/src/bindings
diff --git a/src/lib/proof-system/proof-system.unit-test.ts b/src/lib/proof-system/proof-system.unit-test.ts
@@ -35,7 +35,9 @@ it('pickles rule creation', async () => {
   // a rule that verifies a proof conditionally, and returns the proof's input as output
   function main(proof: EmptyProof, shouldVerify: Bool) {
     proof.verifyIf(shouldVerify);
-    return proof.publicInput;
+    return {
+      publicOutput: proof.publicInput,
+    };
   }
   let privateInputs = [EmptyProof, Bool];
 

diff --git a/src/mina b/src/mina