5b5d91c9d4
Remove 'external' functions ( #2162 )
...
* Remove _grantRole and _revokeRole, replace with _setupRole
* Make all external AccessControl functions public
* Remove Ownable._transferOwnership
* Rename ERC721's _safeTransferFrom and _transferFrom to _safeTransfer and _transfer
* Make all ERC721 external functions public
* Make all miscelaneous external functions public instead
* Add changelog entry
* Move calldata arguments to memory
* Update contracts/access/AccessControl.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Restrict setupRole to the constructor
* Replace isConstructor for !isContract
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-04-02 15:29:58 -03:00
24c37c1f9e
Bundle ERC721 extensions into base contract ( #2149 )
...
* Add IERC721Metadata implementation into ERC721
* Add IERC721Enumerable into ERC721
* Update ERC721Pausable and ERC721Burnable
* Delete ERC721Metadata, ERC721Enumerable and ERC721 (now ERC721)
* Update mocks
* Update tests
* Update contracts/token/ERC721/ERC721.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Make ERC721Pausable and ERC721Burnable abstract
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2020-03-27 17:27:41 -03:00
a8d6f13c94
Remove all 'available since' notices
2020-03-16 20:44:56 -03:00
eb34ae67ff
Make IERC721 contracts interfaces instead ( #2113 )
...
* Make IERC721 contracts interfaces instead
* Bump minimum compiler version for IERC721
2020-03-16 18:21:16 -03:00
f1db30955d
Remove deprecated functions and contracts ( #2125 )
...
* Remove ERC721.burn(owner, tokenId)
* Remove ERC721._checkOnERC721Received from the contract's API
* Fix linter error
* Remove Escrow and PullPayment withdrawWithGas, replace for withdraw
* Add changelog entry
* Add reentrancy notice
2020-03-16 17:42:33 -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
3296ca7219
Rearrange erc721metadata layout to mimic eth-pkg ( #2098 )
...
In https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package/pull/76 , we are rearranging the erc721metadata contract storage layout, so the new variable is added at the end. This commit applies the same change to the vanilla contracts repository, so migration from 2.5 to 3.0 is easier for users using the transpiler.
2020-03-04 15:31:57 -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
88dc1ca6fc
Reorder functions to prevent shadowing warning
2020-01-24 14:56:17 -03:00
7d7cbcad14
Fix/improve revert reason #1727 ( #2018 )
...
* adding mock contacts, test code
* adding changes to ERC721.sol per @frangio's comments on original PR #1943
* fix solhint warnings
* Update contracts/token/ERC721/ERC721.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* same revert wording per @frangio's review suggestion
* per @frangio's feedback, changing the inline assembly to accomplish: we want to ignore the first 4 bytes of content, so we should read the length and decrease it by 4, then take the memory location and add 4 to it, then store the new length at the new memory location, then that is the new byte array that we want.
* change revert msg assembly per PR comment by @frangio
* unify revert msg in test code
* fix some failed tests, wording change
* Update contracts/token/ERC721/ERC721.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Update contracts/token/ERC721/ERC721.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* fix test case, revert without reason
* fix 'ERC721ReceiverRevertsMock: Transaction rejected by receiver'
* style change per review by @frangio
* fix revert reason forwarding
* remove duplicate contracts/mocks/ERC721ReceiverRevertsMock.sol per review https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2018\#issuecomment-574381034
* Add changelog entry
* Fix tests
* Make tests more clear
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com >
2020-01-23 16:33:09 -03:00
e493fb3e95
Add 'available since' notes. Fixes #2054
2020-01-23 15:26:25 -03:00
49042f2b1a
feat: add baseTokenURI to ERC721Metadata ( #1970 )
...
* feat: add baseTokenURI
* fix: tests
* chore: dev notation
* chore: changelog
* chore: typo
* Remove extra getters, return empty URI by default
* Update docs
* Rename baseTokenURI to baseURI
* Roll back visibility change of tokenURI
* Update changelog entry
* Version setBaseURI docs
* Improve internal names and comments
* Fix compilation errors
* Add an external getter for baseURI
2019-11-15 20:22:37 -03:00
f90700f3f1
add detail to deprecation notice
2019-11-12 17:52:38 -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
377431bc4c
Fix/add erc721 safe mint safe transfer from #1736 ( #1816 )
...
* added _safeTransferFrom function
* added safeMint functions
* added package-lock.json for consistency, don't know why it changes
* added initial suggestions/modifications
* change _safeTransferFrom to internal, reverted package-lock.json to original, and changed ERC721Pausable to override _transferFrom instead of transferFrom
* included tests for safeMint functions
* modified safeMint tests to be on ERC721Mock contract
* added safeMint to ERC721Mintable & respective test to ERC721MintBurn.behavior.js
2019-07-29 12:16:55 -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
cdccf5ed21
add missing hex digit
...
fixes #1814
2019-07-08 16:27:11 -03:00
852e11c2db
New guides ( #1792 )
...
* Improved tokens guide, add ERC777.
* Fix typo.
* Add release schedule and api stability.
* Add erc20 supply guide.
* Revamp get started
* Add Solidity version to examples
* Update access control guide.
* Add small disclaimer to blog guides
* Update tokens guide.
* Update docs/access-control.md
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Update docs/access-control.md
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Update docs/access-control.md
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Apply suggestions from code review
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Apply suggestions from code review
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com >
* Documentation: Typos and add npm init -y to setup instructions (#1793 )
* Fix typos in GameItem ERC721 sample contract
* Add npm init -y to create package.json
* Address review comments.
2019-06-24 17:16:50 -03:00
2f9ae975c8
merge api docs changes
...
Squashed commit of the following:
commit 06243c3e8e86074ff8e9e3f22b7829a2c315d707
Merge: 991882ec 99373558
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 18:15:37 2019 -0300
Merge branch 'api-docs' into api-docs-merge
commit 991882eca5bb8a3391995154bfb9d53d8a69cb4f
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 18:08:02 2019 -0300
manually apply docs changes and renamings
commit fa1f6e97dd67a76c3cd828d0a5e19b4ac6c37acb
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 17:36:03 2019 -0300
move functions to new order
commit 99373558e3af4905d29bc6f3f542ba93d28a24ab
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 16:23:40 2019 -0300
add missing docs links
commit d180d6c36a6f5460e85473ee5a18992d1449a6ff
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 16:14:12 2019 -0300
update solidity-docgen dependency
fixes uri encoded links
commit faab0e50da91cd2f0a409e3ad32e2db127ad319a
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 16:05:03 2019 -0300
update openzeppelin-docsite and solidity-docgen dependencies
add visibility specifiers
commit ef305268bb2735e488e35d16819a4b432b3a35e3
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Thu May 23 15:36:45 2019 -0300
Fix guide links.
commit 339b20dbfa2d5f6ea02e63c2f3fdcba0fe879c3c
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Thu May 23 13:37:51 2019 -0300
Fix typos.
commit 6c7b97460578b9eea90b53c280454e361f8f0052
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 15:26:29 2019 -0300
fix utilities guide links
commit 0e7692a8fd8516a11becc4121d77d792439600b1
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 15:23:19 2019 -0300
update solidity-docgen dependency
commit ebb8a8651516ece21736c6c3b2577eb1b3487651
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 15:15:01 2019 -0300
fix utilities guide links
commit 5ec47d62785e1d6e5f8e91edca58f2dc7f87d7a3
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 15:14:49 2019 -0300
fix escrow docs ordering
commit cdcdc909b16f219a9a3272036b6a8f21e34b48ef
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 13:35:07 2019 -0300
add wip notice
commit 987e2951ae93211c8c70c8288e30573555c57830
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 13:09:35 2019 -0300
update openzeppelin-docsite dependency
fixes links to old versions
commit b00d22c0affac2e2108df8b773dfa1706afcb44e
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 23 13:09:28 2019 -0300
fix guide links
commit f112a9400c5e5ad495c8e0fdb972e26987b34244
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 20:42:37 2019 -0300
update docsite
commit 68aacdd56a29e35a84f6732f9293612bbcaf7520
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Wed May 22 20:00:39 2019 -0300
ERC20Capped
commit 4edce78bab2c6d140f3ea3f33db71e92ca4d8aaf
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Wed May 22 19:52:30 2019 -0300
Unnecessary polish on token docs.
commit 2a4c91cf49c2736dc09c1c03cf383911def1a1b2
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 19:20:05 2019 -0300
rename guides
commit 61dd818ea76d4c170c4ab175c6be0d6067d21a29
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Wed May 22 17:04:09 2019 -0300
ERC1820 docs.
commit 77b5f0353123b76358dc6d86bdc646c86c9b0bea
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Wed May 22 16:17:34 2019 -0300
Introspection and ERC165.
commit 76641a253b3b70279802c5134dd107532eea4b2c
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 17:59:53 2019 -0300
update docgen
commit 7be98bc3fbd3566231f943f01b9acb58567d755b
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 17:23:50 2019 -0300
update solidity-docgen
commit f7268e6e010f8ef9ac83df241a803f91efc08c0c
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 16:58:31 2019 -0300
update docgen
commit 2a8c7a378e8962a5baeb334b2492815f05075f98
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Wed May 22 14:36:35 2019 -0300
Util docs.
commit 327ae8ff45a1a523c7591bf4996c4a9b52d7ec7a
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 13:08:50 2019 -0300
add missing drafts
commit 5e7f71335ac8423c0e363ae8c7ad9b2977f202f8
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 12:47:41 2019 -0300
tweak ierc20 docs
commit cd0e86a0b712f74ffd406e072d4b1fbf4dd2c176
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 12:46:45 2019 -0300
add some erc721 docs
commit e081184159417f71da14bc0fc110b7b11e29d75d
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 12:41:46 2019 -0300
update docsite
commit 0beb75784022419d47123c2a9fe7a5f1eb87f9b2
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 12:22:27 2019 -0300
correct drafts structure
commit 2e94b287c7cead7a6c0603205670566461c31abb
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 11:56:25 2019 -0300
fix docsite-start script
commit 0fa4160484309d0851584fe57c0d81a3600977db
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 11:47:44 2019 -0300
improve docsite start script (automatically watch docgen)
commit 9d571897cc03bee92035964cf7a2cfeda1e2f690
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Wed May 22 11:30:37 2019 -0300
update solidity-docgen
commit 82980f5aefbdfb8a9815a3b7b0e88e970b65dd5d
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue May 21 19:15:13 2019 -0300
edit docs for Secondary
commit 00d7a005b0530bee730b77a1b69a95f1b4ffe315
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue May 21 19:15:13 2019 -0300
edit docs for ownable
commit b0c4c2bdf83eca5d4a71792daac603236733d46e
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue May 21 18:27:13 2019 -0300
change title of Math section
commit deb788583f191780e55b7f673520eaf13a5c7e23
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue May 21 18:26:59 2019 -0300
capitalization
commit f2bcf85d343ea4a0739fe22a77b1e22c2296ddea
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Tue May 21 18:26:06 2019 -0300
edit docs for Pausable
commit 73ba0cf43dbb44c39c1bf2ee63ef9fe558faa919
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Sat May 18 19:08:06 2019 -0300
Crypto docs.
commit 9d6fc6223f51cf2321b2e3217c512579654c3917
Merge: 7e21f8f7 9f1cec12
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Fri May 17 17:23:15 2019 -0300
Merge branch 'api-docs-777' into api-docs
commit 9f1cec12e3351fb1b5fc0b59f5ded39928064a56
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Fri May 17 17:22:54 2019 -0300
ERC777 done.
commit 7e21f8f7b6982d2f92df302cdf6ec62522d8ffff
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Fri May 17 16:39:47 2019 -0300
add math docs
commit f18d1f17023b6e5b42ae04fc38aa1170e6863864
Author: Nicolás Venturo <nicolas.venturo@gmail.com >
Date: Thu May 16 20:01:46 2019 -0300
First draft of ERC777 docs.
commit 985c5d3053nicolas.venturo@gmail.com >
Date: Thu May 16 19:14:32 2019 -0300
Final draft for IERC777.
commit bf53f133d987b67f938a329e6d659ba3483aab0b
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 16 19:13:37 2019 -0300
more work on ERC20 api docs
commit b7c250b7cbnicolas.venturo@gmail.com >
Date: Thu May 16 17:08:47 2019 -0300
Fix typo.
commit 197bbfbfc6nicolas.venturo@gmail.com >
Date: Thu May 16 17:05:14 2019 -0300
Initial draft of IERC777.
commit 7dc3b55161c860437a8f13a2ce5808b1c3dd70a2
Author: Francisco Giordano <frangio.1@gmail.com >
Date: Thu May 16 11:58:32 2019 -0300
add payment docs structure
commit da16fc4480nicolas.venturo@gmail.com >
Date: Thu May 16 16:05:33 2019 -0300
Initial ERC777 docstrings.
commit 9f6a7e35bdfrangio.1@gmail.com >
Date: Wed May 15 22:13:17 2019 -0300
partial pass through ERC20 docs
2019-05-23 18:17:18 -03:00
67bca857ee
Revert Solidity version bump. ( #1729 )
2019-04-24 19:32:08 -03:00
2f8e844514
Fix remaining revert reasons.
2019-04-24 11:25:09 -03:00
3682c6575c
Added message string for require() ( #1704 )
...
* Error handling in ERC20 and ERC721
* Added message string for require.
* Fixed solhint errors.
* Updated PR as per issue #1709
* changes as per #1709 and openzeppelin forum.
* Changes in require statement
* Changes in require statement
* build pipeline fix
* Changes as per @nventuro's comment.
* Update revert reason strings.
* Fianal update of revert reason strings.
* WIP: Updating reason strings in test cases
* WIP: Added changes to ERC20 and ERC721
* Fixes linting errors in *.tes.js files
* Achieved 100% code coverage
* Updated the test cases with shouldFail.reverting.withMessage()
* Fix package-lock.
* address review comments
* fix linter issues
* fix remaining revert reasons
2019-04-24 11:17: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
0df0e1b250
Fixes/Improves constants inline documentation. ( #1707 )
...
* Fixes/Improves constants inline documentation.
* Fixed solhint error.
* Moved the comment before the variable
2019-04-17 16:38:33 -03:00
3cb4a00fce
Added basic punctuation to @dev docs ( #1697 ) ( #1700 )
...
* Added basic punctuation to @dev docs (#1697 )
* add missing uppercase
2019-03-30 16:48:17 -03:00
0dded493a0
Nonfunctional typos #1643 ( #1652 )
...
* Add IntelliJ IDE config to .gitignore
* Fix variable name in ERC20 function comments
* Fix typos in Arrays function comment
* Fix typos in ownership test names
* Fix typo in Pausable test name
* Fix grammar in Ownable function comment
* Fix grammar in Crowdsale contract comment
* Fix typo in Counters contract comment
* Fix typo in ERC721Enumerable comment
* Fix typo in ERC721PausedToken test name
* Fix typo in Crowdsale function comment
* Fix typo in IncreasingPriceCrowdsale function comment
* Fix grammar in IncreasingPriceCrowdsale test name
* Fix typo in AllowanceCrowdsale test name
* Fix typo in RefundEscrow function comment
* Fix typo in ERC20Migrator contract comment
* Fix typos in SignatureBouncer comments
* Fix typo in SignedSafeMath test name
* Fix typo in TokenVesting contract comment
* Move Ownable comment from @notice section to @dev
The Ownable contract has a comment explaining that renouncing
ownership will prevent execution of functions with the onlyOwner
modifier.
This commit moves that comment to the @dev section and replaces it
with a description suitable for a generic user.
* Clarify purpose of ERC20 transfer function
* Clarify registration of ERC721Enumerable interface
* Clarify purpose of AllowanceCrowdsale test
* Increase specificity of inheritance comments
FinalizableCrowdsale and RefundableCrowsale both have comments
indicating that they are extensions of the Crowdsale contract.
This commit refines those comments to the most immediate ancestor
( TimedCrowdsale and RefundableCrowdsale respectively )
* Remove unused parameter in PaymentSplitter test
* Rename parameter in SignatureBouncer functions
The SignatureBouncer contract has modifiers to validate the
message sender is authorised to perform an action. They pass
msg.sender to internal functions as the variable `account`, but
the function comments refer to the variable as `sender`
This commit changes the variable name to `sender`
* Clarify comments in SignatureBouncer functions
The SignatureBouncer has comments that use the description
`sender` to refer to the variable `account`.
This commit updates the comments for consistency.
Maintainer Note: this reverts changes in the previous commit,
which renamed the variable `account` instead.
2019-02-28 11:46:13 -03:00
2fc0aaabb3
Use canonical EIP reference format
2019-02-24 11:52:22 -05:00
99a07493f2
Update to preferred citation formation for ERC-721
2019-02-23 16:56:47 -05:00
1fd993bc01
Unify code comments style. ( #1603 )
...
* Updated code style to no more than120 characters per line.
* Unify code comments style with Doxygen-style tags.
2019-01-25 13:16:40 -03:00
07603d5875
Remove unnecessary SafeMath call ( #1610 )
...
* Refactor Counter to support increment and decrement.
* Move Counter out of drafts.
* Refactor ERC721 to use Counter.
* Rollback Counter returning the current value in increment and decrement.
* Update test/drafts/Counter.test.js
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Improve Counter documentation.
* Move Counter.test to utils.
* Move back Counter to drafts.
2019-01-21 17:24:51 -03:00
b7d60f2f9a
Fix warnings ( #1606 )
...
* Bump required compiler version to 0.5.2.
* Fix shadowed variable warning in ERC20Migrator.
* Rename Counter to Counters.
* Add dummy state variable to SafeERC20Helper.
* Update changelog entry.
* Fix CountersImpl name.
* Improve changelog entry.
2019-01-17 15:59:30 -03:00
76abd1a41e
Replaced Solium in favor of Solhint ( #1575 )
...
* Adding solhint, working on style fixes.
* Upgraded to solhint 1.5.0.
* Removed all references to Solium
* Updated mocks to make the pass the new linter rules.
* Reformatted the .solhint.json file a bit.
* Removed Solium configuration files.
* Remove Solium dependency.
* Add comment explaing disabled time rule in TokenVesting.
* Revert to the old (ugly?) style.
* Revert SignatureBouncerMock style.
* Fix ERC165InterfacesSupported interface.
2019-01-04 17:01:52 -03:00
be5ed7364b
Release v2.1.0 solc 0.5.x ( #1568 )
...
* Now compiling in a separate directory using truffle 5.
* Ported to 0.5.1, now compiling using 0.5.1.
* test now also compiles using the truffle 5 hack.
* Downgraded to 0.5.0.
* Sorted scripts.
* Cleaned up the compile script a bit.
2018-12-20 12:26:43 -03:00
12533bcb2b
ERC721 bugfix + gas optimizations ( #1549 )
...
* Now only swapping when needed.
* Removed _addTokenTo and _removeTokenFrom
* Removed removeTokenFrom test.
* Added tests for ERC721 _mint and _burn
* _burn now uses the same swap and pop mechanism as _removeFromOwner
* Gas optimization on burn
2018-12-12 18:51:43 -03:00
dd2e947976
Deprecated ERC721._burn(address, uint256) ( #1550 )
...
* Deprecated ERC721._burn(address, uint256)
* Added missing natspec comment.
2018-12-11 18:07:59 -03:00
70e616db7c
Optimized ERC721 transfers. ( #1539 )
...
* Added _transferToken.
* _transferFrom is now usable by derived contracts, abstracted away enumerable behavior.
* Removed unnecesary check from _clearApprovals
2018-12-11 12:51:26 -03:00
5caecf548c
getter added for an array of tokens held by an owner ( #1522 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1404
* approve failing test
* suggested changes done
* ISafeERC20 removed
* conflict fixes
* fixes #1512
* Update test/token/ERC721/ERC721Full.test.js
Co-Authored-By: Aniket-Engg <30843294+Aniket-Engg@users.noreply.github.com >
2018-12-05 17:45:27 -03:00
5471fc808a
Updated code style to 4 space indentation and 120 characters per line. ( #1508 )
...
* Updated code style to 4 spaces and 120 max characters per line.
* Update contracts/token/ERC721/ERC721Pausable.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Update contracts/token/ERC721/IERC721.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
2018-11-22 16:53:30 -03:00
18552a8d5f
Fix/add comment erc721 burnable #1464 ( #1469 )
...
* fix Add a comment to ERC721Enumerable #1465
* fix Add comments to ERC721Burnable #1464
2018-11-01 15:15:04 -03:00
8204f6a71f
Improved some ERC721 internal shenanigans ( #1450 )
...
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.
* Added approval information.
2018-10-18 19:07:34 -03:00
384dff9abe
Renamed internal ERC721 check function. ( #1445 )
2018-10-18 16:56:58 -03:00
5bf3907862
Made tokenURI external, as per the spec. ( #1444 )
2018-10-18 16:49:46 -03:00
03765e08b9
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
2018-10-17 11:35:31 -03:00
744f567f40
Separate ERC721Mintable ( #1365 )
...
* separate part of ERC721Mintable into ERC721MetadataMintable
* remove mint and burn from 721 tests
* Fixed linter error.
* fix ERC721 mint tests
* Minor fixes.
2018-10-04 11:10:08 -03:00
5fdeaa81d5
Removed mintingFinished. ( #1351 )
...
* Removed mintingFinished from ERC20Mintable.
* Removed MintingFinished from ERC721Mintable.
* Removed MintingFinished event.
2018-09-26 16:05:43 -03:00
9b37104655
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
2018-09-19 19:59:13 -03:00
2ce1fde405
Fixed variable shadowing. ( #1310 )
2018-09-07 14:14:02 -03:00
4b33eaefa2
Improved ERC721 granularity ( #1304 )
...
* Split enumerable and metadata implementations.
* Renamed ERC721Basic to ERC721, and ERC721 to ERC721Full.
* Fixed linter errors.
2018-09-07 14:04:42 -03:00
fa49e5189d
Remove Minted and TokensBurned events ( #1305 )
...
* Remove the Minted event
* Remove the TokensBurned event
* Remove unused
2018-09-07 13:31:23 -03:00
