Merge branch 'ethereum:master' into 3267-assets-cc0

.gitattributes

@@ -1,3 +1,7 @@
 # GitHub highlighting for Solidity files
 # See https://github.com/github/linguist/pull/3973#issuecomment-357507741
 *.sol linguist-language=Solidity
+
+# Force Linux line endings on all files
+# Necessary for running eipw locally
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,31 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: pull-request
+    attributes:
+      label: Pull Request
+      description: Link to the pull request where the issue occurred
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,3 @@ contact_links:
   - name: Do you want to discuss EIP ideas or ask questions about the process?
     url: https://ethereum-magicians.org/
     about: Use the Fellowship of Ethereum Magicians for EIP-related discussion!
-  - name: Do you want to submit a bug report for one of the GitHub action bots (not Travis CI)?
-    url: https://github.com/ethereum/EIP-Bot/issues
-    about: If you have a problem with the EIP Bot, report it here!
-  - name: Do you want to submit a bug report for the validation bot (Travis CI)?
-    url: https://github.com/ethereum/eipv/issues
-    about: If you have a problem with EIP Validation, report it here!

.github/workflows/auto-merge-bot.yml

@@ -20,15 +20,7 @@ jobs:
           CORE_EDITORS: "@MicahZoltu,@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1"
           ERC_EDITORS: "@lightclient,@axic,@SamWilsn,@Pandapip1"
           NETWORKING_EDITORS: "@MicahZoltu,@lightclient,@axic,@SamWilsn"
-          INTERFACE_EDITORS: "@lightclient,@axic,@SamWilsn"
-          META_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn"
-          INFORMATIONAL_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn"
+          INTERFACE_EDITORS: "@lightclient,@axic,@SamWilsn,@Pandapip1"
+          META_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1"
+          INFORMATIONAL_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1"
           MAINTAINERS: "@alita-moore,@mryalamanchi"
-  enable-auto-merge:
-    if: github.event.pull_request.draft == false && github.repository == 'ethereum/eips'
-    runs-on: ubuntu-latest
-    needs: ["auto_merge_bot"]
-    steps:
-    - uses: alexwilson/[email protected]
-      with:
-        github-token: ${{ secrets.TOKEN }}

.github/workflows/ci-comment.yml

@@ -0,0 +1,58 @@
+on:
+  workflow_run:
+    workflows: ['Continuous Integration']
+    types:
+      - completed
+
+# This is adapted from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run (2022-07-17)
+
+jobs:
+  on-failure:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr_number"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+
+      - name: 'Unzip artifact'
+        run: unzip pr_number.zip
+
+      - name: 'Comment on PR'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            let fs = require('fs');
+            let issue_number = Number(fs.readFileSync('./pr_number', 'utf8').trim());
+            let pr_sha = fs.readFileSync('./pr_sha', 'utf8').trim();
+            let merge_sha = fs.readFileSync('./merge_sha', 'utf8').trim();
+            let pull = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: issue_number
+            });
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issue_number,
+              body: `The commit ${pr_sha} (as a parent of ${merge_sha}) contains errors. Please inspect the [Run Summary](${context.payload.workflow_run.html_url}) for details.`
+            });
+

.github/workflows/ci.yml

@@ -0,0 +1,92 @@
+name: Continuous Integration
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  htmlproofer:
+    name: HTMLProofer
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout EIP Repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      - name: Install OpenSSL
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a
+        with:
+          ruby-version: '2.6.0'
+          bundler-cache: true
+
+      - name: Build Website
+        run: |
+          bundle exec jekyll doctor
+          bundle exec jekyll build
+      
+      - name: HTML Proofer
+        run: bundle exec htmlproofer ./_site --check-html --check-opengraph --report-missing-names --log-level=:debug --assume-extension --empty-alt-ignore --timeframe=6w --disable-external
+
+      - name: DNS Validator
+        run: bundle exec github-pages health-check
+
+  codespell:
+    name: CodeSpell
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout EIP Repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      - name: Run CodeSpell
+        uses: codespell-project/actions-codespell@2391250ab05295bddd51e36a8c6295edb6343b0e
+        with:
+          check_filenames: true
+          ignore_words_file: .codespell-whitelist
+          skip: .git,Gemfile.lock,**/*.png,**/*.gif,**/*.jpg,**/*.svg,.codespell-whitelist,vendor,_site,_config.yml,style.css
+
+  eip-validator:
+    name: EIP Validator
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout EIP Repository
+      uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+    - name: Set Up Rust Toolchain
+      uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f
+      with:
+        toolchain: stable
+
+    - name: Install EIP Validator
+      run: cargo install eipv --version=0.4.0
+
+    - name: Run EIP Validator
+      run: eipv EIPS/ --ignore=title_max_length,missing_discussions_to --skip=eip-20-token-standard.md
+
+  eipw-validator:
+    name: EIPW Validator
+    runs-on: ubuntu-latest
+    steps:
+      - name: Save PR number
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+          PR_SHA: ${{ github.event.pull_request.head.sha }}
+          MERGE_SHA: ${{ github.sha }}
+        run: |
+          mkdir -p ./pr
+          echo $PR_NUMBER > ./pr/pr_number
+          echo $PR_SHA > ./pr/pr_sha
+          echo $MERGE_SHA > ./pr/merge_sha
+      - uses: actions/upload-artifact@v3
+        with:
+          name: pr_number
+          path: pr/
+      - name: Checkout EIP Repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+      - uses: ethereum/eipw-action@master
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          unchecked: '1,5069'

.github/workflows/enable-automerge.yml

@@ -0,0 +1,19 @@
+name: Automerge
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronized
+      - reopened
+      - edited
+      - ready_for_review
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: reitermarkus/automerge@a25ea0de41019ad13380d22e01db8f5638f1bcdc
+        with:
+          token: ${{ secrets.TOKEN }}
+          pull-request: ${{ github.event.number }}

.github/workflows/rerun-bot-pull-request-review.yml

@@ -1,12 +1,16 @@
+name: Trigger Auto Merge Bot Re-Run
+
 on: 
   pull_request_review:
-    types: [submitted]
-name: Rerun Bot
+    types: [ submitted ]
+
 jobs:
   rerun_bot_on_review:
-    if: github.repository == 'ethereum/eips'
+    name: Trigger Auto Merge Bot Re-Run
+
     runs-on: ubuntu-latest
-    name: Trigger Bot Rerun workflow_run
+    if: github.repository == 'ethereum/eips'
+
     steps:
       - name: Explanation
-        run: echo "this bot is used to trigger another workflow using the workflow_run github event; this is necessary because without it forked PRs do not have access to repo secret; normally this is circumvented using the pull_request_target event but because github actions.. a hack is required to allow the same behavior on pull_request_review; this work-around will no longer be necessary if github ever implements a pull_request_review_target or something similar"
+        run: echo 'This bot is used to trigger another workflow using the workflow_run github event. This is necessary because forked PRs do not have access to repo secrets. Normally, this is circumvented using the pull_request_target event, but because GitHub actions does not trigger that event on review, a hack is required to allow that behavior. This workaround will no longer be necessary if GitHub ever implements a pull_request_review_target or something similar.'

.gitignore

@@ -6,3 +6,6 @@ vendor
 
 # Editor files
 .gitpod.yml
+
+# Secrets
+.vercel