Automatically merged updates to draft EIP(s) 1155 (#2008)

Hi, I'm a bot! This change was automatically merged because:

 - It only modifies existing Draft or Last Call EIP(s)
 - The PR was approved or written by at least one author of each modified EIP
 - The build is passing

EIPS/eip-1155.md

@@ -44,21 +44,25 @@ pragma solidity ^0.5.8;
 interface ERC1155 /* is ERC165 */ {
     /**
         @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred, including zero value transfers as well as minting or burning (see "TransferSingle and TransferBatch event rules" section of the standard).
-        `_operator` MUST be msg.sender.
-        When minting/creating tokens, the `_from` argument MUST be set to `0x0` (i.e. zero address)
-        When burning/destroying tokens, the `_to` argument MUST be set to `0x0` (i.e. zero address)
-        The total value transferred from address 0x0 minus the total value transferred to 0x0 MAY be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
-        To broadcast the existence of a token ID with no initial balance, the contract SHOULD emit the TransferSingle event from `0x0` to `0x0`, with the token creator as `_operator`, and a `_value` of 0.
+        The `_operator` argument MUST be msg.sender.
+        The `_from` argument MUST be the address of the holder whose balance is decreased.
+        The `_to` argument MUST be the address of the recipient whose balance is increased.
+        The `_id` argument MUST be the token type being transferred.
+        The `_value` argument MUST be the number of tokens the holder balance is decreased by and match what the recipient balance is increased by.
+        When minting/creating tokens, the `_from` argument MUST be set to `0x0` (i.e. zero address). 
+        When burning/destroying tokens, the `_to` argument MUST be set to `0x0` (i.e. zero address).        
     */
     event TransferSingle(address indexed _operator, address indexed _from, address indexed _to, uint256 _id, uint256 _value);
     
     /**
         @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred, including zero value transfers as well as minting or burning (see "TransferSingle and TransferBatch event rules" section of the standard).      
-        `_operator` MUST be msg.sender.
-        When minting/creating tokens, the `_from` argument MUST be set to `0x0` (i.e. zero address)
-        When burning/destroying tokens, the `_to` argument MUST be set to `0x0` (i.e. zero address)
-        The total value transferred from address 0x0 minus the total value transferred to 0x0 MAY be used by clients and exchanges to be added to the "circulating supply" for a given token ID.
-        To broadcast the existence of multiple token IDs with no initial balance, this SHOULD emit the TransferBatch event from `0x0` to `0x0`, with the token creator as `_operator`, and a `_value` of 0.
+        The `_operator` argument MUST be msg.sender.
+        The `_from` argument MUST be the address of the holder whose balance is decreased.
+        The `_to` argument MUST be the address of the recipient whose balance is increased.
+        The `_ids` argument MUST be the list of tokens being transferred.
+        The `_values` argument MUST be the list of number of tokens (matching the list and order of tokens specified in _ids) the holder balance is decreased by and match what the recipient balance is increased by.
+        When minting/creating tokens, the `_from` argument MUST be set to `0x0` (i.e. zero address).
+        When burning/destroying tokens, the `_to` argument MUST be set to `0x0` (i.e. zero address).                
     */
     event TransferBatch(address indexed _operator, address indexed _from, address indexed _to, uint256[] _ids, uint256[] _values);
 
@@ -76,10 +80,10 @@ interface ERC1155 /* is ERC165 */ {
 
     /**
         @notice Transfers value amount of an _id from the _from address to the _to address specified.
-        @dev MUST emit TransferSingle event on success.
-        Caller must be approved to manage the _from account's tokens (see "Approval" section of the standard).
+        @dev MUST emit one of TransferSingle or TransferBatch event on success (see "Safe Transfer Rules" section of the standard).
+        Caller must be approved to manage the `_from` account's tokens (see "Approval" section of the standard).
         MUST revert if `_to` is the zero address.
-        MUST revert if balance of sender for token `_id` is lower than the `_value` sent.
+        MUST revert if balance of holder for token `_id` is lower than the `_value` sent.
         MUST revert on any other error.
         After the transfer succeeds, this function MUST check if `_to` is a smart contract (eg. code size > 0). If so, it MUST call `onERC1155Received` on `_to` and act appropriately (see "Safe Transfer Rules" section of the standard).
         @param _from    Source address
@@ -92,19 +96,19 @@ interface ERC1155 /* is ERC165 */ {
 
     /**
         @notice Send multiple types of Tokens from a 3rd party in one transfer (with safety call).
-        @dev MUST emit TransferBatch event on success.
-        Caller must be approved to manage the _from account's tokens (see "Approval" section of the standard).
+        @dev MUST emit one or more TransferSingle or TransferBatch event on success (see "Safe Transfer Rules" section of the standard).
+        Caller must be approved to manage the `_from` account's tokens (see "Approval" section of the standard).
         MUST revert if `_to` is the zero address.
         MUST revert if length of `_ids` is not the same as length of `_values`.
-        MUST revert if any of the balance of sender for token `_ids` is lower than the respective `_values` sent.
+        MUST revert if any of the balance(s) of the holder(s) for token(s) in `_ids` is lower than the respective amount(s) in `_values` sent to the recipient.
         MUST revert on any other error.
         Transfers and events MUST occur in the array order they were submitted (_ids[0] before _ids[1], etc).
-        After all the transfer(s) in the batch succeed, this function MUST check if `_to` is a smart contract (eg. code size > 0). If so, it MUST call `onERC1155BatchReceived` on `_to` and act appropriately (see "Safe Transfer Rules" section of the standard).        
+        After all the transfer(s) in the batch succeed, this function MUST check if `_to` is a smart contract (eg. code size > 0). If so, it MUST call the relevant ERC1155TokenReceiver hook(s) on `_to` and act appropriately (see "Safe Transfer Rules" section of the standard).        
         @param _from    Source addresses
         @param _to      Target addresses
         @param _ids     IDs of each token type (order and length must match _values array)
         @param _values  Transfer amounts per token type (order and length must match _ids array)
-        @param _data    Additional data with no specified format, sent in call to `onERC1155BatchReceived` on `_to`
+        @param _data    Additional data with no specified format, sent in call to the ERC1155TokenReceiver hook(s) on `_to`
     */
     function safeBatchTransferFrom(address _from, address _to, uint256[] calldata _ids, uint256[] calldata _values, bytes calldata _data) external;
 
@@ -221,6 +225,24 @@ To be more explicit about how safeTransferFrom and safeBatchTransferFrom MUST op
 
 #### Rules
 
+**_safeTransferFrom rules:_**
+* MUST emit one of TransferSingle or TransferBatch event on success (see "TransferSingle and TransferBatch event rules" section).
+* Caller must be approved to manage the `_from` account's tokens (see "Approval" section).
+* MUST revert if `_to` is the zero address.
+* MUST revert if balance of holder for token `_id` is lower than the `_value` sent to the recipient.
+* MUST revert on any other error.
+* After the transfer succeeds, this function MUST check if `_to` is a smart contract (eg. code size > 0). If so, it MUST call `onERC1155Received` on `_to` and act appropriately (see "onERC1155Received rules" section).
+
+**_safeBatchTransferFrom rules:_**
+* MUST emit one or more TransferSingle or TransferBatch event on success (see "TransferSingle and TransferBatch event rules" section).
+* Caller must be approved to manage the `_from` account's tokens (see "Approval" section).
+* MUST revert if `_to` is the zero address.
+* MUST revert if length of `_ids` is not the same as length of `_values`.
+* MUST revert if any of the balance(s) of the holder(s) for token(s) in `_ids` is lower than the respective amount(s) in `_values` sent to the recipient.
+* MUST revert on any other error.
+* Transfers and events MUST occur in the array order they were submitted (_ids[0] before _ids[1], etc).
+* After all the transfer(s) in the batch succeed, this function MUST check if `_to` is a smart contract (eg. code size > 0). If so, it MUST call the relevant ERC1155TokenReceiver hook(s) on `_to` and act appropriately (see "onERC1155Received rules" and "onERC1155BatchReceived rules" sections).
+
 **_TransferSingle and TransferBatch event rules:_**
 * TransferSingle SHOULD be used to indicate a single balance transfer has occurred between a `_from` and `_to` pair.
     - It MAY be emitted multiple times to indicate multiple balance changes in the transaction, but note that TransferBatch is designed for this to reduce gas consumption.