1. 14 Jul, 2020 1 commit
  2. 13 Jul, 2020 1 commit
  3. 08 Jul, 2020 1 commit
  4. 01 Jul, 2020 2 commits
  5. 29 Jun, 2020 1 commit
  6. 25 Jun, 2020 1 commit
  7. 23 Jun, 2020 3 commits
  8. 19 Jun, 2020 1 commit
  9. 16 Jun, 2020 2 commits
  10. 12 Jun, 2020 3 commits
  11. 11 Jun, 2020 6 commits
  12. 09 Jun, 2020 2 commits
    • Address ERC1155 changes (#2267) · d9fa59f3
      * Make holder fns public
      
      * Add context, remove msg.sender from check
      
      * Fix location of Holder arguments
      
      * Add beforeTransfer hook
      
      * Minor test improvements
      
      * Add ERC1155Burnable and tests
      
      * Add ERC1155Pausable
      
      * Add ERC1155PresetMinterPauser.sol
      
      * Add uri constructors
      
      * Improved revert reasons
      
      * Initial docs improvements
      
      * Add missing docs
      
      * Improve acceptance checks revert reasons
      
      * Apply suggestions from code review
      
      Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
      
      * Remove note about 1155 preset uri in mint
      
      * Add rquirements to balanceOfBatch
      
      * Add note about URI and uri
      
      * Fix list in docs
      
      * Fix lint errors
      
      * Use natural sorting for API titles
      
      * Fix doc references
      
      * Escape {id} references to remove docgen warnings
      
      * Added intro docs, fixed links
      
      * Apply suggestions from code review
      
      Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
      
      * Add changelog entry
      
      Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
      Nicolás Venturo authored
  13. 08 Jun, 2020 4 commits
  14. 05 Jun, 2020 7 commits
  15. 04 Jun, 2020 1 commit
  16. 03 Jun, 2020 1 commit
    • Add a simple catch-all implementation of the metadata URI interface (#2029) · a81e948f
      * Initial ERC1155 implementation with some tests (#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
      
      * Migrate tests to @openzeppelin/test-environment
      
      * 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
      
      * add simple catch-all implementation for the metadata URI interface
      
      * include an internal function to set the URI so users can implement functionality to switch URIs
      
      * add tests for ERC1155 metadata URI
      
      * fix nits, mostly pointed out by linter
      
      * convert ERC1155 metadata URI work to Solidity 0.6
      
      * mark all non-view functions as virtual
      
      * Port ERC 1155 branch to Solidity 0.6 (and current master) (#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
      
      * Update contracts/token/ERC1155/IERC1155MetadataURI.sol
      
      Starting on Solidity v0.6.2, interfaces can now inherit. \o/
      
      Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
      
      * Fix compile errors
      
      * Remove URI event
      
      * Merge MetadataCatchAll into ERC1155
      
      * Improve documentation.
      
      * Simplify tests
      
      * Move tests into ERC1155 tests
      
      * Update documentation
      
      * Bump minimum compiler version for inteface inheritance
      
      * Fix holder tests
      
      * Improve setUri docs
      
      * Fix docs generation
      
      Co-authored-by: Alan Lu <alanlu1023@gmail.com>
      Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
      Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
      Robert Kaiser authored
  17. 02 Jun, 2020 3 commits