EDT-3069 Another update.

EIPS/eip-1155.md

@@ -207,20 +207,19 @@ To be more explicit about how safeTransferFrom and safeBatchTransferFrom MUST op
 **_Scenario#6 :_** The receiver implements the ERC1155TokenReceiver interface and is the recipient of one and only one balance change (eg. safeTransferFrom called).
 * All the balances in the transfer MUST have been updated to match the senders intent before any hook is called on a recipient.
 * One of onERC1155Received or onERC1155BatchReceived MUST be called on the recipient.
-* The onERC1155Received hook SHOULD be called on the recipient contract and its rules followed.    
-    - See "onERC1155Received common rules" for further rules that MUST be followed.
-* The onERC1155BatchReceived hook MAY be called on the recipient contract and its rules followed.    
-    - See "onERC1155BatchReceived common rules" for further rules that MUST be followed.
+* The onERC1155Received hook SHOULD be called on the recipient contract and its rules followed.
+    - See "onERC1155Received rules" for further rules that MUST be followed.
+* The onERC1155BatchReceived hook MAY be called on the recipient contract and its rules followed.
+    - See "onERC1155BatchReceived rules" for further rules that MUST be followed.
 
 **_Scenario#7 :_** The receiver implements the ERC1155TokenReceiver interface and is the recipient of more than one balance change (eg. safeBatchTransferFrom called).
 * All the balances in the transfer MUST have been updated to match the senders intent before any hook is called on a recipient.
-* onERC1155Received or onERC1155BatchReceived MUST be called on the recipient.
-* The onERC1155BatchReceived hook SHOULD be called on the recipient contract and its rules followed.
-    - If called the arguments MUST contain/list information on every balance change for the recipient (and only the recipient) in this transaction.
-    - See "onERC1155BatchReceived common rules" for further rules that MUST be followed.
-* The onERC1155Received hook MAY be called on the recipient contract and its rules followed.
-    - If called it MUST be repeatedly called until information has been passed and return value checked for every balance change for the recipient (and only the recipient) in this transaction.
-    - See "onERC1155Received common rules" for further rules that MUST be followed.
+* onERC1155Received or onERC1155BatchReceived MUST be called on the recipient as many times as necessary such that every balance change for the recipient in the scenario is accounted for.
+    - The return magic value for every hook call MUST be checked and acted upon as per "onERC1155Received rules" and "onERC1155BatchReceived rules".
+* The onERC1155BatchReceived hook SHOULD be called on the recipient contract and its rules followed.    
+    - See "onERC1155BatchReceived rules" for further rules that MUST be followed.
+* The onERC1155Received hook MAY be called on the recipient contract and its rules followed.    
+    - See "onERC1155Received rules" for further rules that MUST be followed.
 
 #### Rules
 
@@ -246,7 +245,7 @@ To be more explicit about how safeTransferFrom and safeBatchTransferFrom MUST op
 * 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.
 
-**_onERC1155Received common rules:_**
+**_onERC1155Received rules:_**
 * The `_operator` argument MUST be the address of the account/contract that initiated the transfer (i.e. msg.sender).
 * The `_from` argument MUST be the address of the holder whose balance is decreased.
     - `_from` MUST be 0x0 for a mint.
@@ -262,7 +261,7 @@ To be more explicit about how safeTransferFrom and safeBatchTransferFrom MUST op
     - All callbacks represent mutually exclusive balance changes.
     - The set of all callbacks describes all balance changes that occurred during the transaction.
 
-**_onERC1155BatchReceived common rules:_**
+**_onERC1155BatchReceived rules:_**
 * The `_operator` argument MUST be the address of the account/contract that initiated the transfer (i.e. msg.sender).
 * The `_from` argument MUST be the address of the holder whose balance is decreased.
     - `_from` MUST be 0x0 for a mint.