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
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
10a5864fdf
First test helpers tests ( #1369 )
...
* Removed unused advanceToBlock.
* Added advanceBlock tests.
* Fixed advanceToBlock tests.
* Added single argument tests.
* Finished inLogs tests.
* Fixed linter errors.
* Fixed linter errors.
(cherry picked from commit 9f822906b8
2018-10-20 21:59:32 +00:00
7ec6079784
Fix typo in ARCHITECTURE.md ( #1406 )
...
(cherry picked from commit eb92fd1f48
2018-10-20 21:57:17 +00:00
3266de1b5c
Non-constructor initialization removed ( #1403 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1391
(cherry picked from commit da67e435b1
2018-10-20 21:56:18 +00:00
109eba9273
Replaces amount with value for consistency ( #1378 )
...
* fixes #1372
* done in ERC20Capped and ERC20Mintable
(cherry picked from commit fd4de77651
2018-10-20 21:32:45 +00:00
62ed8e2fe4
Removed BreakInvariantBounty. ( #1424 )
...
(cherry picked from commit 9be0f100c4
2018-10-20 21:20:57 +00:00
e7aa8dedbc
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
(cherry picked from commit 9b37104655
2018-10-20 21:07:49 +00:00
f8b0cec15b
Add unit test specific to Address utils ( #1251 ) ( #1316 )
...
(cherry picked from commit 7825caa1fd
2018-10-20 20:57:15 +00:00
7ea34d9e97
Update ERC20.sol ( #1313 )
...
correct typo in doc
(cherry picked from commit b644c72eb0
2018-10-20 20:56:34 +00:00
a811a0be28
Improves Ownable events ( #1397 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1392
* event tests added
* constructor event added
(cherry picked from commit af42c39e6c
2018-10-18 19:03:56 -03:00
9c76d28245
Added a constructor to BreakInvariantBounty. ( #1395 )
...
(cherry picked from commit 3acc2b4216
2018-10-18 19:02:57 -03:00
8d6250cd5a
Add Arrays library with unit tests ( #1209 ) ( #1375 )
...
* Add Arrays library with unit tests (#1209 )
* prepared due to snapshot token requirements
* add library with method to find upper bound
* add unit test for basic and edge cases
* Imporove documentation for Arrays library
Simplify Arrays.test.js to use short arrays as test date
* Added comment for uint256 mid variable.
* Explaned why uint256 mid variable calculated as Math.average is safe to use as index of array.
(cherry picked from commit f7e53d90fa
2018-10-18 19:02:50 -03:00
66bad4ff2a
Removed selfdestruct from BreakInvariantBounty ( #1385 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1384
* introduced claimable and cancelBounty
* cancelBounty tests
* Update BreakInvariantBounty.test.js
(cherry picked from commit 41f84f8b40
2018-10-18 19:02:42 -03:00
41e74dd8d8
Removed old, unused mocks. ( #1382 )
...
(cherry picked from commit b17de011dc
2018-10-18 18:53:09 -03:00
0db1f8144d
Removed unnecessary Secondary inheritance from RefundEscrow. ( #1381 )
...
(cherry picked from commit 308e5e9cc0
2018-10-04 11:15:53 -03:00
ffeae0d83e
ERC20 internal transfer method ( #1370 )
...
(cherry picked from commit 43ebb4fc43
2018-10-04 11:14:05 -03:00
38ca422170
Removing unrequired _burn() override ( #1373 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1371
* Removed extra whitespace
(cherry picked from commit f3888bb0b0
2018-10-04 11:13:05 -03:00
7c984968d8
Prevents Bounty from being claimed twice ( #1374 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1356
* Removed extra semicolon.
(cherry picked from commit c87433e0c2
2018-10-04 11:12:45 -03:00
