Merge ethereum eips

.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/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
   save-pr:
     name: Save PR Number
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Save PR number
         env:
@@ -38,34 +38,18 @@ jobs:
 
   htmlproofer:
     name: HTMLProofer
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout EIPs
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: ethereum/EIPs
           path: ''
-      - name: Checkout ERCs
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          repository: ethereum/ERCs
-          path: ERCs
       - name: Merge Repos
-        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
+        uses: ./.github/actions/merge-repos
       - name: Setup Ruby
-        uses: ruby/setup-ruby@f26937343756480a8cb3ae1f623b9c8d89ed6984 # v1.196.0
+        uses: ruby/setup-ruby@fb404b9557c186e349162b0d8efb06e2bc36edea # v1.232.0
         with:
           ruby-version: '3.1' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -74,7 +58,7 @@ jobs:
         run: bundle exec jekyll build
         env:
           JEKYLL_ENV: production
-          
+
       - name: Build Website
         run: |
           bundle exec jekyll doctor
@@ -88,11 +72,11 @@ jobs:
   link-check:
     name: Link Check
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout EIP Repository
         uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
-        
+
       - name: Link Checker
         uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
         with:
@@ -135,6 +119,8 @@ jobs:
     steps:
       - name: Checkout EIP Repository
         uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
+      - name: Merge Repos
+        uses: ./.github/actions/merge-repos
 
       - uses: ethereum/eipw-action@be3fa642ec311d0b8e1fdb811e5c9b4ada3d3d93
         id: eipw

.github/workflows/jekyll.yml

@@ -34,28 +34,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout EIPs
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: ethereum/EIPs
           path: ''
-      - name: Checkout ERCs
-        uses: actions/checkout@v4
-        with:
-          repository: ethereum/ERCs
-          path: ERCs
       - name: Merge Repos
-        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
+        uses: ./.github/actions/merge-repos
       - name: Setup Ruby
         uses: ruby/setup-ruby@f26937343756480a8cb3ae1f623b9c8d89ed6984 # v1.196.0
         with:
@@ -64,7 +48,7 @@ jobs:
           cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
         run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"

EIPS/eip-1.md

@@ -79,7 +79,7 @@ The following is the standardization process for all EIPs in all tracks:
 
 **Review** - An EIP Author marks an EIP as ready for and requesting Peer Review.
 
-**Last Call** - This is the final review window for an EIP before moving to `Final`. An EIP editor will assign `Last Call` status and set a review end date (`last-call-deadline`), typically 14 days later.
+**Last Call** - This is the final review window for an EIP before it is moved to `Final`. An EIP enters `Last Call` when the specification is stable and the author opens a PR with a review end date (`last-call-deadline`), typically 14 days later. 
 
 If this period results in necessary normative changes it will revert the EIP to `Review`.
 
@@ -105,7 +105,7 @@ Each EIP should have the following parts:
 - Specification - The technical specification should describe the syntax and semantics of any new feature. The specification should be detailed enough to allow competing, interoperable implementations for any of the current Ethereum platforms (besu, erigon, ethereumjs, go-ethereum, nethermind, or others).
 - Rationale - The rationale fleshes out the specification by describing what motivated the design and why particular design decisions were made. It should describe alternate designs that were considered and related work, e.g. how the feature is supported in other languages. The rationale should discuss important objections or concerns raised during discussion around the EIP.
 - Backwards Compatibility *(optional)* - All EIPs that introduce backwards incompatibilities must include a section describing these incompatibilities and their consequences. The EIP must explain how the author proposes to deal with these incompatibilities. This section may be omitted if the proposal does not introduce any backwards incompatibilities, but this section must be included if backward incompatibilities exist.
