Automatically merged updates to draft EIP(s) 1155

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
This commit is contained in:
Philippe Castonguay 2019-03-11 12:12:10 -04:00 committed by EIP Automerge Bot
parent a34278a505
commit 68aff6be02

View File

@ -43,9 +43,9 @@ pragma solidity ^0.5.2;
interface ERC1155 /* is ERC165 */ { 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. @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred, including zero value transfers as well as minting or burning.
Operator will always be msg.sender. Operator MUST be msg.sender.
Either event from address `0x0` signifies a minting operation. When minting/creating tokens, the `_from` field MUST be set to `0x0`
An event to address `0x0` signifies a burning or melting operation. When burning/destroying tokens, the `_to` field MUST be set to `0x0`
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. 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. 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.
*/ */
@ -53,9 +53,9 @@ 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. @dev Either TransferSingle or TransferBatch MUST emit when tokens are transferred, including zero value transfers as well as minting or burning.
Operator will always be msg.sender. Operator MUST be msg.sender.
Either event from address `0x0` signifies a minting operation. When minting/creating tokens, the `_from` field MUST be set to `0x0`
An event to address `0x0` signifies a burning or melting operation. When burning/destroying tokens, the `_to` field MUST be set to `0x0`
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. 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. 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.
*/ */
@ -119,7 +119,7 @@ interface ERC1155 /* is ERC165 */ {
@notice Get the balance of multiple account/token pairs @notice Get the balance of multiple account/token pairs
@param _owners The addresses of the token holders @param _owners The addresses of the token holders
@param _ids ID of the Tokens @param _ids ID of the Tokens
@return The _owner's balance of the Token types requested @return The _owner's balance of the Token types requested (i.e. balance for each (owner, id) pair)
*/ */
function balanceOfBatch(address[] calldata _owners, uint256[] calldata _ids) external view returns (uint256[] memory); function balanceOfBatch(address[] calldata _owners, uint256[] calldata _ids) external view returns (uint256[] memory);
@ -503,4 +503,4 @@ balanceOf(baseToken + index, msg.sender); // Get balance of the Non-Fungible tok
- [Beyond Gaming - Exploring the Utility of ERC-1155 Token Standard!](https://blockgeeks.com/erc-1155-token/) - [Beyond Gaming - Exploring the Utility of ERC-1155 Token Standard!](https://blockgeeks.com/erc-1155-token/)
## Copyright ## Copyright
Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/). Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).