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.

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

A small formatting fix. #2064

Merged
merged 45 commits into from
May 23, 2019
Merged

A small formatting fix. #2064

merged 45 commits into from
May 23, 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 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    49fbbde View commit details
    Browse the repository at this point in the history
  2. 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. 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 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 committed May 7, 2019
    Configuration menu
    Copy the full SHA
    ed9f0d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e331f58 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e2a176 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c9db596 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3ba6d4f View commit details
    Browse the repository at this point in the history
  6. 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 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 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. 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. 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 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 committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cdc350b View commit details
    Browse the repository at this point in the history
  4. 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 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 committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cbc7264 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d5446f9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c62f69b View commit details
    Browse the repository at this point in the history
  9. 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. Configuration menu
    Copy the full SHA
    4f36207 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6f8829 View commit details
    Browse the repository at this point in the history
  3. 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 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 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 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 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 committed May 11, 2019
    Configuration menu
    Copy the full SHA
    206594c View commit details
    Browse the repository at this point in the history
  3. 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. 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 committed May 13, 2019
    Configuration menu
    Copy the full SHA
    4f0378e View commit details
    Browse the repository at this point in the history
  3. 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 committed May 18, 2019
    Configuration menu
    Copy the full SHA
    65052c6 View commit details
    Browse the repository at this point in the history
  2. 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 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 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. 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. 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 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 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 committed May 22, 2019
    Configuration menu
    Copy the full SHA
    cc3a9d9 View commit details
    Browse the repository at this point in the history
  5. 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 committed May 22, 2019
    Configuration menu
    Copy the full SHA
    d8b0d2f View commit details
    Browse the repository at this point in the history