Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change a MAY to SHOULD as a non-standard impl really should revert if a contract doesn't accept 1155's. #2085

Merged
merged 60 commits into from
May 25, 2019
Merged

Change a MAY to SHOULD as a non-standard impl really should revert if a contract doesn't accept 1155's. #2085

merged 60 commits into from
May 25, 2019

Commits on May 3, 2019

  1. EDT-3069 Adding more clarity in transfer rules and other things, alte… 

    …red accept/reject logic to one mentioned in github discussion thread and compatibility section mentioning 1155+721 hybrid, plus we are now at Solidity 0.5.8 and my email should match github.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 3, 2019
    Configuration menu
    Copy the full SHA
    49fbbde View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ethereum/EIPs

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 3, 2019
    Configuration menu
    Copy the full SHA
    5a0fba2 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2019

  1. EDT-3069 id substitution example was not lowercase.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 4, 2019
    Configuration menu
    Copy the full SHA
    73a3365 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 4, 2019
    Configuration menu
    Copy the full SHA
    0557c37 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. EDT-3069 Updated the "Safe Transfer Rules" section to match feedback … 

    …given in discussion thread. This introduces specific scenarios and rules to match.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    ed9f0d1 View commit details
    Browse the repository at this point in the history

  2. EDT-3069 Some formatting changes to make it easier to digest/

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    e331f58 View commit details
    Browse the repository at this point in the history

  3. EDT-3069 More formatting.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3e2a176 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/ethereum/EIPs

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    c9db596 View commit details
    Browse the repository at this point in the history

  5. EDT-3069 Move impl specific functions rules to the rules section.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3ba6d4f View commit details
    Browse the repository at this point in the history

  6. EDT-3069 Better wording on impl specific api rules.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    b3f5675 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    774c0ae View commit details
    Browse the repository at this point in the history

  8. EDT-3069 Added in rules for TransferSingle and TransferBatch events s… 

    …ection and numbered the scenarios to be easily identifiable.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 7, 2019
    Configuration menu
    Copy the full SHA
    f745443 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. EDT-3069 EOA explanation.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 8, 2019
    Configuration menu
    Copy the full SHA
    1f3a415 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. EDT-3069 Updated text after feedback.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    54a4fa1 View commit details
    Browse the repository at this point in the history

  2. EDT-3069 Another update.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    2f16e0f View commit details
    Browse the repository at this point in the history

  3. EDT- Minor wording changes, be consistent in how we name ERC numbers … 

    …in text and make sure 1155 json schema title matches the standard section.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cdc350b View commit details
    Browse the repository at this point in the history

  4. EDT-3069 Remove confusion on hook return vals and args.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    5083d1e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    5869a76 View commit details
    Browse the repository at this point in the history

  6. EDT-3069 Drop the "DRAFT" text from linked standards, so when we go f… 

    …inal and subsequently they do our text is not out of date. Users can see the current status of those other standards on the landing page for them.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cbc7264 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/ethereum/EIPs

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    d5446f9 View commit details
    Browse the repository at this point in the history

  8. EDT-3069 Added safe and batch transferFrom rules to also be explicit … 

    …there.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    c62f69b View commit details
    Browse the repository at this point in the history

  9. EDT-3069 Another small change to match the rules.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 9, 2019
    Configuration menu
    Copy the full SHA
    dd6b5d7 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. Changes to wording to clarify transfer rules.

    @JamesTherien
    JamesTherien committed May 10, 2019
    Configuration menu
    Copy the full SHA
    4f36207 View commit details
    Browse the repository at this point in the history

  2. Clarification for the _data parameter

    @JamesTherien
    JamesTherien committed May 10, 2019
    Configuration menu
    Copy the full SHA
    b6f8829 View commit details
    Browse the repository at this point in the history

  3. Clarify rules of breaking down into multiple onReceived callbacks

    @JamesTherien
    JamesTherien committed May 10, 2019
    Configuration menu
    Copy the full SHA
    67a42bc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from JamesTherien/master 

    Pull James' edits in, some wording changes and clarifications.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y authored May 10, 2019
    Configuration menu
    Copy the full SHA
    8f0c356 View commit details
    Browse the repository at this point in the history

  5. EDT-3069 Alter the rejection logic back to normal for regular 115 ope… 

    …ration, add in "isERC1155TokenReceiver" function and rules around hybrid standard implementations around it. Also made use of `` on types consistent.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 10, 2019
    Configuration menu
    Copy the full SHA
    48cce31 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f11b5c2 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2019

  1. EDT-3069 Small inconsistency and remove the ==<hex value> part from r… 

    …eturn text in case anyone is silly enough to copy-paste that and end up always returning true.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 11, 2019
    Configuration menu
    Copy the full SHA
    cd86485 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 11, 2019
    Configuration menu
    Copy the full SHA
    206594c View commit details
    Browse the repository at this point in the history

  3. EDT-3069 Add in ERC-165 interface identifier info for the ERC1155Toke… 

    …nReceiver interface.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 11, 2019
    Configuration menu
    Copy the full SHA
    d7b07bd View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. EDT-3069 Very minor change to text, remove odd grammar.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 13, 2019
    Configuration menu
    Copy the full SHA
    97fa9de View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 13, 2019
    Configuration menu
    Copy the full SHA
    4f0378e View commit details
    Browse the repository at this point in the history

  3. EDT-3069 Consistency change on the isERC1155TokenReceiver gas require… 

    …ment.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 13, 2019
    Configuration menu
    Copy the full SHA
    15a67ab View commit details
    Browse the repository at this point in the history

