Hadrien Croubois
|
93438eca0b
|
Merge 3.4 master into solc-0.8 (#2499)
* 3.4.0-rc.0
* Allow manual dispatch of Test CI job
* Update lockfile (#2481)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
* Add "available since" comments in documentation
* Add "available since" comments in documentation
(cherry picked from commit 63a0343dda )
* Remove SafeMathMock compilation warnings (#2497)
* Remove SafeMathMock compilation warnings (#2497)
(cherry picked from commit f4e57fd529 )
* 3.4.0
* fix safemath test to use renamed function from the mock
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
|
4 years ago |
Francisco Giordano
|
a0e2bca79a
|
Add "available since" comments in documentation
(cherry picked from commit 63a0343dda )
|
4 years ago |
Francisco Giordano
|
63a0343dda
|
Add "available since" comments in documentation
|
4 years ago |
Andre Korol
|
974c534210
|
Update contracts to support Solidity 0.8.x (#2442)
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
|
4 years ago |
Hadrien Croubois
|
318c4b44ea
|
Move Context from GSN to utils directory (#2453)
Co-authored-by: Hadrien Croubois <hadrien@openzeppelin.com>
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
|
4 years ago |
Ashwin Yardi
|
883116e4af
|
Add ERC20 and ERC777 fixed supply presets #2377 (#2399)
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
|
4 years ago |
Francisco Giordano
|
90ed1af972
|
Support compiling with solc 0.7 (#2408)
|
4 years ago |
Andrew B Coathup
|
ded2b0a55c
|
Fix minor typos and grammar in docs (#2338)
* Fix typos and formatting
* Add Solidity release dates: releases-stability
|
4 years ago |
Elena Gesheva
|
04fc35707d
|
Migrate contracts to Solidity 0.7 (#2319)
* Update contract pragmas to solidity 0.7
* Remove internal declaration on constructors
* Reference SafeMath explicitely
* Remove public constructor declaration from abstract contracts
* Remove public constructor declaration from non-abstract contracts
|
5 years ago |
Francisco Giordano
|
ef3bbbcf40
|
Add readme notices with link to docs site (#2300)
* add readme notices
* remove period after url
|
5 years ago |
Nicolás Venturo
|
d9fa59f30a
|
Address ERC1155 changes (#2267)
* 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>
|
5 years ago |
Nicolás Venturo
|
fac773ac99
|
Add SPX license identifier (#2235)
(cherry picked from commit 56de324afe )
|
5 years ago |
Nicolás Venturo
|
82769e54c3
|
Fix 721 preset docs
|
5 years ago |
Jordan
|
64ab594ad6
|
Modify token presets "mint" function as virtual to allow extending (#2257)
* Modify token presets "mint" function as virtual to allow extending in parent contracts
* Update ERC20PresetMinterPauser.sol
* Update ERC721PresetMinterPauserAutoId.sol
* Update CHANGELOG.md
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
|
5 years ago |
Nicolás Venturo
|
56de324afe
|
Add SPX license identifier (#2235)
|
5 years ago |
SmritiVerma
|
4fe31f8d4d
|
Fixed typo in ERC20PresetMinterPauser (#2233)
* Fixed typo in ERC20PresetMinterPauser
* Update ERC721PresetMinterPauserAutoId.sol
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
|
5 years ago |
Francisco Giordano
|
6f40ed3fbf
|
Fix crossreference
|
5 years ago |
Francisco Giordano
|
57551c8516
|
Fix asciidoc typos
|
5 years ago |
Nicolás Venturo
|
715ec806f0
|
ERC721 deploy ready fixes (#2192)
* Add baseURI to ERC721MinterPauser constructor
* Add tokenURI to mint
* Remove tokenId and tokenURI from ERC721 deploy ready
* Rename ERC721MinterPauser to ERC721MinterAutoID, remove Pausable mechanisms
* Restore pausing to ERC721
* Rename deploy ready to presets
* Rename ERC721 preset
|
5 years ago |