Merge branch 'ethereum:master' into master

Author: Ameralameri

EIPS/eip-1.md

@@ -118,7 +118,7 @@ EIPs should be written in [markdown](https://github.com/adam-p/markdown-here/wik
 
 Each EIP must begin with an [RFC 822](https://www.ietf.org/rfc/rfc822.txt) style header preamble, preceded and followed by three hyphens (`---`). This header is also termed ["front matter" by Jekyll](https://jekyllrb.com/docs/front-matter/). The headers must appear in the following order.
 
-`eip`: *EIP number* (this is determined by the EIP editor)
+`eip`: *EIP number*
 
 `title`: *The EIP title is a few words, not a complete sentence*
 
@@ -451,7 +451,7 @@ If the EIP isn't ready, the editor will send it back to the author for revision,
 
 Once the EIP is ready for the repository, the EIP editor will:
 
-- Assign an EIP number (generally the PR number, but the decision is with the editors)
+- Assign an EIP number (generally incremental; editors can reassign if number sniping is suspected)
 - Merge the corresponding [pull request](https://github.com/ethereum/EIPs/pulls)
 - Send a message back to the EIP author with the next step.
 

EIPS/eip-1271.md

@@ -57,7 +57,7 @@ This function should be implemented by contracts which desire to sign messages (
 ## Rationale
 We believe the name of the proposed function to be appropriate considering that an *authorized* signers providing proper signatures for a given data would see their signature as "valid" by the signing contract. Hence, a signed action message is only valid when the signer is authorized to perform a given action on the behalf of a smart wallet. 
 
-Two arguments are provided for simplicity of separating the hash signed from the signature. A bytes32 hash is used instead of the unhashed message for simplicy, since contracts could expect a certain hashing function that is not standard, such as with [EIP-712](./eip-712.md). 
+Two arguments are provided for simplicity of separating the hash signed from the signature. A bytes32 hash is used instead of the unhashed message for simplicity, since contracts could expect a certain hashing function that is not standard, such as with [EIP-712](./eip-712.md). 
 
 `isValidSignature()` should not be able to modify states in order to prevent `GasToken` minting or similar attack vectors. Again, this is to simplify the implementation surface of the function for better standardization and to allow off-chain contract queries.
 

EIPS/eip-1820.md

@@ -339,7 +339,9 @@ The contract has the address above for every chain on which it is deployed.
 <details>
 <summary>Raw metadata of <code>./contracts/ERC1820Registry.sol</code></summary>
 <pre>
-<code>{
+
+```json
+{
         "compiler": {
           "version": "0.5.3+commit.10d17f24"
         },
@@ -655,7 +657,9 @@ The contract has the address above for every chain on which it is deployed.
           }
         },
         "version": 1
-      }</code>
+      }
+```
+
 </pre>
 </details>
 

EIPS/eip-1822.md

@@ -9,36 +9,6 @@ category: ERC
 created: 2019-03-04
 ---
 
-## Table of contents
-
-<!-- TOC -->
-
-- [Table of contents](#table-of-contents)
-- [Simple Summary](#simple-summary)
-- [Abstract](#abstract)
-- [Motivation](#motivation)
-- [Terminology](#terminology)
-- [Specification](#specification)
-  - [Proxy Contract](#proxy-contract)
-    - [Functions](#functions)
-      - [`fallback`](#fallback)
-    - [`constructor`](#constructor)
-  - [Proxiable Contract](#proxiable-contract)
-    - [Functions](#functions-1)
-      - [`proxiable`](#proxiable)
-      - [`updateCodeAddress`](#updatecodeaddress)
-- [Pitfalls when using a proxy](#pitfalls-when-using-a-proxy)
-  - [Separating Variables from Logic](#separating-variables-from-logic)
-  - [Restricting dangerous functions](#restricting-dangerous-functions)
-- [Examples](#examples)
-  - [Owned](#owned)
-  - [ERC-20 Token](#erc-20-token)
-    - [Proxy Contract](#proxy-contract-1)
-    - [Token Logic Contract](#token-logic-contract)
-- [References](#references)
-- [Copyright](#copyright)
-    <!-- /TOC -->
-
 ## Simple Summary
 
 Standard upgradeable proxy contract.
@@ -60,7 +30,7 @@ The following describes a standard for proxy contracts which is universally comp
 - **Logic Contract** - The contract **B** which contains the logic used by Proxy Contract **A**
 - **Proxiable Contract** - Inherited in Logic Contract **B** to provide the upgrade functionality
 
-<p align="center"><img src="../assets/eip-1822/proxy-diagram.png" alt="diagram" width="600"/></p>
+![](../assets/eip-1822/proxy-diagram.png)
 
 ## Specification
 

EIPS/eip-223.md

@@ -1,18 +1,19 @@
 ---
 eip: 223
-title: Token with communication model
+title: Token with transaction handling model
 description: Token with transaction handling model designed to behave identical to native currency (ether)
 author: Dexaran (@Dexaran) <dexaran@ethereumclassic.org>
 discussions-to: https://ethereum-magicians.org/t/erc-223-token-standard/12894
-status: Review
+status: Last Call
+last-call-deadline: 2023-09-03
 type: Standards Track
 category: ERC
 created: 2017-05-03
 ---
 
 ## Abstract
 
-The following describes an interface for fungible tokens that supports a `tokenReceived` callback to notify contract recipients when tokens are received.
+The following describes an interface and logic for fungible tokens that supports a `tokenReceived` callback to notify contract recipients when tokens are received. This makes tokens behave identical to ether.
 
 ## Motivation
 
@@ -38,25 +39,25 @@ Token transfers to contracts not implementing `tokenReceived` as described below
 function totalSupply() view returns (uint256 totalSupply)
 ```
 
-Gets the total supply of the token. The functionality of this method is identical to that of ERC-20.
+Returns the total supply of the token. The functionality of this method is identical to that of ERC-20.
 
 ##### `name`
 
 ```solidity
 function name() view returns (string _name)
 ```
 
-Gets the name of the token.  The functionality of this method is identical to that of ERC-20.
+Returns the name of the token.  The functionality of this method is identical to that of ERC-20.
 
 OPTIONAL - This method can be used to improve usability, but interfaces and other contracts MUST NOT expect these values to be present.
 
 ##### `symbol`
 
 ```solidity
-function symbol() view returns (bytes32 _symbol)
+function symbol() view returns (string _symbol)
 ```
 
-Gets the symbol of the token. The functionality of this method is identical to that of ERC-20.
+Returns the symbol of the token. The functionality of this method is identical to that of ERC-20.
 
 OPTIONAL - This method can be used to improve usability, but interfaces and other contracts MUST NOT expect these values to be present.
 
@@ -66,7 +67,17 @@ OPTIONAL - This method can be used to improve usability, but interfaces and othe
 function decimals() view returns (uint8 _decimals)
 ```
 
-Gets the number of decimals of the token. The functionality of this method is identical to that of ERC-20.
+Returns the number of decimals of the token. The functionality of this method is identical to that of ERC-20.
+
+OPTIONAL - This method can be used to improve usability, but interfaces and other contracts MUST NOT expect these values to be present. 
+
+##### `standard`
+
+```solidity
+function standard() view returns (string memory)  
+```
+
+Returns the identifier of the standard. If the token is [ERC-223](./eip-20.md) then it must return `"223"`.
 
 OPTIONAL - This method can be used to improve usability, but interfaces and other contracts MUST NOT expect these values to be present.
 
@@ -76,7 +87,7 @@ OPTIONAL - This method can be used to improve usability, but interfaces and othe
 function balanceOf(address _owner) view returns (uint256 balance)
 ```
 
-Gets the account balance of another account with address `_owner`. The functionality of this method is identical to that of ERC-20.
+Returns the account balance of another account with address `_owner`. The functionality of this method is identical to that of ERC-20.
 
 ##### `transfer(address, uint)`
 
@@ -87,6 +98,8 @@ function transfer(address _to, uint _value) returns (bool)
 This function must transfer tokens, and if `_to` is a contract, it must call the `tokenReceived(address, uint256, bytes calldata)` function of `_to`. If the `tokenReceived` function is not implemented in `_to` (recipient contract), then the transaction must fail and the transfer of tokens must be reverted.
 If `_to` is an externally owned address, then the transaction must be sent without executing `tokenReceived` in `_to`.
  `_data` can be attached to this token transaction, but it requires more gas. `_data` can be empty.
+ 
+ The `tokenReceived` function of `_to` MUST be called after all other operations to avoid re-entrancy attacks.
 
 ##### `transfer(address, uint, bytes)`
 
@@ -98,7 +111,9 @@ This function must transfer tokens and invoke the function `tokenReceived (addre
 If `_to` is an externally owned address (determined by the code size being zero), then the transaction must be sent without executing `tokenReceived` in `_to`.
  `_data` can be attached to this token transaction, but it requires more gas. `_data` can be empty.
 
-NOTE: A possible way to check whether the `_to` is a contract or an address is to assemble the code of `_to`. If there is no code in `_to`, then this is an externally owned address, otherwise it's a contract.116
+NOTE: A possible way to check whether the `_to` is a contract or an address is to assemble the code of `_to`. If there is no code in `_to`, then this is an externally owned address, otherwise it's a contract.
+
+The `tokenReceived` function of `_to` MUST be called after all other operations to avoid re-entrancy attacks.
 
 #### Events
 
@@ -216,13 +231,13 @@ library Address {
 
 abstract contract IERC223Recipient {
 /**
- * @dev Standard ERC223 function that will handle incoming token transfers.
+ * @dev Standard ERC-223 receiving function that will handle incoming token transfers.
  *
  * @param _from  Token sender address.
  * @param _value Amount of tokens.
  * @param _data  Transaction metadata.
  */
-    function tokenReceived(address _from, uint _value, bytes memory _data) public virtual;
+    function tokenReceived(address _from, uint _value, bytes memory _data) public virtual returns (bytes4);
 }
 
 /**
@@ -240,7 +255,7 @@ contract ERC223Token {
     uint8   private _decimals;
     uint256 private _totalSupply;
     
-    mapping(address => uint256) public balances; // List of user balances.
+    mapping(address => uint256) private balances; // List of user balances.
 
     /**
      * @dev Sets the values for {name} and {symbol}, initializes {decimals} with
@@ -302,6 +317,14 @@ contract ERC223Token {
         return _totalSupply;
     }
 
+    /**
+     * @dev See {IERC223-standard}.
+     */
+    function standard() public view returns (string memory)
+    {
+        return "223";
+    }
+
     
     /**
      * @dev Returns balance of the `_owner`.