Commits on May 18, 2019

  1. EDT-3069 Added wighawag as an author, alter isERC1155Receiver interfa… 

    …ce to view instead of pure (to cover fallback versions) but leave recommended impl as pure, be clearer about having to pass the _data arg to the hooks unaltered, make it so all events have to be emitted before any hooks are called so order is preserved.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 18, 2019
    Configuration menu
    Copy the full SHA
    65052c6 View commit details
    Browse the repository at this point in the history

  2. EDT-3069 Minor grammar and consistency changes on use of "for example… 

    …" for example.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 18, 2019
    Configuration menu
    Copy the full SHA
    8cb2756 View commit details
    Browse the repository at this point in the history

  3. EDT-3069 Change the recommended isERC1155TokenReceiver function to us… 

    …e view mutability to match the interface as implementers will have to also if they include it. Rather surprisingly according to remix the "view" version costs 282 gas vs 305 for the "pure" version too.
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 18, 2019
    Configuration menu
    Copy the full SHA
    a560f91 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 18, 2019
    Configuration menu
    Copy the full SHA
    2eedafb View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. EDT-3069 Small alteration to text by request.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 21, 2019
    Configuration menu
    Copy the full SHA
    cc3e971 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. EDT-3069 Minor text consistency change.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    c2a0f11 View commit details
    Browse the repository at this point in the history

  2. EDT-3069 Fixed typo.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    4eaf2c7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    fb0e643 View commit details
    Browse the repository at this point in the history

  4. EDT-3069 Spelling.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    cc3a9d9 View commit details
    Browse the repository at this point in the history

  5. EDT-3069 Minor formatting change.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    caa8d27 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 22, 2019
    Configuration menu
    Copy the full SHA
    d8b0d2f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. EDT-3069 Some small changes to wording for clarity.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 24, 2019
    Configuration menu
    Copy the full SHA
    8c96bfb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/ethereum/EIPs

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 24, 2019
    Configuration menu
    Copy the full SHA
    282e0d0 View commit details
    Browse the repository at this point in the history

  3. Revert magic_values to original byte4

    @PhABC
    PhABC authored May 24, 2019
    Configuration menu
    Copy the full SHA
    50d401c View commit details
    Browse the repository at this point in the history

  4. EDT-3069 Adding in scenario for non-standard api call and allow it to… 

    … send to contracts that don't have receiver functions if the implementation wishes (with warning on potentially unrecoverable tokens).
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 24, 2019
    Configuration menu
    Copy the full SHA
    d054f84 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2019

  1. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    8d50450 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from PhABC/patch-7 

    Revert magic_values to original byte4
    @AC0DEM0NK3Y
    AC0DEM0NK3Y authored May 25, 2019
    Configuration menu
    Copy the full SHA
    eb36a93 View commit details
    Browse the repository at this point in the history

  3. EDT-3069 Minor consistency change.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    ca3278b View commit details
    Browse the repository at this point in the history

  4. EDT-3069 Updated return value to latest after merge.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    cfae695 View commit details
    Browse the repository at this point in the history

  5. EDT-3069 Consistency on calling "1155" "ERC-1155".

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    c21e799 View commit details
    Browse the repository at this point in the history

  6. EDT-3069 Minor wording change.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    6dd5dc6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    343457a View commit details
    Browse the repository at this point in the history

  8. EDT-3069 More wording changes for clarification.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    91815a0 View commit details
    Browse the repository at this point in the history

  9. EDT-3069 Small grammar change and capitalized API.

    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    a3c61ba View commit details
    Browse the repository at this point in the history

  10. EDT-3069 Change a MAY to SHOULD as a non-standard impl really should … 

    …revert if a contract doesn't accept 1155's
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    4ff6c62 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/ethereum/EIPs 

    # Conflicts:
#	EIPS/eip-1155.md
    @AC0DEM0NK3Y
    AC0DEM0NK3Y committed May 25, 2019
    Configuration menu
    Copy the full SHA
    2a62512 View commit details
    Browse the repository at this point in the history