Merge pull request #2544 from o1-labs/leon/develop-from-main

fix: merge conflict between develop and main

Author: bleepbloopsify

.config/cspell.json

@@ -0,0 +1,12 @@
+{
+  // Version of the setting file.  Always 0.2
+  "version": "0.2",
+  // language - current active spelling language
+  "language": "en",
+  // words - list of words to be always considered correct
+  "words": ["tarides", "nixbuild", "stefanzweifel", "ACMRT", "Oxlint"],
+  // flagWords - list of words to be always considered incorrect
+  // This is useful for offensive words and common spelling errors.
+  // For example "hte" should be "the"
+  "flagWords": []
+}

.github/dependabot.yml

@@ -0,0 +1,36 @@
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    reviewers:
+      - "o1-labs/o1js-admins"
+    labels:
+      - "dependencies"
+      - "javascript"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+      development-dependencies:
+        dependency-type: "development"
+    commit-message:
+      prefix: "npm"
+      include: "scope"
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "o1-labs/o1js-admins"
+    labels:
+      - "dependencies"
+      - "github-actions"
+    commit-message:
+      prefix: "github-actions"
+      include: "scope"

.github/workflows/checks.yml

@@ -38,6 +38,15 @@ jobs:
   Prepare:
     runs-on: ubuntu-latest
     steps:
+      - name: Free space on runner
+        run: |
+          df -h
+          sudo rm -rf /usr/local/lib/android \
+                      /usr/share/dotnet \
+                      /opt/ghc \
+                      "$AGENT_TOOLSDIRECTORY" || true
+          docker system prune -af --volumes || true
+          df -h
       - name: Checkout repository with submodules
         uses: actions/checkout@v4
         with:
@@ -51,7 +60,7 @@ jobs:
           ref: ${{ inputs.target_ref || github.ref }}
           proof_systems_commit: ${{ inputs.proof_systems_commit }}
 
-  Lint-Format-and-TypoCheck:
+  Lint-and-Format:
     strategy:
       matrix:
         node: [20]
@@ -96,21 +105,23 @@ jobs:
         if: steps.get_changed_files.outputs.files_changed == 'true'
         run: xargs npm run lint:strict < changed_files.txt
 
-      - name: Run codespell
-        if: steps.get_changed_files.outputs.files_changed == 'true' && github.event.pull_request.labels.*.name != 'no-typo-check'
-        uses: codespell-project/actions-codespell@master
-        with:
-          check_filenames: true
-          path: ${{ steps.get_changed_files.outputs.files }}
-          skip: "*.json,./node_modules,./dist,./.husky,./.git,./src/mina/**/*,./src/bindings/compiled/**/*"
-          check_hidden: false
-          ignore_words_list: "tHi,modul,optin,deriver,PRing,toWords,iSelf"
+      - name: Run Markdown Format Check
+        run: npm run format:md:check
 
   Upload-bindings:
     name: upload bindings artifact
     if: ${{ inputs.proof_systems_commit == '' }}
     runs-on: ubuntu-latest
     steps:
+      - name: Free space on runner
+        run: |
+          df -h
+          sudo rm -rf /usr/local/lib/android \
+                      /usr/share/dotnet \
+                      /opt/ghc \
+                      "$AGENT_TOOLSDIRECTORY" || true
+          docker system prune -af --volumes || true
+          df -h
       - uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -140,6 +151,7 @@ jobs:
             'Verification Key Regression Check 1',
             'Verification Key Regression Check 2',
             'CommonJS test',
+            'Cache Regression',
           ]
     steps:
       - name: Checkout repository with submodules
@@ -155,6 +167,10 @@ jobs:
           repository: ${{ inputs.target_repo || github.repository }}
           ref: ${{ inputs.target_ref || github.ref }}
           proof_systems_commit: ${{ inputs.proof_systems_commit }}
+      - uses: 'google-github-actions/auth@v3'
+        name: Setup gcloud authentication
+        with:
+          credentials_json: '${{ secrets.GCP_O1JS_CI_BUCKET_SERVICE_ACCOUNT_KEY }}'
       - name: Prepare for tests
         run: touch profiling.md
       - name: Execute tests

.github/workflows/pull_requests.yml

@@ -39,3 +39,56 @@ jobs:
         with:
           commit_message: "auto update npmDepsHash"
           file_pattern: "npmDepsHash"
