6d202894b6
Merge branch 'master'
2021-01-26 18:58:15 +01:00
3b4c951838
Fix ERC777 potential reentrancy issues ( #2483 )
2021-01-26 10:57:18 -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
90ed1af972
Support compiling with solc 0.7 ( #2408 )
2020-11-17 21:29:39 -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
56de324afe
Add SPX license identifier ( #2235 )
2020-05-14 21:58:11 -03:00
e156b617b9
Merge branch 'release-v2.5.0'
2020-04-24 16:04:40 -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
e7b22483af
Make ERC777 operator the caller ( #2134 )
...
* Make the sender the operator
* Make hook methods private
* Add changelog entry
2020-03-16 19:49:17 -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
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
c794c96617
Move ERC1820 and ERC777 out of drafts ( #1742 )
...
* Moved ERC1820 related contracts out of drafts and into introspection.
* Moved ERC777 related contracts out of drafts and into token.
2019-05-08 16:11:00 -03:00
376820d55c
Hardcode ERC777 granularity to 1, remove tests. ( #1739 )
...
* Hardcode ERC777 granularity to 1, remove tests.
* Add clarifying title comment.
2019-05-07 17:05:12 -03:00
67bca857ee
Revert Solidity version bump. ( #1729 )
2019-04-24 19:32:08 -03:00
19c7414052
Bump minimum Solidity version to 0.5.7 ( #1724 )
...
* Bump Solidity version to 0.5.7
* Add changelog entry.
2019-04-23 16:18:08 -03:00
5a2b349992
Feature/erc777 #1159 ( #1684 )
...
* IERC777 from specs, constants returned, up to defaultOperators. (#1159 )
* IERC777 oprarator approvals (#1159 )
* ERC777 oprarator approvals fixes and tests
* IERC777 send and receive with ERC820 (#1159 )
* ERC777 Add burn functions and fix send functions (#1159 )
* ERC777 Make expectEvent compatible with web3.js 1.0 (#1159 )
* ERC777 Add ERC820 deploy script (#1159 )
* ERC777 Complete implementation of ERC777 (#1159 )
This implementation conforms to the current EIP
* ERC777 Update ERC820 Registry contract to final version (#1159 )
* ERC777 Move contracts to 'drafts' folder (#1159 )
* ERC777: Update to ERC1820 registry and linter error fix (#1159 )
* ERC777: implement recent changes of EIP777 (#1159 )
* ERC777 Fix formatting (#1159 )
* ERC777 Update to solc 0.5.2 (#1159 )
* ERC777 Fix travis CI errors (#1159 )
* ERC777 Fix linter errors again... (#1159 )
* ERC777 Fix unit test (#1159 )
* ERC777 Fix unit test again (#1159 )
* Remove extra newlines.
* Rename ERC777Base to ERC777.
* Remove 'Token' from contract names.
* Replace ops for operators.
* Move operator check out of _send.
* Remove ERC777Burnable.
* Remove ERC1820Client, now using the interface directly.
* Minor internal refactors in contracts.
* Delete extra test helpers.
* Simplified tests.
* Add basic 777 tests.
* Add granularity send test.
* Add first operator send tests.
* Add burn tests.
* Refactor send and burn tests.
* Improve send burn refactor.
* Greatly improve test module.
* Burn instead of send removed tokens.
* Add operator tests.
* Improve send tests under changing operators.
* Refactor and merge send and burn tests.
* Add missing and not-implemented tests.
* Make _burn private.
* Fix typo.
* Greatly improve tokensToSend tests.
* Refactor hook tests.
* Fix hook tests.
* Update openzeppelin-test-helpers and ERC1820 address.
* Fix natspec indentation.
* Make interface functions external.
* Remove redundant private revoke and authorize functions.
* Improved readability of if statement.
* Remove unnecessary asserts.
* Add non-one granularity test.
* Fix hook call order in _mint.
* Fix _mint not reverting on failure to implement tokensReceived.
* Remove special case in operatorFn when from is 0.
* Refactor ERC777SenderMock.
* Add tokensReceived tests.
* switch to updated ganache-cli-coverage fork
* Fix linter errors.
* Add mint tests.
* Fix linter errors.
* Fix tests.
* Update test/drafts/ERC777/ERC777.test.js
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Add changelog entry.
2019-04-16 13:13:46 -03:00
