Merge branch 'master' into triedb-batch-sizes

Author: magicxyyz

.github/workflows/arbitrator-ci.yml

@@ -28,7 +28,7 @@ env:
 jobs:
   arbitrator:
     name: Run Arbitrator tests
-    runs-on: ubuntu-8
+    runs-on: arbitrator-ci
     steps:
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
@@ -48,7 +48,7 @@ jobs:
           sudo ln -s /usr/bin/wasm-ld-14 /usr/local/bin/wasm-ld
 
       - name: Install go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.23.x
 

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   test:
     name: Go Tests
-    runs-on: ubuntu-8
+    runs-on: arbitrator-ci
 
     # Creates a redis container for redis tests
     services:
@@ -126,10 +126,10 @@ jobs:
         run: ./scripts/build-brotli.sh -w -d
 
       - name: Build
-        run: make build test-go-deps -j
+        run: make build test-go-deps -j8
 
       - name: Build all lint dependencies
-        run: make -j build-node-deps
+        run: make -j8 build-node-deps
 
       - name: Lint
         uses: golangci/golangci-lint-action@v8
@@ -153,13 +153,13 @@ jobs:
         if: matrix.test-mode == 'pathdb'
         run: |
           echo "Running tests with Path Scheme" >> full.log
-          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 20m --cover --test_state_scheme path
+          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 90m --cover --test_state_scheme path
 
       - name: run tests without race detection and hash state scheme
         if: matrix.test-mode == 'defaults'
         run: |
           echo "Running tests with Hash Scheme" >> full.log
-          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 20m --test_state_scheme hash
+          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 60m --test_state_scheme hash
 
       - name: run redis tests
         if: matrix.test-mode == 'defaults'

.github/workflows/close-trivial-prs.yml

@@ -0,0 +1,46 @@
+name: Close trivial PRs
+
+on:
+  pull_request_target:
+    types: [labeled]
+
+jobs:
+  close-trivial-pr:
+    if: github.event.label.name == 'trivial'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Fetch CONTRIBUTING.md snippet
+        id: snippet
+        env:
+          REPO: ${{ github.repository }}
+        run: |
+          SNIPPET=$(curl -sSfL "https://raw.githubusercontent.com/${REPO}/refs/heads/master/CONTRIBUTING.md" \
+            | sed -n '/<!-- start-trivial-prs -->/,/<!-- end-trivial-prs -->/p' \
+            | sed '/<!--.*-->/d')
+
+          # Use GitHub Actions heredoc-style output to preserve multiline content
+          echo "snippet<<EOF" >> $GITHUB_OUTPUT
+          echo "$SNIPPET" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Comment and Close PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          REPO=${{ github.repository }}
+          DEF_BRANCH=${{ github.event.repository.default_branch }}
+          SNIPPET="${{ steps.snippet.outputs.snippet }}"
+
+          gh pr close $PR_NUMBER --repo $REPO --comment "Thank you for your contribution. However, this PR has been automatically closed because it was labeled as **trivial**. As stated in our [CONTRIBUTING.md](../blob/${DEF_BRANCH}/CONTRIBUTING.md):
+
+          ---
+
+          ${SNIPPET}
+
+          ---
+
+          We appreciate meaningful contributions!"

.github/workflows/codeql-analysis.yml

@@ -61,7 +61,7 @@ jobs:
         cache-dependency-path: '**/yarn.lock'
 
     - name: Install go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: 1.23.x
 
@@ -99,7 +99,7 @@ jobs:
       run: cargo install --force cbindgen
 
     - name: Cache Build Products
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/go-build
@@ -108,13 +108,13 @@ jobs:
 
     - name: Cache wabt build
       id: cache-wabt
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/wabt-prefix
         key: ${{ runner.os }}-wabt-codeql-${{ matrix.language }}-${{ env.WABT_VERSION }}
 
     - name: Cache cbrotli
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: cache-cbrotli
       with:
         path: |
@@ -127,7 +127,7 @@ jobs:
         restore-keys: ${{ runner.os }}-brotli-${{ matrix.language }}-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
 
     - name: Cache Rust Build Products
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/

.github/workflows/docker.yml

@@ -3,35 +3,11 @@ run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head
 on:
   workflow_dispatch:
   pull_request:
-    types: [labeled]
+    types: [opened, synchronize, reopened]
 jobs:
-  # Only runs Docker build jobs if a PR has received a final "design approved" label as a final check
-  check-label:
-    name: Check for required label
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-    outputs:
-      should-run: ${{ steps.check-label.outputs.has-label }}
-    steps:
-      - id: check-label
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            });
-            const hasLabel = labels.some(label => label.name === 'design-approved');
-            core.setOutput('has-label', hasLabel);
-            console.log(`PR has 'design-approved' label: ${hasLabel}`);
-
   docker:
     name: Docker build
-    needs: check-label
-    # Run if it's not a PR or if it's a PR with the required label
-    if: github.event_name != 'pull_request' || needs.check-label.outputs.should-run == 'true'
-    runs-on: ubuntu-8
+    runs-on: arbitrator-ci
     services:
       # local registry
       registry:
