NethermindEth
diff --git a/‎.github/actions/gomodtidy/Dockerfile‎
Lines changed: 5 additions & 0 deletions b/‎.github/actions/gomodtidy/Dockerfile‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/actions/gomodtidy/action.yml‎
Lines changed: 5 additions & 0 deletions b/‎.github/actions/gomodtidy/action.yml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/actions/gomodtidy/entrypoint.sh‎
Lines changed: 34 additions & 0 deletions b/‎.github/actions/gomodtidy/entrypoint.sh‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎.github/actions/install-rust/action.yml‎
Lines changed: 37 additions & 0 deletions b/‎.github/actions/install-rust/action.yml‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎.github/workflows/arbitrator-ci.yml‎
Lines changed: 14 additions & 32 deletions b/‎.github/workflows/arbitrator-ci.yml‎
Lines changed: 14 additions & 32 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 12 additions & 30 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 12 additions & 30 deletions
diff --git a/‎.github/workflows/close-trivial-prs.yml‎
Lines changed: 46 additions & 0 deletions b/‎.github/workflows/close-trivial-prs.yml‎
Lines changed: 46 additions & 0 deletions
@@ -0,0 +1,5 @@
+FROM golang:alpine
+
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
@@ -0,0 +1,5 @@
+name: 'Go mod tidy checker'
+description: 'Checks that `go mod tidy` has been applied.'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
@@ -0,0 +1,34 @@
+#!/bin/sh -l
+set -e
+export PATH="$PATH:/usr/local/go/bin"
+
+cd "$GITHUB_WORKSPACE"
+
+cp go.mod go.mod.orig
+cp go.sum go.sum.orig
+
+go mod tidy -compat=1.17
+
+echo "Checking go.mod and go.sum:"
+checks=0
+if [ "$(diff -s go.mod.orig go.mod | grep -c 'Files go.mod.orig and go.mod are identical')" = 1 ]; then
+  echo "- go.mod is up to date."
+  checks=$((checks + 1))
+else
+  echo "- go.mod is NOT up to date."
+fi
+
+if [ "$(diff -s go.sum.orig go.sum | grep -c 'Files go.sum.orig and go.sum are identical')" = 1 ]; then
+  echo "- go.sum is up to date."
+  checks=$((checks + 1))
+else
+  echo "- go.sum is NOT up to date."
+fi
+
+if [ $checks -eq 2 ]; then
+  exit 0
+fi
+
+# Notify of any issues.
+echo "Run 'go mod tidy' to update."
+exit 1
@@ -0,0 +1,37 @@
+name: 'Install stable Rust'
+description: 'Installs stable Rust toolchain with appropriate targets and components.'
+
+inputs:
+  toolchain:
+    required: true
+    description: 'Toolchain to install'
+    default: '1.88.0'
+  targets:
+    required: true
+    description: 'Compilation targets to install'
+    default: 'wasm32-wasip1, wasm32-unknown-unknown'
+  components:
+    required: true
+    description: 'Cargo components to include'
+    default: 'llvm-tools-preview, rustfmt, clippy'
+
+outputs:
+  version:
+    description: 'The installed Rust version'
+    value: ${{ steps.get-version.outputs.version }}
+
+runs:
+  using: composite
+  steps:
+    - name: Install Rust stable
+      id: install-rust
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: ${{ inputs.toolchain }}
+        targets: ${{ inputs.targets }}
+        components: ${{ inputs.components }}
+
+    - name: Get Rust version
+      id: get-version
+      shell: bash
+      run: echo "version=$(rustc --version | cut -d' ' -f2)" >> $GITHUB_OUTPUT
@@ -37,7 +37,7 @@ jobs:
           detached: true
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
@@ -48,46 +48,27 @@ 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
+          go-version: 1.24.x
 
       - name: Install custom go-ethereum
         run: |
           cd /tmp
-          git clone --branch v1.14.11 --depth 1 https://github.com/ethereum/go-ethereum.git
+          git clone --branch v1.15.11 --depth 1 https://github.com/ethereum/go-ethereum.git
           cd go-ethereum
           go build -o /usr/local/bin/geth ./cmd/geth
 
       - name: Setup nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '24'
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
-      - name: Install rust nightly
-        uses: dtolnay/rust-toolchain@nightly
-        id: install-rust-nightly
-        with:
-          toolchain: 'nightly-2025-02-14'
-          targets: 'wasm32-wasip1, wasm32-unknown-unknown'
-          components: 'rust-src, rustfmt, clippy'
-
-      - name: Install rust stable
+      - name: Install rust
         id: install-rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: '1.84.1'
