a99b9da3d4
Automate build step ( #1551 )
...
* remove note that was fixed in #1526
* add build script
* add prepack script
* remove custom compilation steps
2018-12-12 15:36:00 -03:00
7142e25e78
Add back WhitelistedCrowdsale ( #1525 )
...
* Added WhitelisterRole.
* Added WhitelisteeRole and WhitelistedCrowdsale.
* Added WhitelistedCrowdsale tests.
* Whitelisters can now remove Whitelistees.
* PublicRole.behavior now supports a manager account, added Whitelistee tests.
* Rephrased tests, added test for whitelistees doing invalid purchases.
* Fixed linter error.
* Fixed typos
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Working around JS quirks
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Update PublicRole.behavior.js
* Renamed WhitelisteeRole to WhitelistedRole.
* Renamed WhitelistedCrowdsale to WhitelistCrowdsale.
* Now using the new test helper.
* Added basic documentation.
2018-12-12 14:46:07 -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
357fded2b5
Refundable post delivery crowdsale ( #1543 )
...
* Fixed unnecessary dependency of RefundableCrowdsaleImpl on ERC20Mintable.
* Added PostDeliveryRefundableCrowdsale.
* Renamed to RefundablePostDeliveryCrowdsale.
* Added deprecation warning.
2018-12-11 18:07:24 -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
70fd243e3b
Test setup helper added ( #1482 )
...
* 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 #1205
* minor change
* suggested changes
* reviewed changes
* final update
2018-12-07 13:32:48 -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
b7d56d5471
Added explicity pify dep, deprecating web3.eth. ( #1532 )
...
* Added explicity pify dep, deprecating web3.eth.
* Dropped promisify in favor of pify.
2018-12-03 19:15:30 -03:00
41c540fb1e
Update to ganache-cli@6.1.8 ( #1535 )
2018-12-03 18:07:37 -03:00
e7d6e86395
Make Truffle provider creation lazy ( #1526 )
...
* make provider creation lazy
* change getter for function
* remove unused networks from truffle config
* remove unused dotenv package
* remove truffle-hdwallet-provider dependency
* install ethereumjs-util
* replace sha3 with keccak256 for ethereumjs-util v6
2018-12-02 00:09:58 -03:00
c0bda4db88
Updated sendTransaction, added tests. ( #1528 )
...
* Renamed sendTransaction to send, improved API.
* Added send tests.
* Now using promisified web3
2018-12-01 02:47:32 -03:00
88e8c7c94b
Updated eslint-mocha-no-only. ( #1533 )
2018-12-01 01:43:25 -03:00
9faebb5365
Added makeInterfaceId tests. ( #1530 )
2018-11-29 23:10:03 -03:00
714ab21a6e
Added mocha-no-only ESlint plugin. ( #1529 )
2018-11-29 19:10:43 -03:00
8dae261d20
Deleted transactionMined (unused). ( #1527 )
2018-11-29 19:09:36 -03:00
6fd0010325
Moved advanceBlock to time. ( #1523 )
...
* Added advanceBlock to time, moved tests around.
* Removed the standalone advanceBlock.
* Removed the 'id' field
* Fixed linter error.
* Removed the 'latest' test, since it only works if time hasn't been fast-forwarded.
* Removed .only directive.
2018-11-29 18:23:20 -03:00
7ef2730506
Approval events on transferFrom and burnFrom ( #1524 )
...
* transferFrom now emits an Approval event, indicating the updated allowance.
* Updated burnFrom to also emit Approval.
* Added notices about the extra Approval events.
2018-11-29 12:06:47 -03:00
6407d7818d
Added time helper tests. ( #1521 )
...
* Added time tests.
* Minor improvements.
2018-11-27 19:21:08 -03:00
c2de8ffd14
Now testing events in constructors! ( #1511 )
...
* Added inTransaction tests.
* Added expectEvent.inConstructor.
* Changed inTransaction, removed decodeLogs.
* Flipped comparison to improve the error message.
* Improved expectEvent tests.
* Migrated tests to use expectEvent.
* Added roles constructor tests.
* Fixed linter errors.
* Made lodash a dev dependency.
* Added more inLogs tests.
* Update expectEvent.test.js
* Removed lodash.
* Moved role constructor tests to public role behavior.
* Revert "Flipped comparison to improve the error message."
This reverts commit 438c57833d
2018-11-27 17:56:26 -03:00
f0e12d5301
ether and shouldFail tests ( #1513 )
...
* Added ether tests.
* Added shouldFail base function and tests.
* Updated test descriptions.
* Reduced gas limit on out-of-gas tests.
2018-11-27 17:20:21 -03:00
21ed6bee25
Travis migration ( #1517 )
...
* Rolled back Travis stages
* Rolled back the rolled-back changes.
* Renamed jobs, coverage can no longer fail.
* Cleaned up the yaml file a bit.
* Updated coveralls badge.
2018-11-26 17:41:38 -03:00
b9793abec6
balanceDifference tests and application ( #1514 )
...
* Added balanceDifference tests.
* Added balanceDifference tests.
* Now using balanceDifference in all (most) tests.
* Fixed typo.
2018-11-26 15:41:39 -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
281338409b
Test description fix in ERC20Pausable.test.js ( #1501 )
...
Small change in test description, should be "allows to approve..." instead of "allow to transfer..." in approve section, where test actualy try to approve, not to transfer.
2018-11-22 12:01:17 -03:00
a833c4b4ee
Merge branch 'release-v2.0.0'
2018-11-20 16:28:52 -03:00
bb6a24e6aa
Renamed roles private variables to adhere to code style. ( #1507 )
2018-11-20 16:03:22 -03:00
83bc045a56
Remove extraneous quantity check, fixes #1454 ( #1455 )
2018-11-02 07:16:35 -03:00
6363a776f7
Remove redundant require statements ( #1409 )
...
* Remove redundant require statements
Now that SafeMath uses require, the require statements are redundant. They were also previously inconsistent because they were only included in some functions, but not others
* Update ERC20.sol
2018-11-02 07:14:06 -03:00
f72c79d54a
Add the step to delete the build dir to the RELEASE notes ( #1467 )
2018-11-02 06:59:05 -03:00
32bc7a6fe5
add an address typecast to this per issue #1457 ( #1471 )
2018-11-02 06:56:50 -03:00
1186520617
add improvement in simpletoken example #1458 ( #1473 )
...
* add improvement in simpletoken example #1458
* fix not calling decimals get function in initial supply
2018-11-01 16:16:21 -03:00
b5892a2b5e
SafeMath Test Coverage Improved ( #1477 )
...
* 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 #1386
* Update SafeMath.test.js
2018-11-01 16:02:36 -03:00
4f356e35a9
The beneficiary parameter of claimRefund is replaced with refundee ( #1481 )
...
* 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 #1456
2018-11-01 15:38:54 -03:00
79eb94d3cd
fix ERC20.sol#L174 and ERC20.sol#L187 should be casted to an address type. ( #1470 )
2018-11-01 15:27:51 -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
06e265b38d
Release v2.0.0
2018-10-21 15:33:49 +00:00
7789814606
Release candidate v2.0.0-rc.4
2018-10-21 00:54:34 +00:00
643ac86d0a
Improved some ERC721 internal shenanigans ( #1450 )
...
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.
* Added approval information.
(cherry picked from commit 8204f6a71f
2018-10-20 22:15:00 +00:00
ae339333d7
Add warning about trading tokens before refundable crowdsale goal is met ( #1452 )
...
This attack was reported in https://github.com/OpenZeppelin/openzeppelin-solidity/issues/877
(cherry picked from commit 80458ebc72
2018-10-20 22:13:08 +00:00
1a4009f817
Crowdsale.buyTokens is now nonReentrant. ( #1438 )
...
(cherry picked from commit 6d415c508b
2018-10-20 22:13:02 +00:00
ecae7608f9
InitialRate must be strictly larger than finalRate. ( #1441 )
...
(cherry picked from commit a936cbf5fb
2018-10-20 22:12:55 +00:00
47b5d61844
Fixed how allowance crowdsale checks remaining tokens. ( #1449 )
...
(cherry picked from commit 1ac1ac984e
2018-10-20 22:12:48 +00:00
984fe23a46
Deleted unnecessary import. ( #1437 )
...
* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
(cherry picked from commit bbe804a14b
2018-10-20 22:09:30 +00:00
5cdf4de1f6
Made SampleCrowdsale a bit clearer. ( #1448 )
2018-10-20 22:09:22 +00:00
a9bffb3787
Now setting the finalized flag before doing finalization to prevent possbile reentrancy issues. ( #1447 )
...
(cherry picked from commit 5bb865218f
2018-10-20 22:09:12 +00:00
6e53c4e129
Crowdsale docs improvements. ( #1446 )
...
* Added a small Crowdsale fallback gas warning.
* Fixed a couple typos.
(cherry picked from commit 94692acb14
2018-10-20 22:09:04 +00:00
95411da289
Renamed internal ERC721 check function. ( #1445 )
...
(cherry picked from commit 384dff9abe
2018-10-20 22:08:49 +00:00
e237530538
Made tokenURI external, as per the spec. ( #1444 )
...
(cherry picked from commit 5bf3907862
2018-10-20 22:08:40 +00:00
0ead40ae03
ERC20Capped now capps _all_ minting, even internal calls. ( #1443 )
...
(cherry picked from commit c8220aeea8
2018-10-20 22:08:34 +00:00
2e848e12d1
IncPriceCrowdsale consistently returns 0 outside of the crowdsale window. ( #1442 )
...
(cherry picked from commit 9155bfe27f
2018-10-20 22:08:27 +00:00