@@ -48,7 +24,7 @@ jobs:
         with:
           driver-opts: network=host
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}

.github/workflows/gotestsum.sh

@@ -11,6 +11,7 @@ timeout=""
 tags=""
 run=""
 test_state_scheme=""
+log=true
 race=false
 cover=false
 while [[ $# -gt 0 ]]; do
@@ -47,6 +48,10 @@ while [[ $# -gt 0 ]]; do
       cover=true
       shift
       ;;
+		--nolog)
+			log=false
+			shift
+			;;
     *)
       echo "Invalid argument: $1"
       exit 1
@@ -56,7 +61,7 @@ done
 
 packages=$(go list ./...)
 for package in $packages; do
-  cmd="stdbuf -oL gotestsum --format short-verbose --packages=\"$package\" --rerun-fails=2 --no-color=false --"
+  cmd="stdbuf -oL gotestsum --format short-verbose --packages=\"$package\" --rerun-fails=2 --rerun-fails-max-failures=30 --no-color=false --"
   if [ "$timeout" != "" ]; then
     cmd="$cmd -timeout $timeout"
   fi
@@ -83,7 +88,11 @@ for package in $packages; do
       cmd="$cmd -args -- --test_loglevel=8" # Use error log level, which is the value 8 in the slog level enum for tests.
   fi
 
-  cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"INFO|seal\")"
+	if [ "$log" == true ]; then
+			cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"DEBUG|TRACE|INFO|seal\")"
+	else
+			cmd="$cmd | grep -vE \"DEBUG|TRACE|INFO|seal\""
+	fi
 
   echo ""
   echo running tests for "$package"

.github/workflows/nightly-ci.yml

@@ -16,7 +16,7 @@ jobs:
   # Only run on schedule AND main branch
   tests-scheduled:
     name: Scheduled tests
-    runs-on: ubuntu-8
+    runs-on: arbitrator-ci
 
     services:
       redis:
@@ -29,7 +29,7 @@ jobs:
       matrix:
         test-mode: [race, legacychallenge, long, challenge, l3challenge]
 
-    if: github.event_name == 'schedule' && github.ref == 'refs/heads/master'
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'schedule' && github.ref == 'refs/heads/master')
 
     steps:
       - name: Checkout
@@ -89,15 +89,15 @@ jobs:
         run: cargo install --force cbindgen
 
       - name: Cache Build Products
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-
 
       - name: Cache Rust Build Products
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/
@@ -110,7 +110,7 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-${{ steps.rust-version.outputs.version }}-
 
       - name: Cache cbrotli
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-cbrotli
         with:
           path: |
@@ -156,7 +156,7 @@ jobs:
         if: matrix.test-mode == 'race'
         run: |
           echo "Running tests with Hash Scheme" >> full.log
-          ${{ github.workspace }}/.github/workflows/gotestsum.sh --race --timeout 30m --test_state_scheme hash
+          ${{ github.workspace }}/.github/workflows/gotestsum.sh --race --timeout 90m --test_state_scheme hash
 
       - name: run challenge tests
         if: matrix.test-mode == 'challenge'
@@ -192,7 +192,7 @@ jobs:
   # Only run this job if files in bold/legacy/ are modified
   tests-pr:
     name: PR modified files tests
-    runs-on: ubuntu-8
+    runs-on: arbitrator-ci
     if: github.event_name == 'pull_request'
 
     permissions:
@@ -203,6 +203,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
+          fetch-depth: 10           // Will cover most PRs
+          persist-credentials: true // In case changed-files requires deeper depth
 
       - name: Check changed files
         id: changed-files
@@ -280,7 +282,7 @@ jobs:
 
       - name: Cache Build Products
         if: steps.changed-files.outputs.any_changed == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -289,7 +291,7 @@ jobs:
 
       - name: Cache Rust Build Products
         if: steps.changed-files.outputs.any_changed == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/
@@ -305,7 +307,7 @@ jobs:
 
       - name: Cache cbrotli
         if: steps.changed-files.outputs.any_changed == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-cbrotli
         with:
           path: |

.github/workflows/release-ci.yml

@@ -20,7 +20,7 @@ jobs:
         driver-opts: network=host
 
     - name: Cache Docker layers
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
         key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}

.github/workflows/submodule-pin-check.yml

@@ -36,6 +36,7 @@ jobs:
             [bold]=origin/main
             [arbitrator/langs/c]=origin/vm-storage-cache
             [arbitrator/tools/wasmer]=origin/stylus
+            [contracts-local/lib/openzeppelin-contracts]=origin/release-v4.7
           )
           divergent=0
           for mod in `git submodule --quiet foreach 'echo $name'`; do

.gitignore

@@ -10,6 +10,7 @@ node_modules
 .DS_Store
 .idea
 .vscode
+.cursor
 cmd/node/data
 cmd/node/node
 solgen/go/