0db76e98f9
Merge branch 'solc-0.7' into solc-0.8
2021-01-27 11:28:23 +01:00
6d202894b6
Merge branch 'master'
2021-01-26 18:58:15 +01:00
18c7efe800
Make view and pure functions virtual ( #2473 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-01-26 13:23:23 -03:00
974c534210
Update contracts to support Solidity 0.8.x ( #2442 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-01-14 19:38:53 -03:00
faec973e09
Make non-view functions virtual ( #2468 )
2021-01-13 18:25:39 -03:00
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 >
2021-01-07 13:04:13 -03:00
ecc66719bd
Add ERC20 Permit (EIP-2612) ( #2237 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Santiago Palladino <spalladino@gmail.com >
2020-12-11 13:34:02 -03:00
268c6ab36c
Edit ERC20 API index to make it clearer
2020-12-09 20:04:08 -03:00
90ed1af972
Support compiling with solc 0.7 ( #2408 )
2020-11-17 21:29:39 -03:00
4972bf4f23
Merge branch 'master' into solc-0.7
2020-11-16 14:11:46 -03:00
0f55c18595
Fix/solc 0.7.4 warnings #2391 ( #2396 )
...
* Fix unnamed return variable warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: Unnamed return variable can remain unassigned. Add an explicit
return with value to all non-reverting code paths or name the variable."
* Fix function state mutability warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: Function state mutability can be restricted to pure"
* Fix shadows an existing declaration warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: This declaration shadows an existing declaration."
1. Arguments by default are not underscored.
2. If the name isn't available due to shadowing, use prefix underscore.
3. If prefix underscore isn't available due to shadowing, use suffix underscore.
2020-10-28 13:42:38 -03:00
e98b187e64
Fix typos in ERC20 docs ( #2364 )
2020-09-17 19:45:12 -03:00
1229c28ce0
Update ERC20.sol ( #2357 )
...
Remove unused `Address` library import, references.
2020-09-14 13:35:46 -03:00
22de765f3c
Merge branch 'release-v3.2.0' into release-v3.2.0-solc-0.7
2020-09-08 20:14:42 -03:00
ded2b0a55c
Fix minor typos and grammar in docs ( #2338 )
...
* Fix typos and formatting
* Add Solidity release dates: releases-stability
2020-09-01 15:19:17 -03:00
6d5a73815d
Fix ERC20Snapshot#_beforeTokenTransfer ( #2328 )
2020-08-14 11:59:20 -03:00
9700e6b4bd
Use beforeTokenTransfer hook in ERC20Snapshot ( #2312 )
2020-08-11 16:51:58 -03:00
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
2020-07-29 18:11:32 -03:00
0c667ca32a
docs: add note explaining opinionated presets ( #2313 )
...
* docs: add notes explaining presets
* fix links for mint function
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-07-21 19:04:21 -03:00
ef3bbbcf40
Add readme notices with link to docs site ( #2300 )
...
* add readme notices
* remove period after url
2020-06-29 17:23:53 -03:00
8b58fc7191
feat: add wrapper function for low level calls ( #2264 )
...
* feat: add wrapper function for low level calls
* add error message parameter
* adding unit tests and required mocks
* implement error message on SafeERC20
* fixed variable name in tests
* Add missing tests
* Improve docs.
* Add functionCallWithValue
* Add functionCallWithValue
* Skip balance check on non-value functionCall variants
* Increase out of gas test timeout
* Fix compile errors
* Apply suggestions from code review
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* Add missing tests
* Add changelog entry
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-06-11 16:25:46 -03:00
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 >
2020-06-09 14:47:51 -03:00
d3ef93a9a5
Deprecate SafeERC20.safeApprove ( #2268 )
...
* Deprecate SafeERC20.safeApprove
* Add changelog entry
2020-06-05 14:13:53 -03:00
52f7b6e03b
Remove TokenVesting reference from Timelock docs ( #2262 )
2020-06-02 13:32:14 -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
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
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
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
885378e421
Fix some of the code formatting in docs
2020-04-03 21:13:55 -03:00
96a7113a16
Fix broken links
2020-04-03 17:05:36 -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
0408e51ae6
Bundle ERC20Detailed ( #2161 )
...
* Merge ERC20Detailed into ERC20, make derived contracts abstract
* Fix Create2 tests
* Fix failing test
* Default decimals to 18
* Add tests for setupDecimals
* Add changelog entry
* Update CHANGELOG.md
* Update CHANGELOG.md
* Replace isConstructor for !isContract
* Update CHANGELOG.md
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-02 15:30:21 -03:00
97894a140d
Adhere to naming convention ( #2150 )
...
* Upgrade to latest solhint rc
* Add private-vars-leading-underscore linter rule
* Add leading underscore to GSNRecipient constants
* Remove leading underscore from ERC165Checker functions
* Add leading underscore to multiple private constants
* Fix linter errors in mocks
* Add leading underscore to ERC777's ERC1820 registry
* Add changelog entry
2020-03-27 13:49:08 -03:00
c9630526e2
Draft and lifecycles directories cleanup ( #2122 )
...
* Move Pausable into utils
* Move Strings into utils
* Move Counters into utils
* Move SignedSafeMath into math
* Remove ERC1046
* Make ERC20Snapshot.snapshot internal
* Move ERC20Snapshot into ERC20
* Add drafts deprecation notice
* Remove drafts directory
* Add changelog entry
* Apply suggestions from code review
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-03-16 16:27:15 -03:00
baaadde3c5
Remove ERC20._burnFrom ( #2119 )
...
* Remove ERC20._burnFrom
* Add changelog entry
2020-03-16 15:06:19 -03:00
7acd60d152
Add notice about deprecated Crowdsales ( #2116 )
...
* Remove crowdsales from sidebar documentation, add links to old version
* Remove mentions of Crowdsales from the documentation
2020-03-11 15:26:21 -03:00
5dfe7215a9
Migrate Contracts to Solidity v0.6 ( #2080 )
...
* Initial migration to Solidity 0.6.x - v3.0 first steps (#2063 )
* Initial migration, missing GSN, 721, 777 and Crowdsales.
* Add _beforeTokenOperation and _afterTokenOperation.
* Add documentation for hooks.
* Add hooks doc
* Add missing drafts
* Add back ERC721 with hooks
* Bring back ERC777
* Notes on hooks
* Bring back GSN
* Make functions virtual
* Make GSN overrides explicit
* Fix ERC20Pausable tests
* Remove virtual from some view functions
* Update linter
* Delete examples
* Remove unnecessary virtual
* Remove roles from Pausable
* Remove roles
* Remove users of roles
* Adapt ERC20 tests
* Fix ERC721 tests
* Add all ERC721 hooks
* Add ERC777 hooks
* Fix remaining tests
* Bump compiler version
* Move 721BurnableMock into mocks directory
* Remove _before hooks
* Fix tests
* Upgrade linter
* Put modifiers last
* Remove _beforeTokenApproval and _beforeOperatorApproval hooks
2020-02-14 11:12:32 -03:00
54ee1c7ff5
Fixing really minor typo ( #1911 )
2019-09-04 11:45:49 -03:00
d864228624
Improve GSN documentation ( #1900 )
...
* Improve IRelayRecipient docs
* Fix link
* Update IRelayHub docs to the docsite format
* Update IRelayRecipient docs to the dociste format
* Fix typo
* Improve GSN readme
* Fix link
* Update GSNRecipient docs
* Apply suggestions from code review
Co-Authored-By: Andrew B Coathup <28278242+abcoathup@users.noreply.github.com >
* Apply suggestions from code review
Co-Authored-By: Andrew B Coathup <28278242+abcoathup@users.noreply.github.com >
* Apply suggestions from code review
Co-Authored-By: Andrew B Coathup <28278242+abcoathup@users.noreply.github.com >
2019-08-29 18:57:17 -03:00
5d183d0efe
Syncing naming of value and amount. ( #1895 )
2019-08-26 12:24:43 -03:00
d1158ea68c
GSN compatibility ( #1880 )
...
* switch to using Context internally
* add context import
* Add smoke test to make sure enabling GSN support works
* Update test/GSN/ERC721GSNRecipientMock.test.js
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Upgrade truffle
* add missing awaits
* Revert "Upgrade truffle"
This reverts commit f9b0ba9019
2019-08-14 14:21:38 +02:00
eeeb3a5be1
Typo in ERC20.sol ( #1873 )
...
Changed word from Destoys to Destroys in line number 220.
https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol#L220
Need review. Thanks 👍
2019-08-09 15:10:06 -03:00
5d34dbecea
Functions in SafeMath contract overloaded to accept custom error messages ( #1828 )
...
* Imporvement: functions in SafeMath contract overloaded to accept custom error messages.
* CHANGELOG updated, custom error messages added to ERC20, ERC721 and ERC777 for subtraction related exceptions.
* SafeMath overloads for 'add' and 'mul' removed.
* Error messages modified.
* Update CHANGELOG.md
2019-07-29 15:23:34 -03:00
90831c8970
Squash merge of branch docs-v2.x into master
2019-07-23 15:54:12 -03:00
7552af95e4
migrate content to format for new docs site
...
Squashed commit of the following:
commit fcf35eb806100de300bd9803ce3150dde1ecc424
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 17 17:16:04 2019 -0300
remove all docsite dependency
commit eeaee9a9d43d70704f6ab17b5126ddbd52b93a50
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 17 17:15:23 2019 -0300
update solidity-docgen
commit f021ff951829ea0c155186749819403c6b76e803
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 17 17:05:06 2019 -0300
update docsite script for new setup
commit ff887699d381cfbbe3acf1f1c0de8e22b58480f3
Merge: c938aa1d 84f85a41frangio.1@gmail.com >
Date: Wed Jul 17 16:46:46 2019 -0300
Merge branch 'master' into antora
commit c938aa1d9ed05ac83a34e2cebd8353f8331ad6d6
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jul 16 18:24:29 2019 -0300
make component name shorter
commit 5bbd6931e02cbbd8864c82655ad0f390ceead5f3
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 20:16:17 2019 -0300
add all info to docs templates
commit 39682c4515d7cf0f0368ed557f50d2709174208a
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 20:13:49 2019 -0300
fix npm docsite script
commit 7ae46bd4a0437abf66150d54d05adf46e3de2cab
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 18:48:05 2019 -0300
convert inline docs to asciidoc
commit cfdfd3dee4b4bf582fde22c8cb6e17a603d6e0c8
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 17:34:52 2019 -0300
add missing contract names in readmes
commit 15b6a2f9bfb546cf1d3bf4f104278b118bf1b3f4
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 17:16:47 2019 -0300
fix script path
commit 80d82b909f9460d1450d401f00b3f309da506b29
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 17:13:53 2019 -0300
update version of solidity-docgen
commit a870b6c607b9c2d0012f8a60a4ed1a1c8b7e8ebd
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 17:03:53 2019 -0300
add nav generation of api ref
commit 069cff4a25b83752650b54b86d85608c2f547e5e
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed Jul 10 16:32:14 2019 -0300
initial migration to asciidoc and new docgen version
commit 55216eed0a6551da913c8d1da4b2a0d0d3faa1a8
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 20:39:35 2019 -0300
add basic api doc example
commit 0cbe50ce2173b6d1d9a698329d91220f58822a53
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 19:31:31 2019 -0300
add sidebars
commit 256fc942845307258ac9dc25aace48117fa10f79
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 15:22:38 2019 -0300
add page titles
commit f4d0effa70e1fc0662729863e8ee72a8821bc458
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 15:19:41 2019 -0300
add contracts index file
commit b73b06359979f7d933df7f2b283c50cb1c31b2a0
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 15:14:52 2019 -0300
fix header levels
commit fb57d9b820f09a1b7c04eed1a205be0e45866cac
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 15:11:47 2019 -0300
switch format to preferred asciidoctor format
commit 032181d8804137332c71534753929d080a31a71f
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue Jun 25 15:05:38 2019 -0300
initialize antora component and convert docs to asciidoc
2019-07-17 17:16:47 -03:00
b084f42029
Update ERC20.sol ( #1815 )
...
Fix typo
2019-07-10 18:08:22 -03:00
