From c25c4d4634891c533cc2f2640714b4a6ac0e2e7d Mon Sep 17 00:00:00 2001
From: Andrew Cooke <ac0dem0nk3y@gmail.com>
Date: Fri, 7 Jun 2019 07:47:31 -0400
Subject: [PATCH] Automatically merged updates to draft EIP(s) 1155 (#2110)

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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/EIPS/eip-1155.md b/EIPS/eip-1155.md
index e79c4d07fd11db..b12fb2c853ca54 100644
--- a/EIPS/eip-1155.md
+++ b/EIPS/eip-1155.md
@@ -32,6 +32,7 @@ New functionality is possible with this design, such as transferring multiple to
 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.
 
 **Smart contracts implementing the ERC-1155 standard MUST implement all of the functions in the `ERC1155` interface.**
+
 **Smart contracts implementing the ERC-1155 standard MUST implement the ERC-165 `supportsInterface` function and MUST return the constant value `true` if `0xd9b67a26` is passed through the `interfaceID` argument.**
 
 ```solidity
@@ -150,6 +151,7 @@ interface ERC1155 /* is ERC165 */ {
 ### ERC-1155 Token Receiver
 
 **Smart contracts MUST implement all of the functions in the `ERC1155TokenReceiver` interface to accept transfers. See "Safe Transfer Rules" for further detail.**
+
 **Smart contracts MUST implement the ERC-165 `supportsInterface` function and signify support for the `ERC1155TokenReceiver` interface to accept transfers. See "ERC1155TokenReceiver ERC-165 rules" for further detail.**
 
 ```solidity
@@ -332,12 +334,12 @@ To be more explicit about how the standard `safeTransferFrom` and `safeBatchTran
     
 **_ERC1155TokenReceiver ERC-165 rules:_**
 * The implementation of the ERC-165 `supportsInterface` function SHOULD be as follows:
-    ```    
+    ```solidity
     function supportsInterface(bytes4 interfaceID) external view returns (bool) {
         return  interfaceID == 0x01ffc9a7 ||    // ERC-165 support (i.e. `bytes4(keccak256('supportsInterface(bytes4)'))`).
                 interfaceID == 0x4e2312e0;      // ERC-1155 `ERC1155TokenReceiver` support (i.e. `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)")) ^ bytes4(keccak256("onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))`).
     }
-    ```    
+    ```
 * The implementation MAY differ from the above but:
   - It MUST return the constant value `true` if `0x01ffc9a7` is passed through the `interfaceID` argument. This signifies ERC-165 support.
   - It MUST return the constant value `true` if `0x4e2312e0` is passed through the `interfaceID` argument. This signifies ERC-1155 `ERC1155TokenReceiver` support.
@@ -380,7 +382,7 @@ To be more explicit about how the standard `safeTransferFrom` and `safeBatchTran
 
 ##### A solidity example of the keccak256 generated constants for the various magic values (these MAY be used by implementation):
 
-```  
+```solidity
 bytes4 constant public ERC1155_ERC165 = 0xd9b67a26; // ERC-165 identifier for the main token standard.
 bytes4 constant public ERC1155_ERC165_TOKENRECEIVER = 0x4e2312e0; // ERC-165 identifier for the `ERC1155TokenReceiver` support (i.e. `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)")) ^ bytes4(keccak256("onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))`).
 bytes4 constant public ERC1155_ACCEPTED = 0xf23a6e61; // Return value from `onERC1155Received` call if a contract accepts receipt (i.e `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))`).