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

ERC1155: Add a simple catch-all implementation of the metadata URI interface #2029

Merged
merged 31 commits into from
Jun 3, 2020
Merged

ERC1155: Add a simple catch-all implementation of the metadata URI interface #2029

merged 31 commits into from
Jun 3, 2020

Commits on Nov 3, 2019

  1. Initial ERC1155 implementation with some tests (OpenZeppelin#1803) 

    * Initial ERC1155 implementation with some tests

* Remove mocked isERC1155TokenReceiver

* Revert reason edit nit

* Remove parameters associated with isERC1155TokenReceiver call

* Add tests for approvals and single transfers

* Add tests for transferring to contracts

* Add tests for batch transfers

* Make expectEvent.inTransaction tests async

* Renamed "owner" to "account" and "holder"

* Document unspecified balanceOfBatch reversion on zero behavior

* Ensure accounts can't set their own operator status

* Specify descriptive messages for underflow errors

* Bring SafeMath.add calls in line with OZ style

* Explicitly prevent _burn on the zero account

* Implement batch minting/burning

* Refactored operator approval check into isApprovedForAll calls

* Renamed ERC1155TokenReceiver to ERC1155Receiver

* Added ERC1155Holder

* Fix lint issues
    @cag @frangio
    cag authored and frangio committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    20642cc View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Merge branch 'master' into feature-erc1155

    @nventuro
    nventuro committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    f57f16e View commit details
    Browse the repository at this point in the history

  2. Migrate tests to @openzeppelin/test-environment

    @nventuro
    nventuro committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    727512e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Merge branch 'master' into feature-erc1155

    @nventuro
    nventuro committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    c3f4ae3 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. port ERC1155 to Solidity 0.6

    @KaiRo-at
    KaiRo-at committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    a7493e9 View commit details
    Browse the repository at this point in the history

  2. make ERC1155 constructor more similar to ERC721 one

    @KaiRo-at
    KaiRo-at committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    067d278 View commit details
    Browse the repository at this point in the history

  3. also migrate mock contracts to Solidity 0.6

    @KaiRo-at
    KaiRo-at committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    267700f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. mark all non-view functions as virtual

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    7910e8c View commit details
    Browse the repository at this point in the history

  2. add simple catch-all implementation for the metadata URI interface

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    e574206 View commit details
    Browse the repository at this point in the history

  3. include an internal function to set the URI so users can implement fu… 

    …nctionality to switch URIs
    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    6acec05 View commit details
    Browse the repository at this point in the history

  4. add tests for ERC1155 metadata URI

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    132728c View commit details
    Browse the repository at this point in the history

  5. fix nits, mostly pointed out by linter

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    85283ab View commit details
    Browse the repository at this point in the history

  6. convert ERC1155 metadata URI work to Solidity 0.6

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    7e0f247 View commit details
    Browse the repository at this point in the history

  7. mark all non-view functions as virtual

    @KaiRo-at
    KaiRo-at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    82c7bd7 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Port ERC 1155 branch to Solidity 0.6 (and current master) (OpenZeppel… 

    …in#2130)

* port ERC1155 to Solidity 0.6

* make ERC1155 constructor more similar to ERC721 one

* also migrate mock contracts to Solidity 0.6

* mark all non-view functions as virtual
    @KaiRo-at
    KaiRo-at authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    5fd36e7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/feature-erc1155' into feature-… 

    …erc1155
    @frangio
    frangio committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    7c2052f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Merge branch 'master' into feature-erc1155

    @nventuro
    nventuro authored May 8, 2020
    Configuration menu
    Copy the full SHA
    fa4e185 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Update contracts/token/ERC1155/IERC1155MetadataURI.sol 

    Starting on Solidity v0.6.2, interfaces can now inherit. \o/

Co-authored-by: Nicolás Venturo <[email protected]>
    @KaiRo-at @nventuro
    KaiRo-at and nventuro authored May 11, 2020
    Configuration menu
    Copy the full SHA
    77db2a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Merge branch 'master' into kairo-uri

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    4457b39 View commit details
    Browse the repository at this point in the history

  2. Fix compile errors

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    23cb821 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into kairo-uri

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    bc8887b View commit details
    Browse the repository at this point in the history

  4. Remove URI event

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    473d0ce View commit details
    Browse the repository at this point in the history

  5. Merge MetadataCatchAll into ERC1155

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    d55b138 View commit details
    Browse the repository at this point in the history

  6. Improve documentation.

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    4a5108c View commit details
    Browse the repository at this point in the history

  7. Simplify tests

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    56b50f3 View commit details
    Browse the repository at this point in the history

  8. Move tests into ERC1155 tests

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    22c4cd3 View commit details
    Browse the repository at this point in the history

  9. Update documentation

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    fd50e27 View commit details
    Browse the repository at this point in the history

  10. Bump minimum compiler version for inteface inheritance

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    6653018 View commit details
    Browse the repository at this point in the history

  11. Fix holder tests

    @nventuro
    nventuro committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    fa92e6a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Improve setUri docs

    @nventuro
    nventuro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    4763213 View commit details
    Browse the repository at this point in the history

  2. Fix docs generation

    @nventuro
    nventuro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    d52171a View commit details
    Browse the repository at this point in the history