Merge branch 'ethereum:master' into master

Author: Ameralameri

.github/renovate.json

@@ -10,6 +10,7 @@
   "ignoreDeps": [
     "Pandapip1/jekyll-label-action",
     "ethereum/eipw-action",
-    "ethereum/eip-review-bot"
+    "ethereum/eip-review-bot",
+    "ethereum/EIP-Bot"
   ]
 }

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

@@ -2,6 +2,7 @@ on:
   schedule:
     # A job that runs every sunday at 00:00
     - cron:  '0 0 * * 0'
+  workflow_dispatch:
 
 name: Auto Stagnant Bot
 jobs:
@@ -17,7 +18,7 @@ jobs:
         with:
           node-version: '14'
       - name: auto-stagnant-bot
-        uses: ethereum/EIP-Bot@fe4c395bd8bd1f006c353f9b04e694da890ad69a # mark-eips-stale
+        uses: ethereum/EIP-Bot@b3ac0ba3600aea27157fc68d1e36c08cc5a6db77 # mark-eips-stale
         id: auto-stagnant-bot
         with:
           GITHUB-TOKEN: ${{ secrets.TOKEN }}

.github/workflows/ci.yml

@@ -111,7 +111,7 @@ jobs:
       - name: Checkout EIP Repository
         uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
 
-      - uses: ethereum/eipw-action@af0856c89aa1a245cf0da9ae904eafbbddb94ecf
+      - uses: ethereum/eipw-action@b8de7ea9ad5cb842301e63898afb996c451c18cf
         id: eipw
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

EIPS/eip-5289.md

@@ -15,6 +15,8 @@ requires: 165, 5568
 
 Currently, the real-world applications of smart contracts are limited by the fact that they aren't legally binding. This EIP proposes a standard that allows smart contracts to be legally binding by providing IPFS links to legal documents and ensuring that the users of the smart contract have privity with the relevant legal documents.
 
+Please note that the authors are not lawyers, and that this EIP is not legal advice.
+
 ## Motivation
 
 NFTs have oftentimes been branded as a way to hold and prove copyright of a specific work. However, this, in practice, has almost never been the case. Most of the time, NFTs have no legally-binding meaning, and in the rare cases that do, the NFT simply provides a limited license for the initial holder to use the work (but cannot provide any license for any future holders).

EIPS/eip-5568.md

@@ -1,7 +1,7 @@
 ---
 eip: 5568
-title: Revert Reason for Required Actions
-description: Signal to wallets that an action is needed by returning a custom revert code
+title: Well-Known Format for Required Actions
+description: Signal to wallets that an action is needed through a well-known function and revert reason
 author: Gavin John (@Pandapip1)
 discussions-to: https://ethereum-magicians.org/t/eip-5568-revert-signals/10622
 status: Review
@@ -13,21 +13,33 @@ requires: 140
 
 ## Abstract
 
-This ERC introduces a minimalistic machine-readable (binary) format to signal to wallets that an action needs to be taken by the user using a well-known revert reason. This custom revert reason contains just enough data to be extendable by future ERCs and to take in arbitrary parameters (up to 64 kB of data). Example use cases could include approving a token for an exchange, sending an HTTP request, or requesting the user to rotate their keys after a certain period of time to enforce good hygiene.
+This ERC introduces a minimalistic machine-readable (binary) format to signal to wallets that an action needs to be taken by the user using a well-known function and revert reason. It provides just enough data to be extendable by future ERCs and to take in arbitrary parameters (up to 64 kB of data). Example use cases could include approving a token for an exchange, sending an HTTP request, or requesting the user to rotate their keys after a certain period of time to enforce good hygiene.
 
 ## Motivation
 
 Oftentimes, a smart contract needs to signal to a wallet that an action needs to be taken, such as to sign a transaction or send an HTTP request to a URL. Traditionally, this has been done by hard-coding the logic into the frontend, but this ERC allows the smart contract itself to request the action.
 
-This means that, for example, an exchange or a market can directly tell the wallet to approve the smart contract to spend the token, vastly simplifying the front-end code.
+This means that, for example, an exchange or a market can directly tell the wallet to approve the smart contract to spend the token, vastly simplifying front-end code.
 
 ## Specification
 
 The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in RFC 2119.
 
