Merge pull request #560 from o1-labs/remove-timestamp

Remove timestamp field in zkapp_precondition
o1-labs · Dec 12, 2022 · 5bb548d · 5bb548d
2 parents 64849ca + 42895ad
commit 5bb548d
Show file tree

Hide file tree

Showing 23 changed files with 97,181 additions and 96,963 deletions.
diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml
@@ -3,10 +3,18 @@ on:
   push:
     branches:
       - main
+<<<<<<< HEAD
+      - releases
+=======
+>>>>>>> f3bf87176ba45a011cd73cafad4e97890b6c398a
       - berkeley
   pull_request:
     branches:
       - main
+<<<<<<< HEAD
+      - releases
+=======
+>>>>>>> f3bf87176ba45a011cd73cafad4e97890b6c398a
       - berkeley
   workflow_dispatch: {}
 

diff --git a/MINA_COMMIT b/MINA_COMMIT
@@ -1,2 +1,2 @@
 The mina commit used to generate the backends for node and chrome is
-fac383347373bc79d3b9a3f7828ced234595ccfe
+178ef41c077318add03e2c0631d4c32ad2d47638
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/chrome_bindings/plonk_wasm.d.ts b/src/chrome_bindings/plonk_wasm.d.ts