Merge bc8d963 into 6a91f15

Author: Geometer1729

.eslintignore

@@ -0,0 +1,3 @@
+# Don't lint generated files
+src/bindings/compiled/
+src/bindings/mina-transaction/gen/

.github/workflows/build-bindings.yml

@@ -2,7 +2,7 @@
 # community can change them without being scared of breaking things, or
 # needing to do the complicated (without nix) build setup.
 
-name: Build o1js bindings
+name: Build precompiled bindings
 
 on:
   pull_request:
@@ -12,8 +12,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check-npm-deps:
-    name: check-npm-deps
+  nix-builds:
+    name: build-bindings-ubuntu
     runs-on: [sdk-self-hosted-linux-amd64-build-system]
     steps:
       - name: Set up Nix
@@ -23,66 +23,53 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Try to build
+      - name: Build npm-deps
+        id: build-npm-deps
         run: |
           set -Eeu
           ./pin.sh
-          nix build o1js#npm-deps
-  update-npm-deps:
-    needs: check-npm-deps
-    if: ${{ failure() }}
-    runs-on: [sdk-self-hosted-linux-amd64-build-system]
-    steps:
-      - name: Set up Nix
-        run: echo "PATH=$PATH:/nix/var/nix/profiles/default/bin" >> $GITHUB_ENV
-      - name: update-hash
-        run: nix run o1js#update-npm-deps
-      - uses: parkerbxyz/suggest-changes@v1
-        with:
-          comment: 'please update the npm-deps-hash'
-          event: 'REQUEST_CHANGES'
-
-  nix-build:
-    name: build-bindings-ubuntu
-    runs-on: [sdk-self-hosted-linux-amd64-build-system]
-    steps:
-      - name: Set up Nix
-        run: echo "PATH=$PATH:/nix/var/nix/profiles/default/bin" >> $GITHUB_ENV
-      - name: Disable smudging
-        run: echo "GIT_LFS_SKIP_SMUDGE=1" >> $GITHUB_ENV
-      - uses: actions/checkout@v4
+          if ! nix build o1js#npm-deps
+          then
+            echo npmDepsHash out of date
+            echo a fix will be pushed to ${{ github.head_ref }}-ci-fix
+            echo please run ./use-ci-fix.sh
+            exit 1
+          fi
+      - name: fix npmDepsHash
+        if: failure() && steps.build-npm-deps.outcome == 'failure'
+        run: |
+          set -Eeu
+          ./pin.sh
+          nix run o1js#update-npm-deps
+      - name: Commit changes
+        if: failure() && steps.build-npm-deps.outcome == 'failure'
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          submodules: recursive
+          commit_message: "update npmDepsHash"
+          file_pattern: 'npmDepsHash'
+          branch: ${{ github.head_ref}}-ci-fix
+          create_branch: true
       - name: Build the o1js bindings
+        id: bindings-build
         run: |
           set -Eeu
-          ./pin.sh
           nix run o1js#update-bindings --max-jobs 4
-          #fail if this changes any files
-          cd src/bindings
-          echo If this check fails you can download a patch from the patch-upload job
-          echo "https://github.com/o1-labs/o1js/blob/main/README-dev.md#bindings-check-in-ci"
-          git diff --exit-code
+          if ! git diff --name-only --exit-code src/bindings
+          then
+            echo bindings need to be rebuilt
+            echo a fix will be pushed to ${{ github.head_ref }}-ci-fix
+            echo please run ./use-ci-fix.sh
+            exit 1
+          fi
+      - name: Commit new bindings
+        if: failure() && steps.bindings-build.outcome == 'failure'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "recompile bindings"
+          file_pattern: 'src/bindings/*'
+          branch: ${{ github.head_ref}}-ci-fix
+          create_branch: true
       - name: add build to gc-root if on main
         if: github.ref == 'refs/heads/main'
         run: |
           nix build o1js#o1js-bindings --out-link /home/app/actions-runner/nix-cache/main-bindings-gcroot
