[pull] master from ethereum:master

.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/CODEOWNERS

@@ -0,0 +1 @@
+* @eth-bot

.github/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Please review [EIP-1](https://eips.ethereum.org/EIPS/eip-1) for EIP guidelines.
+
+<!-- RATIONALE FOR THIS FILE: IT IS DISPLAYED WHEN YOU CREATE AN ISSUE OR MAKE A PR -->

ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md

@@ -1,12 +1,11 @@
-
 ATTENTION! If you would like to submit an EIP and it has already been written as a draft (see the [template](https://github.com/ethereum/EIPs/blob/master/eip-template.md) for an example), please submit it as a [Pull Request](https://github.com/ethereum/EIPs/pulls).
 
 If you are considering a proposal but would like to get some feedback on the idea before submitting a draft, then continue opening an Issue as a thread for discussion.  Note that the more clearly and completely you state your idea the higher the quality of the feedback you are likely to receive.
 
-Keep in mind the following guidelines from [EIP-1](./eip-1.md):
+Keep in mind the following guidelines from [EIP-1](https://eips.ethereum.org/EIPS/eip-1):
 
-> Each EIP must have a champion - someone who writes the EIP using the style and format described below, shepherds the discussions in the appropriate forums, and attempts to build community consensus around the idea. The EIP champion (a.k.a. Author) should first attempt to ascertain whether the idea is EIP-able. Posting to the the Protocol Discussion forum or opening an Issue is the best way to go about this.
+> Each EIP must have a champion - someone who writes the EIP using the style and format described below, shepherds the discussions in the appropriate forums, and attempts to build community consensus around the idea. The EIP champion (a.k.a. Author) should first attempt to ascertain whether the idea is EIP-able. Posting to the Protocol Discussion forum or opening an Issue is the best way to go about this.
 
-> Vetting an idea publicly before going as far as writing a EIP is meant to save the potential author time. Asking the Ethereum community first if an idea is original helps prevent too much time being spent on something that is guaranteed to be rejected based on prior discussions (searching the Internet does not always do the trick). It also helps to make sure the idea is applicable to the entire community and not just the author. Just because an idea sounds good to the author does not mean it will work for most people in most areas where Ethereum is used.
+> Vetting an idea publicly before going as far as writing an EIP is meant to save the potential author time. Asking the Ethereum community first if an idea is original helps prevent too much time being spent on something that is guaranteed to be rejected based on prior discussions (searching the Internet does not always do the trick). It also helps to make sure the idea is applicable to the entire community and not just the author. Just because an idea sounds good to the author does not mean it will work for most people in most areas where Ethereum is used.
 
-> Once the champion has asked the Ethereum community as to whether an idea has any chance of acceptance, a draft EIP should be presented as a Pull Request. This gives the author a chance to flesh out the draft EIP to make properly formatted, of high quality, and to address initial concerns about the proposal.
+> Once the champion has asked the Ethereum community as to whether an idea has any chance of acceptance, a draft EIP should be presented as a Pull Request. This gives the author a chance to flesh out the draft EIP to properly format it, ensure it is high quality, and address initial concerns about the proposal.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,29 @@
+name: Bug Report
+description: File a bug report
+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

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+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!

.github/ISSUE_TEMPLATE/propose-process-change.yml

@@ -0,0 +1,13 @@
+name: Do you want to propose a change to the EIP process itself?
+description: Use this if you want to propose changes to the EIP process
+labels: ['enhancement']
+
+body:
+  - type: textarea
+    id: proposed-change
+    attributes:
+      label: Proposed Change
+      description: What do you think should be different?
+      placeholder: Describe your proposed change here
+    validations:
+      required: true

PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,7 @@
+**ATTENTION: ERC-RELATED PULL REQUESTS NOW OCCUR IN [ETHEREUM/ERCS](https://github.com/ethereum/ercs)**
+
+--
+
 When opening a pull request to submit a new EIP, please use the suggested template: https://github.com/ethereum/EIPs/blob/master/eip-template.md
 
 We have a GitHub bot that automatically merges some PRs. It will merge yours immediately if certain criteria are met:

.github/actions/merge-repos/action.yml

@@ -0,0 +1,24 @@
+name: Merge ERCs
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout ERCs
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        repository: ethereum/ERCs
+        path: ERCs
+    - name: Merge Repos
+      shell: bash
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/ERCs/ERCS
+        mkdir -p $GITHUB_WORKSPACE/ERCs/EIPS
+        cp -rp $GITHUB_WORKSPACE/ERCs/ERCS/. $GITHUB_WORKSPACE/EIPS
+        cp -rp $GITHUB_WORKSPACE/ERCs/EIPS/. $GITHUB_WORKSPACE/EIPS
+        cp -rp $GITHUB_WORKSPACE/ERCs/assets/. $GITHUB_WORKSPACE/assets
+        cd $GITHUB_WORKSPACE/EIPS
+        find . -name "erc-*.md" -type f -exec sh -c 'echo mv "$1" "$(echo "$1" | sed s/erc/eip/)"' _ {} \; | sh
+        cd $GITHUB_WORKSPACE/assets
+        find . -name "erc-*" -type d -exec sh -c 'echo mv "$1" "$(echo "$1" | sed s/erc/eip/)"' _ {} \; | sh
+        cd $GITHUB_WORKSPACE
+        rm -rf ERCs

.github/renovate.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":disableDependencyDashboard"
+  ],
+  "prConcurrentLimit": 100,
+  "ignorePaths": [
+    "**/assets/**"
+  ],
+  "ignoreDeps": [
+    "Pandapip1/jekyll-label-action",
+    "ethereum/eipw-action",
+    "ethereum/eip-review-bot",
+    "ethereum/EIP-Bot"
+  ],
+  "enabled": false
+}

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

@@ -0,0 +1,32 @@
+on:
+  workflow_run:
+    workflows:
+      - Auto Review Bot Trigger
+    types:
+      - completed
+
+name: Auto Review Bot
+jobs:
+  auto-review-bot:
+    runs-on: ubuntu-latest
+    name: Run
+    steps:
+      - name: Fetch PR Number
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615
+        with:
+          name: pr-number
+          workflow: auto-review-trigger.yml
+          run_id: ${{ github.event.workflow_run.id }}
+
+      - name: Save PR Number
+        id: save-pr-number
+        run: echo "pr=$(cat pr-number.txt)" >> $GITHUB_OUTPUT
+
+      - name: Auto Review Bot
+        id: auto-review-bot
+        uses: ethereum/eip-review-bot@dist
+        continue-on-error: true
+        with:
+          token: ${{ secrets.TOKEN }}
+          config: config/eip-editors.yml
+          pr_number: ${{ steps.save-pr-number.outputs.pr }}

.github/workflows/auto-review-trigger.yml

@@ -0,0 +1,59 @@
+on:
+  pull_request_target:
+  pull_request_review:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: Pull Request Number
+        type: string
+        required: true
+  issue_comment:
+    types:
+      - created
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+name: Auto Review Bot Trigger
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    name: Trigger
+    steps:
+      - name: Write PR Number - PR Target
+        run: echo $PR_NUMBER > pr-number.txt
+        if: github.event_name == 'pull_request_target' && ((!endsWith(github.event.sender.login, '-bot') && !endsWith(github.event.sender.login, '[bot]')) || github.event.sender.login == 'renovate[bot]')
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+
+      - name: Write PR Number - PR Review
+        run: echo $PR_NUMBER > pr-number.txt
+        if: github.event_name == 'pull_request_review' && !endsWith(github.event.sender.login, '-bot') && !endsWith(github.event.sender.login, '[bot]')
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+
+      - name: Write PR Number - Workflow Dispatch
+        run: echo $PR_NUMBER > pr-number.txt
+        if: github.event_name == 'workflow_dispatch'
+        env:
+          PR_NUMBER: ${{ inputs.pr_number }}
+
+      - name: Write PR Number - Comment Retrigger
+        run: echo $PR_NUMBER > pr-number.txt
+        if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '@eth-bot rerun')
+        env:
+          PR_NUMBER: ${{ github.event.issue.number }}
+
+      - name: Check File Existence
+        uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b
+        id: check_pr_number_exists
+        with:
+          files: pr-number.txt
+
+      - name: Save PR Number
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
+        if: steps.check_pr_number_exists.outputs.files_exists == 'true'
+        with:
+          name: pr-number
+          path: pr-number.txt

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

@@ -0,0 +1,24 @@
+on:
+  schedule:
+    # A job that runs every sunday at 00:00
+    - cron:  '0 0 * * 0'
+  workflow_dispatch:
+
+name: Auto Stagnant Bot
+jobs:
+  auto_merge_bot:
+    if: github.repository == 'ethereum/eips'
+    runs-on: ubuntu-latest
+    name: Auto Stagnant Bot
+    steps:
+      - name: Checkout
+        uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@d98fa1113850e562f83c7fc3a89c0ecd7a87fbed
+        with:
+          node-version: '14'
+      - name: auto-stagnant-bot
+        uses: ethereum/EIP-Bot@b3ac0ba3600aea27157fc68d1e36c08cc5a6db77 # mark-eips-stale
+        id: auto-stagnant-bot
+        with:
+          GITHUB-TOKEN: ${{ secrets.TOKEN }}