+### Action Detection
+
+```solidity
+interface IERC5568 {
+    function walletSignal24(bytes32 selector, bytes function_data) view returns (uint24 instruction_id, bytes instruction_data);
+}
+```
+
+The `instruction_id` of an instruction defined by an ERC MUST be its ERC number unless there are exceptional circumstances (be reasonable). An ERC MUST define exactly zero or one `instruction_id`. The structure of the instruction data for any `instruction_id` MUST be defined by the ERC that defines the `instruction_id`.
+
+To indicate that an action needs to be taken, return the `instruction_id` and `instruction_data`. To indicate no actions need to be taken, set `instruction_id` to be `0` and `instruction_data` to any value.
+
 ### Custom Revert Reason
 
-To signal an action needs to be taken, a compliant smart contract MUST revert with the following error:
+To signal an action was not taken, a compliant smart contract MUST revert with the following error:
 
 ```solidity
 error WalletSignal24(uint24 instruction_id, bytes instruction_data)
@@ -37,15 +49,17 @@ The `instruction_id` of an instruction defined by an ERC MUST be its ERC number
 
 ### Responding to a Revert
 
-Before submitting a transaction to the mempool, it MUST be evaluated locally. If it reverts and the revert signature matches the custom error, then the following applies.
+Before submitting a transaction to the mempool, the `walletSignal24` function MUST be simulated locally. It MUST be treated as if it were a non-`view` function capable of making state changes (e.g. `CALLS` to non-`view` functions are allowed). If the resulting `instruction_id` is nonzero, an action needs to be taken.
 
-The `instruction_id`, and `instruction_data` MUST be parsed from the revert data. The instruction SHOULD be evaluated as per the relevant ERC. If the instruction is not supported by the wallet, it MUST display an error to the user indicating that is the case. The wallet MUST then re-evaluate the transaction, except if an instruction explicitly states that the transaction MUST NOT be re-evaluated.
+The `instruction_id`, and `instruction_data` MUST be taken from the `walletSignal24` simulation. The instruction SHOULD be evaluated as per the relevant ERC. If the instruction is not supported by the wallet, it MUST display an error to the user indicating that is the case. The wallet MUST then re-evaluate the transaction, except if an instruction explicitly states that the transaction MUST NOT be re-evaluated.
 
 If an instruction is invalid, or the `instruction_id`, and `instruction_data` cannot be parsed, then an error MUST be displayed to the user indicating that is the case. The transaction MUST NOT be re-evaluated.
 
 ## Rationale
 
-This ERC was explicitly optimized for deployment gas cost and simplicity. It is expected that libraries will eventually be developed that makes sending and receiving these well-known reverts more developer-friendly.
+This ERC was explicitly optimized for deployment gas cost and simplicity. It is expected that libraries will eventually be developed that makes this more developer-friendly.
+
+[ERC-165](./eip-165.md) is not used, since the interface is simple enough that it can be detected simply by calling the function.
 
 ## Backwards Compatibility
 

EIPS/eip-6188.md

@@ -37,7 +37,7 @@ Capping a nonce allows for contracts with special properties to be created, with
 
 ## Backwards Compatibility
 
-This EIP requires a protocol upgrade, since it modifies consensus rules. The further restriction of nonce should not have an effect on accounts, as reaching a nonce of `2^64-2` is unfeasible.
+This EIP requires a protocol upgrade, since it modifies consensus rules. The further restriction of nonce should not have an effect on accounts, as reaching a nonce of `2^64-2` is difficult.
 
 ## Security Considerations
 

EIPS/eip-6189.md

@@ -83,6 +83,18 @@ This opcode remains unchanged; `ADDRESS` points to the address that doesn't have
 
 Transfers to the zero address continue to have the same effect as the `CREATE` opcode, and will cost extra gas as discussed in the [`CREATE` and `CREATE2`](#create-and-create2) section.
 
+### Transaction Validity
+
+The "origin" refers to the account that sent the transaction to be validated.
+
+If the nonce of the origin is `2^64-1`, the origin MUST be updated to the address stored in the `0`th storage slot of the current origin (as if the origin was the address stored in the `0`th storage slot of the current origin). This MUST repeat until a non-alias contract is reached.
+
+If there is more than one alias contract in the chain, the original origin and all subsequent origins (except the last one) MUST have their `0`th storage slot set to the address of the final non-alias contract. Then, the call MUST be forwarded as usual.
+
+An additional `25` gas per account accessed in this manner (including the final one, and including if no aliased accounts were used), in addition to all the regular costs incurred by accessing accounts (see [EIP-2929](./eip-2929.md)) is added to the validation costs. For every account whose `0`th storage slot is updated, it also costs an additional `5000` gas.
+
+Finally, validation proceeds as normal.
+
 ### RPC Endpoint Changes
 
 #### `eth_getStorageAt`