5db7413827
re-enabling safemath revert reasons in ERC20, ERC777 and ERC1155 ( #2491 )
...
* re-enabling safemath revert reasons in ERC20 and ERC1155
* adding revert messages to ERC777
* removing uncheck block
4 years ago
5609cd4c74
Fix merge errors
4 years ago
18c7efe800
Make view and pure functions virtual ( #2473 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
4 years ago
974c534210
Update contracts to support Solidity 0.8.x ( #2442 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
4 years ago
faec973e09
Make non-view functions virtual ( #2468 )
4 years ago
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
ecc66719bd
Add ERC20 Permit (EIP-2612) ( #2237 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: Santiago Palladino <spalladino@gmail.com>
4 years ago
268c6ab36c
Edit ERC20 API index to make it clearer
4 years ago
90ed1af972
Support compiling with solc 0.7 ( #2408 )
4 years ago
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.
4 years ago
e98b187e64
Fix typos in ERC20 docs ( #2364 )
4 years ago
1229c28ce0
Update ERC20.sol ( #2357 )
...
Remove unused `Address` library import, references.
4 years ago
ded2b0a55c
Fix minor typos and grammar in docs ( #2338 )
...
* Fix typos and formatting
* Add Solidity release dates: releases-stability
4 years ago
6d5a73815d
Fix ERC20Snapshot#_beforeTokenTransfer ( #2328 )
5 years ago
9700e6b4bd
Use beforeTokenTransfer hook in ERC20Snapshot ( #2312 )
5 years ago
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
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>
5 years ago
ef3bbbcf40
Add readme notices with link to docs site ( #2300 )
...
* add readme notices
* remove period after url
5 years ago
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>
5 years ago
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
fac773ac99
Add SPX license identifier ( #2235 )
...
(cherry picked from commit 56de324afe
5 years ago
d3ef93a9a5
Deprecate SafeERC20.safeApprove ( #2268 )
...
* Deprecate SafeERC20.safeApprove
* Add changelog entry
5 years ago
52f7b6e03b
Remove TokenVesting reference from Timelock docs ( #2262 )
5 years ago
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?
5 years ago
56de324afe
Add SPX license identifier ( #2235 )
5 years ago
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>
5 years ago
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>
5 years ago
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
5 years ago
4ca719bf8b
Fix typo
5 years ago
b734bf3fa5
Tweak wording in ERC20Snapshot docs
5 years ago
3b10205c8e
Improve ERC20Snapshot documentation ( #2186 )
...
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
5 years ago
885378e421
Fix some of the code formatting in docs
5 years ago
96a7113a16
Fix broken links
5 years ago
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>
5 years ago
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>
5 years ago
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
5 years ago
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>
5 years ago
baaadde3c5
Remove ERC20._burnFrom ( #2119 )
...
* Remove ERC20._burnFrom
* Add changelog entry
5 years ago
7acd60d152
Add notice about deprecated Crowdsales ( #2116 )
...
* Remove crowdsales from sidebar documentation, add links to old version
* Remove mentions of Crowdsales from the documentation
5 years ago
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
5 years ago
5f1d8e19da
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>
(cherry picked from commit d864228624
5 years ago
bd51db5bf0
Syncing naming of value and amount. ( #1895 )
...
(cherry picked from commit 5d183d0efe
5 years ago
54ee1c7ff5
Fixing really minor typo ( #1911 )
5 years ago
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>
6 years ago
5d183d0efe
Syncing naming of value and amount. ( #1895 )
6 years ago
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
6 years ago
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 👍
6 years ago
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
6 years ago
90831c8970
Squash merge of branch docs-v2.x into master
6 years ago
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 84f85a41
6 years ago
Hadrien Croubois
Francisco Giordano
Andre Korol
Nicolás Venturo
soham
Ross Campbell
Andrew B Coathup
sunhurts
Julian M. Rodriguez
Elena Gesheva
tincho
Mitar
~Luiserebii~
Dinslinger90
Aram Elchyan