-          targets: 'wasm32-wasip1, wasm32-unknown-unknown'
-          components: 'llvm-tools-preview, rustfmt, clippy'
-
-      - name: Set STYLUS_NIGHTLY_VER environment variable
-        run: echo "STYLUS_NIGHTLY_VER=+$(rustup toolchain list | grep '^nightly' | head -n1 | cut -d' ' -f1)" >> "$GITHUB_ENV"
-
-      - name: Get Rust version
-        id: rust-version
-        run: echo "version=$(rustc --version | cut -d' ' -f2)" >> $GITHUB_OUTPUT
+        uses: ./.github/actions/install-rust
 
       - name: Cache Rust intermediate build products
         uses: actions/cache@v4
@@ -99,10 +80,10 @@ jobs:
             ~/.cargo/git/db/
             arbitrator/target/
             arbitrator/wasm-libraries/target/
-          key: ${{ runner.os }}-cargo-${{ steps.rust-version.outputs.version }}-full-${{ hashFiles('arbitrator/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.version }}-full-${{ hashFiles('arbitrator/Cargo.lock') }}
           restore-keys: |
-            ${{ runner.os }}-cargo-${{ steps.rust-version.outputs.version }}-full-
-            ${{ runner.os }}-cargo-${{ steps.rust-version.outputs.version }}-
+            ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.version }}-full-
+            ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.version }}-
 
       - name: Cache wabt build
         id: cache-wabt
@@ -127,6 +108,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           cache: false
+          version: v1.0.0
 
       - name: Cache cbrotli
         uses: actions/cache@v4
@@ -138,16 +120,16 @@ jobs:
             target/lib/libbrotlicommon-static.a
             target/lib/libbrotlienc-static.a
             target/lib/libbrotlidec-static.a
-          key: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}-arbitrator
-          restore-keys: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
+          key: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yml') }}-arbitrator
+          restore-keys: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yml') }}
 
       - name: Build cbrotli-local
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
         run: ./scripts/build-brotli.sh -l
 
       - name: Setup emsdk
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-        uses: mymindstorm/setup-emsdk@v12
+        uses: mymindstorm/setup-emsdk@v14
         with:
           # Make sure to set a version number!
           version: 3.1.6
 
@@ -29,58 +29,40 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y wabt gotestsum
 
       - name: Setup nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '24'
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
       - name: Install go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
 
       - name: Install wasm-ld
         run: |
           sudo apt-get update && sudo apt-get install -y lld-14
           sudo ln -s /usr/bin/wasm-ld-14 /usr/local/bin/wasm-ld
 
-      - name: Install rust stable
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install rust
         id: install-rust
-        with:
-          toolchain: '1.84.1'
-          targets: 'wasm32-wasip1, wasm32-unknown-unknown'
-          components: 'llvm-tools-preview, rustfmt, clippy'
-
-      - name: Install rust nightly
-        uses: dtolnay/rust-toolchain@nightly
-        id: install-rust-nightly
-        with:
-          toolchain: 'nightly-2025-02-14'
-          targets: 'wasm32-wasip1, wasm32-unknown-unknown'
-          components: 'rust-src, rustfmt, clippy'
-
-      - name: Set STYLUS_NIGHTLY_VER environment variable
-        run: echo "STYLUS_NIGHTLY_VER=+$(rustup toolchain list | grep '^nightly' | head -n1 | cut -d' ' -f1)" >> "$GITHUB_ENV"
-
-      - name: Get Rust version
-        id: rust-version
-        run: echo "version=$(rustc --version | cut -d' ' -f2)" >> $GITHUB_OUTPUT
+        uses: ./.github/actions/install-rust
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
           cache: false
-        
+          version: v1.0.0
+
       - name: Install cbindgen
         run: cargo install --force cbindgen
 
@@ -102,8 +84,8 @@ jobs:
             arbitrator/wasm-libraries/soft-float/
             target/etc/initial-machine-cache/
             /home/runner/.rustup/toolchains/
-          key: ${{ runner.os }}-cargo-${{ matrix.test-mode }}-${{ steps.rust-version.outputs.version }}-min-${{ hashFiles('arbitrator/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-${{ matrix.test-mode }}-${{ steps.rust-version.outputs.version }}-
+          key: ${{ runner.os }}-cargo-${{ matrix.test-mode }}-${{ steps.install-rust.outputs.version }}-min-${{ hashFiles('arbitrator/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-${{ matrix.test-mode }}-${{ steps.install-rust.outputs.version }}-
 
       - name: Cache cbrotli
         uses: actions/cache@v4
@@ -115,7 +97,7 @@ jobs:
             target/lib/libbrotlicommon-static.a
             target/lib/libbrotlienc-static.a
             target/lib/libbrotlidec-static.a
-          key: ${{ runner.os }}-brotli-${{ matrix.test-mode }}-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
+          key: ${{ runner.os }}-brotli-${{ matrix.test-mode }}-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yml') }}
 
       - name: Build cbrotli-local
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
@@ -207,7 +189,7 @@ jobs:
           path: full.log
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v5
         if: matrix.test-mode == 'defaults'
         with:
           fail_ci_if_error: false
 
@@ -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!"