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
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
281bcb747e
Bump @openzeppelin/cli from 2.8.0 to 2.8.1 ( #2182 )
...
Bumps [@openzeppelin/cli](https://github.com/OpenZeppelin/openzeppelin-sdk ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/OpenZeppelin/openzeppelin-sdk/releases )
- [Commits](https://github.com/OpenZeppelin/openzeppelin-sdk/compare/v2.8.0...v2.8.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-13 13:30:27 -03:00
e03c05774b
Bump solhint from 3.0.0-rc.6 to 3.0.0-rc.7 ( #2183 )
...
Bumps [solhint](https://github.com/protofire/solhint ) from 3.0.0-rc.6 to 3.0.0-rc.7.
- [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.6...v3.0.0-rc.7 )
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-13 13:21:09 -03:00
05d1618d01
Update Contracts docs to make examples compile ( #2170 )
...
* Update access-control.adoc to make compile
Add call to `ERC20("MyToken", "TKN")` in `MyToken` constructor
* Update access-control.adoc to make compile
Add call to `ERC20("MyToken", "TKN")` in `MyToken` constructor
* Update access-control.adoc MyToken formatting
* Update erc20-supply.adoc to make compile
Add call to `ERC20("MyToken", "TKN")` in `ERC20FixedSupply` constructor
* Update erc20-supply.adoc to make compile
Add constructor to `ERC20WithMinerReward`
* Update erc20-supply.adoc to make compile
In `MinerRewardMinter` use `ERC20MinterPauser`
* Update erc20-supply.adoc to make compile
Add constructor and override to `ERC20WithAutoMinerReward`
* Update erc777.adoc to make compile
* Update gsn-strategies.adoc to make compile
* Update gsn-strategies.adoc to make compile
Fix imports, add overrides, and revert reason to `MyContract`
2020-04-07 08:45:48 -03:00
885378e421
Fix some of the code formatting in docs
2020-04-03 21:13:55 -03:00
0292d793f3
add passthrough delimiters to avoid italics from underscores ( #2169 )
...
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-04-03 20:51:14 -03:00
f4566aaade
Fix rc generator
2020-04-03 17:55:36 -03:00
d8a5ffeee9
Fix prerelease marker
2020-04-03 17:23:57 -03:00
9edee8a7a8
Fix linter errors
2020-04-03 17:15:40 -03:00
bbb245fc43
Add rc marker to docs
2020-04-03 17:13:56 -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
21ceabc77c
Improve API docgen sorting
2020-04-03 17:02:04 -03:00
7c19c56844
Improve API docgen sorting
2020-04-03 17:01:29 -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