+
+
+  Lint-Format-and-TypoCheck:
+    if: github.event.pull_request.labels.*.name != 'skip-lint'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Setup Node.JS
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Get changed files
+        id: changed_files
+        run: |
+          git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
+          git fetch --depth=1 origin ${{ github.event.pull_request.head.sha }}
+          git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > changed_files.txt
+          TOTAL=$(wc -l < changed_files.txt)
+          echo "count=$TOTAL" >> $GITHUB_OUTPUT
+
+      - name: Run Prettier Check
+        if: steps.changed_files.outputs.count > 0
+        run: xargs npm run format:check < changed_files.txt
+        continue-on-error: true
+
+      - name: Run Oxlint
+        if: steps.changed_files.outputs.count > 0
+        run: xargs npm run lint:strict < changed_files.txt
+        continue-on-error: true
+
+      - name: Run Markdown Format Check
+        run: npm run format:md:check
+        continue-on-error: true
+
+      - name: Run cspell
+        if: github.event.pull_request.labels.*.name != 'no-typo-check'
+        uses: streetsidesoftware/cspell-action@v7
+        continue-on-error: true
+        with:
+          config: .config/cspell.json
+      
+      - name: Fail if any checks fail
+        if: failure()
+        run: echo "Some checks failed, failing" && exit 1

.github/workflows/push_main.yml

@@ -87,10 +87,10 @@ jobs:
         uses: ./.github/actions/build
       - name: Build o1js and mina-signer
         run: |
-          npm run prepublishOnly
+          npm run prepublish:full
           cd src/mina-signer
           npm ci
-          npm run prepublishOnly
+          npm run prepublish:full
       - name: Publish o1js and mina-signer on pkg-pr-new
         run: npx pkg-pr-new publish ./ ./src/mina-signer # Enable `--compact` once published to NPM with `repository` in package.json
 
@@ -123,7 +123,7 @@ jobs:
       - name: Build o1js
         run: |
           npm ci
-          npm run prepublishOnly
+          npm run prepublish:full
 
       - name: Publish to NPM if version has changed
         id: publish

.github/workflows/upload-cache-regressions-artifacts.yml

@@ -0,0 +1,21 @@
+name: Upload Cache Regressions Artifacts
+on:
+  workflow_dispatch:
+
+jobs:
+  upload-artifacts:
+    name: Upload Cache Regressions Artifacts
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository with submodules
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Build
+      uses: ./.github/actions/build
+    - uses: 'google-github-actions/auth@v3'
+      name: Setup gcloud authentication
+      with:
+        credentials_json: '${{ secrets.GCP_O1JS_CI_BUCKET_SERVICE_ACCOUNT_KEY }}'
+    - name: Generate artifacts and upload to GS
+      run: ./scripts/tests/dump-cache-regressions.sh

.husky/pre-commit

@@ -9,5 +9,5 @@ fi
 echo "⚠️   Husky pre-commit hook enabled. Disable it with: git config --unset husky.optin"
 
 # Filter for diffed (excluding deleted) js and ts files, and format them according to oxlint and prettier rules
-git diff --cached --name-only --diff-filter=d | grep -E '\.(ts|js)$' | xargs npm run lint:fix
-git diff --cached --name-only --diff-filter=d | grep -E '\.(ts|js)$' | xargs npm run format
+git diff --cached --name-only --diff-filter=d | grep -E '\.(ts|js|md)$' | xargs npm run lint:fix
+git diff --cached --name-only --diff-filter=d | grep -E '\.(ts|js|md)$' | xargs npm run format

.oxlintrc.json

@@ -1,13 +1,14 @@
 {
-  "extends": "oxlint/recommended",
+  "extends": ["oxlint/recommended"],
   "rules": {
     "erasing-op": "off",
     "no-new-array": "off",
     "no-this-alias": "off",
     "no-unsafe-finally": "off",
     "no-unused-labels": "off",
     "no-useless-escape": "off",
-    "no-wrapper-object-types": "off"
+    "no-wrapper-object-types": "off",
+    "no-unused-vars": "off"
   },
   "ignorePatterns": [
     "_build/",

.prettierignore

@@ -4,6 +4,10 @@ benchmark/
 dist/
 node_modules/
 o1js-reference/
-src/bindings/
+src/bindings/compiled/
 src/mina/
 **/*.d.ts
+# These files are generated by proof-systems
+# no need to run prettier on it
+src/bindings/crypto/test-vectors/poseidon-kimchi.ts
+src/bindings/crypto/test-vectors/poseidon-legacy.ts

.prettierrc.cjs

@@ -4,4 +4,14 @@ module.exports = {
   semi: true,
   singleQuote: true,
   printWidth: 100,
+  overrides: [
+    {
+      files: '*.md',
+      options: {
+        printWidth: 80,
+        proseWrap: 'always',
+      },
+    },
+  ],
+  plugins: [require.resolve('prettier-plugin-organize-imports')],
 };