-      - name: Cleanup the Nix store
-        run: |
-          nix-store --gc --print-dead
-          nix-store --optimise
-  patch-upload:
-    needs: nix-build
-    if: ${{ failure() }}
-    runs-on: [sdk-self-hosted-linux-amd64-build-system]
-    steps:
-      - name: generate patch
-        run: |
-          cd src/bindings
-          git add .
-          git diff HEAD --textconv --text > ../../bindings.patch
-      - name: Upload patch
-        uses: actions/upload-artifact@v4
-        with:
-          name: bindings.patch
-          path: bindings.patch

.github/workflows/lint.yml

@@ -28,8 +28,9 @@ jobs:
         id: get_changed_files
         run: |
           git fetch origin main --depth=1
-          CHANGED_FILES=$(git diff --name-only origin/main | grep -E '\.(ts|js)$' || true)
-          
+          # TODO ideally lint the non-generated files in src/bindings/
+          CHANGED_FILES=$(git diff --name-only origin/main | grep -E '\.(ts|js)$' | grep -v 'src/bindings/*' || true)
+
           if [ -n "$CHANGED_FILES" ]; then
             echo "Files changed:"
             echo "$CHANGED_FILES"

.github/workflows/nix-clean.yml

@@ -0,0 +1,23 @@
+# This is the slowest part of the CI now so I think it's better to just do it daily
+# instead of every commit
+name: Clean nix store
+
+on:
+  schedule:
+    - cron: '0 0 * * *' # once per day at midnight
+  workflow_dispatch: # can be run with gh workflow run 'Clean nix store'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  nix-cleanup:
+    - name: Set up Nix
+      run: echo "PATH=$PATH:/nix/var/nix/profiles/default/bin" >> $GITHUB_ENV
+    - name: Cleanup the Nix store
+      if: always()
+      run: |
+        nix-store --gc --print-dead
+        nix-store --optimise
+

.github/workflows/nix.yml

@@ -1,19 +1,15 @@
-name: nix
-on:
-  workflow_dispatch:
-    inputs:
-      name:
-        description: 'Commit nix fixes'
-        default: 'World'
-        required: true
+name: nix # Change to Update mina after testing
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on:
+  #schedule:
+  #  - cron: '0 0 * * 0'  # Runs every sunday
+  workflow_dispatch:  # Empty workflow_dispatch trigger
 
 jobs:
-  nix-fixes:
-    runs-on: [sdk-self-hosted-linux-amd64-build-system]
+  update-and-create-pr:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: Set up Nix
         run: echo "PATH=$PATH:/nix/var/nix/profiles/default/bin" >> $GITHUB_ENV
@@ -22,3 +18,23 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - name: Build the o1js bindings
+        run: |
+          pushd src/mina
+          git switch compatible
+          git pull
+          popd
+          git add src/mina
+          nix run o1js#update-bindings --max-jobs 4
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update mina
+          title: '[Automated] Update mina'
+          body: |
+            This PR is automatically generated to update inputs.
+            Please review the changes and merge if appropriate.
+          branch: automated-input-update
+          base: main

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "src/o1js-bindings"]
-	path = src/bindings
-	url = https://github.com/o1-labs/o1js-bindings.git
 [submodule "src/mina"]
 	path = src/mina
 	url = https://github.com/MinaProtocol/mina.git

CODEOWNERS

@@ -5,3 +5,7 @@
 # We are relying on good faith to wait for admin approval on these PRs
 # Dangerous PRs that could release a new version, new consensus rules, or anything like that will necessarily touch more than `/src/lib`, so this is minimally risky
 /src/lib @o1-labs/o1js-admins @o1-labs/exploration-team @o1-labs/future-zkapps
+
+# Taken from o1js0-bindings
+/CODEOWNERS @bkase @mitschabaude @mrmr1993
+/src/bindings @o1-labs/eng

flake.lock

@@ -2,7 +2,7 @@
   description = "o1js - TypeScript framework for zk-SNARKs and zkApps";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11-small";
-    mina.url = "path:src/mina";
+    mina.url = "git+file:src/mina?submodules=1";
     nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
     nixpkgs-mozilla.flake = false;
     describe-dune.url = "github:o1-labs/describe-dune";
@@ -119,7 +119,7 @@
           [
             nodejs
             nodePackages.npm
-            #nodePackages.prettier
+            nodePackages.prettier
             typescript
             nodePackages.typescript-language-server
             rustup