-- Test Cases *(optional)* - Test cases for an implementation are mandatory for EIPs that are affecting consensus changes. Tests should either be inlined in the EIP as data (such as input/expected output pairs, or included in `../assets/eip-###/<filename>`. This section may be omitted for non-Core proposals.
+- Test Cases *(optional)* - Test cases for an implementation are mandatory for EIPs that are affecting consensus changes. Tests should either be inlined in the EIP as data (such as input/expected output pairs) or included in `../assets/eip-###/<filename>`. This section may be omitted for non-Core proposals.
 - Reference Implementation *(optional)* - An optional section that contains a reference/example implementation that people can use to assist in understanding or implementing this specification. This section may be omitted for all EIPs.
 - Security Considerations - All EIPs must contain a section that discusses the security implications/considerations relevant to the proposed change. Include information that might be important for security discussions, surfaces risks and can be used throughout the life-cycle of the proposal. E.g. include security-relevant design decisions, concerns, important discussions, implementation-specific guidance and pitfalls, an outline of threats and risks and how they are being addressed. EIP submissions missing the "Security Considerations" section will be rejected. An EIP cannot proceed to status "Final" without a Security Considerations discussion deemed sufficient by the reviewers.
 - Copyright Waiver - All EIPs must be in the public domain. The copyright waiver MUST link to the license file and use the following wording: `Copyright and related rights waived via [CC0](../LICENSE.md).`
@@ -507,6 +507,24 @@ See the [Citation Style Language Schema](https://resource.citationstyles.org/sch
 
 The top-level URL field must resolve to a copy of the referenced document which can be viewed at zero cost. Values under `additional-urls` must also resolve to a copy of the referenced document, but may charge a fee.
 
+### Execution API Specification
+
+Links to the Ethereum Execution API Specification may be included using normal markdown syntax, such as:
+
+```markdown
+[Ethereum Execution API Specification](https://github.com/ethereum/execution-apis/blob/dd00287101e368752ba264950585dde4b61cdc17/README.md)
+```
+
+Which renders to:
+
+[Ethereum Execution API Specification](https://github.com/ethereum/execution-apis/blob/dd00287101e368752ba264950585dde4b61cdc17/README.md)
+
+Permitted Execution API Specification URLs must anchor to a specific commit, and so must match this regular expression:
+
+```regex
+^(https://github.com/ethereum/execution-apis/(blob|commit)/[0-9a-f]{40}/.*|https://github.com/ethereum/execution-apis/tree/[0-9a-f]{40}/.*)$
+```
+
 ## Linking to other EIPs
 
 References to other EIPs should follow the format `EIP-N` where `N` is the EIP number you are referring to.  Each EIP that is referenced in an EIP **MUST** be accompanied by a relative markdown link the first time it is referenced, and **MAY** be accompanied by a link on subsequent references.  The link **MUST** always be done via relative paths so that the links work in this GitHub repository, forks of this repository, the main EIPs site, mirrors of the main EIP site, etc.  For example, you would link to this EIP as `./eip-1.md`.

EIPS/eip-1015.md

@@ -48,7 +48,7 @@ This EIP proposes a future hard fork where block reward is not issued to miners/
 
 ##### It can only deal with issuance
 
-It's not meant to be a general governance contract. The contract **should NOT be used to** to decide software updates, to freeze funds, change contracts balances or anything on the consensus layer other than the strict definition of *where block rewards go*. It should be seen as a platform to settle disputes to avoid the implementation of contentious hard forks, not as a mean to remove the power of users and developers to execute them.
+It's not meant to be a general governance contract. The contract **should NOT be used** to decide software updates, to freeze funds, change contract balances or anything on the consensus layer other than the strict definition of *where block rewards go*. It should be seen as a platform to settle disputes to avoid the implementation of contentious hard forks, not as a mean to remove the power of users and developers to execute them.
 
 ##### It cannot only decrease issuance, and once decreased it cannot be increased again
 
@@ -94,7 +94,7 @@ A contract that has the power to decide the changes to issuance, the core of the
 The decision would be made by multiple signalling contracts, each one implemented by separate groups and representing one aspect of the community or one sort of measurement. Each signaling process would have a `int` bound in which they could vote and they would have their own internal process to decide that. As new governance methods are tested and debated, new signalling contracts should be added and removed. Suggested signalling contracts:
 
 * Futarchy and prediction markets based on multiple measures
-* Votes weighted by ether balance (optionally with multipliers if the voters where committed to locking votes)
+* Votes weighted by ether balance (optionally with multipliers if the voters were committed to locking votes)
 * Token votes, weighted by their own relative ether exchange rate
 * Votes by individual humans if a good sybil resistance, coercion mechanism is developed 
 * Block-signalling, as a way to measure validators/miners choices

EIPS/eip-1051.md

@@ -25,12 +25,12 @@ The `ovf` flag is set in the following circumstances:
 
  - When an `ADD` (`0x01`) opcode, with both inputs treated as unsigned integers, produces an ideal output in excess of 2^256 - 1.
  - When a `SUB` (`0x03`) opcode, with both inputs treated as unsigned integers, produces an ideal output less than 0.
- - When a `MUL`(`0x02`) opcode, with both inputs treated as unsigned integers, produces an ideal output in excess of 2^256 - 1.
+ - When a `MUL` (`0x02`) opcode, with both inputs treated as unsigned integers, produces an ideal output in excess of 2^256 - 1.
 
 The `sovf` flag is set whenever the `ovf` flag is set, and additionally in the following circumstances:
 
  - When an `ADD` opcode with both inputs having the same MSB results in the output having a different MSB (eg, `(+a) + (+b) = (-c)` or `(-a) + (-b) = (+c)`).
- - When a `SUB` opcode occurs and the result has the same MSB as the subtractand (second argument) (eg, `(+a) - (-b) = (-c)` or `(-a) - (+b) = (+c)`.
+ - When a `SUB` opcode occurs and the result has the same MSB as the subtracted (second argument) (eg, `(+a) - (-b) = (-c)` or `(-a) - (+b) = (+c)`).
  - When a `MUL` opcode with both inputs being positive has a negative output.
  - When a `MUL` opcode with both inputs being negative has a negative output.
  - When a `MUL` opcode with one negative input and one positive input has a positive output.

EIPS/eip-1052.md

@@ -46,9 +46,9 @@ Only the 20 last bytes of the argument are significant (the first 12 bytes are
 ignored) similarly to the semantics of the `BALANCE` (`0x31`), `EXTCODESIZE` (`0x3b`) and 
 `EXTCODECOPY` (`0x3c`).
 
-The `EXTCODEHASH` distincts accounts without code and non-existing accounts.
+The `EXTCODEHASH` distinguishes accounts without code and non-existing accounts.
 This is consistent with the way accounts are represented in the state trie.
-This also allows smart contracts to check whenever an account exists.
+This also allows smart contracts to check whether an account exists.
 
 
 ## Backwards Compatibility
@@ -59,7 +59,7 @@ There are no backwards compatibility concerns.
 ## Test Cases
 
 1. The `EXTCODEHASH` of the account without code is `c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470`
-   what is the keccack256 hash of empty data.
+   what is the keccak256 hash of empty data.
 2. The `EXTCODEHASH` of non-existent account is `0`.
 3. The `EXTCODEHASH` of a precompiled contract is either `c5d246...` or `0`.
 4. If `EXTCODEHASH` of `A` is `X`, then `EXTCODEHASH` of `A + 2**160` is `X`.