91516b2318
Allow overriding of ERC1155 functions ( #2263 )
...
* Make receiver functions private
* Make external functions public
2020-06-02 15:06:34 -03:00
52f7b6e03b
Remove TokenVesting reference from Timelock docs ( #2262 )
2020-06-02 13:32:14 -03:00
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 >
2020-06-01 17:17:32 -03:00
394987f365
Fix ERC777 hook docs, fixes #2256
2020-06-01 13:17:15 -03:00
d418da6b91
Decrease CREATE2 address computation gas usage from 623 to 539 ( #2244 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-05-28 20:47:45 -03:00
5513dfd3cf
Adding SafeCast variants for signed integers ( #2243 )
...
* feat: Adding SafeCast variants for signed integers
* Add newline at EOF
* Update CHANGELOG.md
* Update contracts/utils/SafeCast.sol
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-05-26 19:17:34 -03:00
424ab2a024
Update SafeERC20.sol ( #2246 )
...
tweak intro dev comment to reflect more typical use case, wrapping an `IERC20` reference for a deposit contract using others' ERC-20 tokens. I might be mistaken ~ but typically SafeERC20 won't be used in conjunction with ERC20 for OZ token deployments?
2020-05-26 13:39:54 -03:00
56de324afe
Add SPX license identifier ( #2235 )
2020-05-14 21:58:11 -03:00
4fe31f8d4d
Fixed typo in ERC20PresetMinterPauser ( #2233 )
...
* Fixed typo in ERC20PresetMinterPauser
* Update ERC721PresetMinterPauserAutoId.sol
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-05-13 13:26:16 -03:00
cfa9ad9943
Fix ReentrancyGuard for Proxy Pattern ( #2171 )
...
* Fix ReentrancyGuard for Proxy Pattern
* Update ReentrancyGuard.sol
* Change constant values
* Add changelog entry
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-05-12 20:23:28 -03:00
5f9a86a8f2
Remove leftovers of TokenVesting contract
2020-05-08 17:04:22 -03:00
956d6632d9
ERC1155 feature pending tasks ( #2014 )
...
* 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 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
Co-authored-by: Alan Lu <alanlu1023@gmail.com >
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
Co-authored-by: Robert Kaiser <kairo@kairo.at >
2020-05-08 13:38:43 -03:00
0c7b2ec09e
Make Context abstract ( #2229 )
2020-05-08 13:02:07 -03:00
73baf0b635
Feature/Adding RoleAdminChanged event in AccessControl ( #2214 )
...
* Emit new event RoleAdminChanged
* Adding new RoleAdminChanged event in Tests
* Update suggested comments on new Event
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
* Adding PreviousAdminRole to event
* Update AccessControl.test.js
* Update CHANGELOG.md
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-05-06 17:21:39 -03:00
78dc37739f
Making IERC721Receiver an interface ( #2225 )
...
* Making IERC721Receiver an interface
* Update IERC721Receiver.sol
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-05-06 16:47:53 -03:00
c20e620a06
Improve Pausable docs
2020-05-04 16:37:05 -03:00
61973af29f
Remove misleading SafeMath comment
2020-04-28 12:46:32 -03:00
087d314daf
3.0.1
2020-04-27 15:30:27 -03:00
e156b617b9
Merge branch 'release-v2.5.0'
2020-04-24 16:04:40 -03:00
837828967a
2.5.1
2020-04-24 15:57:33 -03:00
c75b016919
Add missing requirements to ERC777 ( #2212 )
...
* Restore _approve check for zero sender
* Add non-zero operator check to _send
2020-04-24 15:33:22 -03:00
ad290e7181
Use msg.sender in docs
2020-04-23 12:15:06 -03:00
364da52a49
Add note about default admin role security ( #2211 )
...
* Add note about default admin security
* Update contracts/access/AccessControl.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-22 17:17:33 -03:00
e50e496f5b
Remove unnecessary linter ignore
2020-04-21 15:04:04 -03:00
c4be4d16e8
ERC721 documentation ( #2164 )
...
* Add documentation to the IERC721 contract
* Add documentation to the IERC721Metadata contract
* Add documentation to the IERC721Enumerable contract
* Improves IERC721 documentation
* Improves IERC721Metadata documentation
* Improves IERC721Enumerable documentation
* Fixes documentations issues in IERC721
* Improves ERC721 interfaces documentation
2020-04-21 15:00:48 -03:00
6f40ed3fbf
Fix crossreference
2020-04-20 21:27:48 -03:00
57551c8516
Fix asciidoc typos
2020-04-20 21:06:36 -03:00
b7452960be
3.0.0
2020-04-20 20:37:38 -03:00
32f55009af
Remove outdated notes to v2.x docs
2020-04-20 20:37:20 -03:00
05085aa605
Merge branch 'master' into release-v3.0.0
2020-04-20 20:21:14 -03:00
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
2020-04-20 20:05:48 -03:00
5bb8d0245b
Improve Hooks documentation ( #2199 )
...
* Improve Hooks docs
* Improve Utils docs
* Apply suggestions from code review
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Add enumerable code samples
* Remove import statement from example
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-20 16:43:05 -03:00
c7705712ba
Remove in-constructor requirements ( #2195 )
...
* Remove isConstructor requirement from _setupRole
* Remove isConstructor requirement from _setupDecimals
* Update contracts/access/AccessControl.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-17 17:00:30 -03:00
13e113df81
Improve usage of toString
2020-04-17 11:37:58 -03:00
cca71ab709
Fix deprecation warnings ( #2115 )
...
* Fix deprecation warnings
* Workaround linter bug
2020-04-16 12:13:49 -03:00
8b10cb38d8
Rename Strings.fromUint256 to Strings.toString ( #2188 )
...
* rename Strings.fromUint256 to Strings.toString
* add changelog entry
* fix conflict with js toString method
2020-04-15 18:04:00 -03:00
3e139baa50
Add missing hook to ERC777, fix relevant documentation ( #2191 )
...
* Improve ERC20/721 Pausable docs
* Add ERC20Pausable mint and burn tests
* Add ERC721Pausable mint and burn tests
* Add _beforeTransfer hook in ERC777 to mint and burn
2020-04-15 17:58:24 -03:00
b6513f6ad7
provide 'automatic' token URI by appending the token ID to the base URI ( #2174 )
...
* provide 'automatic' token URI by appending the token ID to the base URI, if a base is set but no token-specific URI is available
* make the three cases more explicit, avoid else after return
* adjust comments to reflect reality
2020-04-15 15:39:33 -03:00
4ca719bf8b
Fix typo
2020-04-15 14:35:27 -03:00
b734bf3fa5
Tweak wording in ERC20Snapshot docs
2020-04-15 13:33:24 -03:00
3b10205c8e
Improve ERC20Snapshot documentation ( #2186 )
...
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-04-14 19:06:51 -03:00
d2ab599bd3
Update IERC777.sol ( #2184 )
2020-04-14 14:41:33 -03:00
885378e421
Fix some of the code formatting in docs
2020-04-03 21:13:55 -03:00
cd6f52997e
Merge branch 'master' into release-v3.0.0
2020-04-03 17:06:39 -03:00
c4e5daff86
Fix Pausable docs
2020-04-03 17:06:33 -03:00
96a7113a16
Fix broken links
2020-04-03 17:05:36 -03:00
63a3665a17
3.0.0-rc.1
2020-04-03 16:22:56 -03:00
92a60b2587
Merge branch 'master' into release-v3.0.0
2020-04-03 16:22:25 -03:00
a0f6bd3926
Add 'deploy-ready' token contracts ( #2167 )
...
* Add ERC20DeployReady
* Add ERC721DeployReady
* Improve docs
* Fix linter errors
* Rename DeployReady contracts to MinterPauser, add docs
* Fix deploy ready docs
* Minor doc adjustment
2020-04-03 16:21:58 -03:00
402c6ab4cc
Update docs ( #2168 )
...
* Update docs for ERC20 and ERC721
* Add EnumerableMap to docs
* Update misc guides
* Apply suggestions from code review
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-03 13:17:24 -03:00
