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
6e055019d4
Closing time must be strictly after opening time. ( #1440 )
...
(cherry picked from commit 1c5f16ae26
2018-10-20 22:08:18 +00:00
5ee55c4af3
Internal crowdsales ( #1439 )
...
* Made some internal crowdsale methods internal.
* Made all Crowdsale constructors internal.
(cherry picked from commit d9fdffe88e
2018-10-20 22:07:59 +00:00
1b27b4bb34
Improved SafeERC20 allowance handling ( #1407 )
...
* 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
* allowance methods in library
* Improved SafeERC20 tests.
* Fixed test coverage.
(cherry picked from commit 315f426f5c
2018-10-20 22:07:38 +00:00
4115686b4f
TokenVesting improvements ( #1431 )
...
* Improved TokenVesting events.
* Added extra checks to TokenVesting.
* Renamed the events.
* Fixed linter error.
* Fixed a test that failed to cover a require.
* Renamed TokensRevoked to TokenVestingRevoked.
(cherry picked from commit 67dac7ae99
2018-10-20 22:07:00 +00:00
6db4f0bc8f
SplitPayment improvements ( #1417 )
...
* Renamed file, added events and set _addPayee to private
* unwanted file
* adjusted test
* adjusted test
* PaymentReceived event added
* Added event testing.
* Fix static tests
(cherry picked from commit a07499796a
2018-10-20 22:06:40 +00:00
5f3ecd9c64
Added address of pauser/unpauser in events ( #1410 )
...
* Added address of pauser/unpauser in events
* Added the account to the Pausable tests.
(cherry picked from commit fcab9c89f2
2018-10-20 22:06:24 +00:00
c126e3e81a
Events added to Secondary ( #1425 )
...
* Update contracts/ownership/Secondary.sol
* Update Secondary.sol
* Update Secondary.test.js
* Update Secondary.test.js
* Update Secondary.sol
(cherry picked from commit cbe414864f
2018-10-20 22:06:10 +00:00
ab932e1873
Added leading underscore to internal functions, renamed supportsInterfaces. ( #1435 )
...
(cherry picked from commit 0231fac514
2018-10-20 22:05:51 +00:00
4394107660
Added replay attack notice to SignatureBouncer. ( #1434 )
...
(cherry picked from commit ff0c048ad9
2018-10-20 22:05:31 +00:00
422b42bb6a
Made some inherit-only contracts internal. ( #1433 )
...
* Made some inherit-only contracts internal.
* Added OwnableMock.
(cherry picked from commit 96d6103e0b
2018-10-20 22:05:15 +00:00
3b34436b44
Made some TokenVesting public functions private. ( #1427 )
...
* Made some TokenVesting public functions private.
* Fixed linter error.
(cherry picked from commit df3c113711
2018-10-20 22:05:01 +00:00
c5a8680a9c
Moved Escrows into an escrow subdirectory, improved docs. ( #1430 )
...
* Moved Escrows into an escrow subdirectory, improved docs.
* Fixed escrow mock.
* Fixed some more imports.
(cherry picked from commit f3df2dab3d
2018-10-20 22:04:33 +00:00
88f48be287
Removed default value assignments. ( #1432 )
...
(cherry picked from commit cfef58361f
2018-10-20 22:04:11 +00:00
26f9cc8e74
Moved some test files around to better reflect the directory layout. ( #1428 )
...
(cherry picked from commit d8ab8a00f2
2018-10-20 22:03:46 +00:00
56806bb295
Now using hex for asm memory addresses. ( #1429 )
...
(cherry picked from commit 2733cb4a41
2018-10-20 22:03:14 +00:00
1cf96ef0d1
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
(cherry picked from commit 03765e08b9
2018-10-20 22:02:36 +00:00
5d596fc786
Added Math.sol docstrings. ( #1423 )
...
(cherry picked from commit a3e312d133
2018-10-20 22:02:08 +00:00
2514959f34
Fixed a typo in a comment. ( #1422 )
...
(cherry picked from commit 3341dd8899
2018-10-20 22:01:54 +00:00
1b79b536cd
Roles.add and remove now require pre-conditions on the account. ( #1421 )
...
(cherry picked from commit 3bd30f7382
2018-10-20 22:01:22 +00:00
e990525c2e
RefundEscrow's events renamed ( #1418 )
...
* fixes #1414
(cherry picked from commit 844a96d0b9
2018-10-20 22:00:49 +00:00
2c40ffa011
Improve encapsulation on ERC165 and update code style guide ( #1379 )
...
* use prefix underscore for internal state variables
* make _supportedInterfaces private
(cherry picked from commit 03dfb2965c
2018-10-20 22:00:13 +00:00
