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
fd981ad315
fix removal of mocks from published package
2020-05-12 17:36:16 -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
4cbcaf35e4
Fix linter errors
2020-05-08 12:57:43 -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
ac0a4327a9
Bump solidity-docgen from 0.4.1 to 0.5.3 ( #2221 )
...
* Bump solidity-docgen from 0.4.1 to 0.5.3
Bumps solidity-docgen from 0.4.1 to 0.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Update prepare-docs.sh
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-05-04 17:14:12 -03:00
c20e620a06
Improve Pausable docs
2020-05-04 16:37:05 -03:00
4bc45e35c2
[Security] Bump acorn from 6.4.0 to 6.4.1 ( #2224 )
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 6.4.0 to 6.4.1. **This update includes security fixes.**
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-04 15:04:48 -03:00
b362e886ec
Bump ethereumjs-util from 6.2.0 to 7.0.0 ( #2222 )
...
* Bump ethereumjs-util from 6.2.0 to 7.0.0
Bumps [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-util ) from 6.2.0 to 7.0.0.
- [Release notes](https://github.com/ethereumjs/ethereumjs-util/releases )
- [Changelog](https://github.com/ethereumjs/ethereumjs-util/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ethereumjs/ethereumjs-util/compare/v6.2.0...v7.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* update use of ethereumjs-util
* fix use of keccak hash function
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-05-04 14:55:16 -03:00
ca38899ede
Upgrade solhint to 3.0 ( #2223 )
2020-05-04 14:49:41 -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
6e3de4d48a
Merge pull request #2213 from nventuro/merge-v2.5.1
...
Merge v2.5.1 into v3.0.0
2020-04-27 15:25:11 -03:00
dc3f92210b
Bump mocha from 7.1.1 to 7.1.2 ( #2216 )
...
Bumps [mocha](https://github.com/mochajs/mocha ) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/mochajs/mocha/releases )
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mochajs/mocha/compare/v7.1.1...v7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-27 12:00:45 -03:00
1ff8a97d11
add docs badge
2020-04-24 19:46:24 -03:00
dd226e1987
Add latest audit notice
2020-04-24 16:35:24 -03:00
d0f67f99a7
Add changelog entry
2020-04-24 16:08:00 -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
3843c9beb7
Add changelog entry
2020-04-24 15:34:38 -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
a4320108d5
Remove prerelease tag from docs
2020-04-20 20:24:24 -03:00
05085aa605
Merge branch 'master' into release-v3.0.0
2020-04-20 20:21:14 -03:00
528c23d679
Remove ethpm.json and update releasing docs ( #2205 )
...
* remove ethpm.json
* update releasing document
* fix release documentation to be more realistic
2020-04-20 20:10:30 -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
c986dfb256
[Security] Bump acorn from 6.4.0 to 6.4.1 ( #2204 )
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 6.4.0 to 6.4.1. **This update includes security fixes.**
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-20 14:17:12 -03:00
6d5ef3ef5f
Bump solhint from 3.0.0-rc.7 to 3.0.0-rc.8 ( #2202 )
...
Bumps [solhint](https://github.com/protofire/solhint ) from 3.0.0-rc.7 to 3.0.0-rc.8.
- [Release notes](https://github.com/protofire/solhint/releases )
- [Changelog](https://github.com/protofire/solhint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/protofire/solhint/compare/v3.0.0-rc.7...v3.0.0-rc.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-20 14:02:33 -03:00
2663c5ee0f
Bump @openzeppelin/test-environment from 0.1.3 to 0.1.4 ( #2201 )
...
Bumps [@openzeppelin/test-environment](https://github.com/OpenZeppelin/openzeppelin-test-environment ) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/OpenZeppelin/openzeppelin-test-environment/releases )
- [Changelog](https://github.com/OpenZeppelin/openzeppelin-test-environment/blob/master/CHANGELOG.md )
- [Commits](https://github.com/OpenZeppelin/openzeppelin-test-environment/compare/v0.1.3...v0.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-20 13:43:00 -03:00
1075898b06
Bump @openzeppelin/cli from 2.8.1 to 2.8.2 ( #2200 )
...
Bumps [@openzeppelin/cli](https://github.com/OpenZeppelin/openzeppelin-sdk ) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/OpenZeppelin/openzeppelin-sdk/releases )
- [Commits](https://github.com/OpenZeppelin/openzeppelin-sdk/compare/v2.8.1...v2.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-20 12:33:00 -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
3216fd9729
Configure line length in .editorconfig
2020-04-15 13:33:49 -03:00
