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

Additional rule clarity and potentially finalized updates after feedback. #2006

Merged
merged 18 commits into from
May 9, 2019
Merged

Additional rule clarity and potentially finalized updates after feedback. #2006

merged 18 commits into from
May 9, 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