Commits · 21ed6bee256a3ce5057d8233f5649b9ab16dc7c4 · 俞永鹏 / openzeppelin-contracts-upgradeable

26 Nov, 2018 2 commits

* 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.

authored Nov 26, 2018

21ed6bee Browse Files

balanceDifference tests and application (#1514) · b9793abe

* Added balanceDifference tests.

* Added balanceDifference tests.

* Now using balanceDifference in all (most) tests.

* Fixed typo.

authored Nov 26, 2018

b9793abe Browse Files

22 Nov, 2018 2 commits

Updated code style to 4 space indentation and 120 characters per line. (#1508) · 5471fc80

* 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>

authored Nov 22, 2018

5471fc80 Browse Files

Test description fix in ERC20Pausable.test.js (#1501) · 28133840

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.

authored Nov 22, 2018

28133840 Browse Files

20 Nov, 2018 2 commits
- Merge branch 'release-v2.0.0' · a833c4b4
  Francisco Giordano authored Nov 20, 2018
  
  a833c4b4 Browse Files
- Renamed roles private variables to adhere to code style. (#1507) · bb6a24e6
  Nicolás Venturo authored Nov 20, 2018
  
  bb6a24e6 Browse Files
02 Nov, 2018 4 commits
- Remove extraneous quantity check, fixes #1454 (#1455) · 83bc045a
  William Entriken authored Nov 02, 2018
  
  83bc045a Browse Files
- Remove redundant require statements (#1409) · 6363a776
```
* 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
```
  Brendan Chou authored Nov 02, 2018
  6363a776 Browse Files
- Add the step to delete the build dir to the RELEASE notes (#1467) · f72c79d5
  Leo Arias authored Nov 02, 2018
  
  f72c79d5 Browse Files
- add an address typecast to this per issue #1457 (#1471) · 32bc7a6f
  Hao (Alan) Tang authored Nov 02, 2018
  
  32bc7a6f Browse Files
01 Nov, 2018 5 commits

add improvement in simpletoken example #1458 (#1473) · 11865206
```
* add improvement in simpletoken example #1458

* fix not calling decimals get function in initial supply
```
LaimeJesus authored Nov 01, 2018
11865206 Browse Files

SafeMath Test Coverage Improved (#1477) · b5892a2b

* signing prefix added

* Minor improvement

* Tests changed

* Successfully tested

* Minor improvements

* Minor improvements

* Revert "Dangling commas are now required. (#1359)"

This reverts commit a6889776.

* updates

* fixes #1404

* approve failing test

* suggested changes done

* ISafeERC20 removed

* conflict fixes

* fixes #1386

* Update SafeMath.test.js

authored Nov 02, 2018

b5892a2b Browse Files

The beneficiary parameter of claimRefund is replaced with refundee (#1481) · 4f356e35

* signing prefix added

* Minor improvement

* Tests changed

* Successfully tested

* Minor improvements

* Minor improvements

* Revert "Dangling commas are now required. (#1359)"

This reverts commit a6889776.

* updates

* fixes #1404

* approve failing test

* suggested changes done

* ISafeERC20 removed

* conflict fixes

* fixes #1456

authored Nov 02, 2018

4f356e35 Browse Files

fix ERC20.sol#L174 and ERC20.sol#L187 should be casted to an address type. (#1470) · 79eb94d3
Hao (Alan) Tang authored Nov 01, 2018

79eb94d3 Browse Files
Fix/add comment erc721 burnable #1464 (#1469) · 18552a8d
```
* fix Add a comment to ERC721Enumerable #1465

* fix Add comments to ERC721Burnable #1464
```
Hao (Alan) Tang authored Nov 01, 2018
18552a8d Browse Files

21 Oct, 2018 2 commits
- Release v2.0.0 · 06e265b3
  Leo Arias authored Oct 21, 2018
  
  06e265b3 Browse Files
- Release candidate v2.0.0-rc.4 · 77898146
  Leo Arias authored Oct 21, 2018
  
  77898146 Browse Files
20 Oct, 2018 23 commits
- Improved some ERC721 internal shenanigans (#1450) · 643ac86d
```
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.

* Added approval information.

(cherry picked from commit 8204f6a7)
```
  Nicolás Venturo authored Oct 18, 2018
  643ac86d Browse Files
- Add warning about trading tokens before refundable crowdsale goal is met (#1452) · ae339333
```
This attack was reported in https://github.com/OpenZeppelin/openzeppelin-solidity/issues/877

(cherry picked from commit 80458ebc)
```
  Leo Arias authored Oct 19, 2018
  ae339333 Browse Files
- Crowdsale.buyTokens is now nonReentrant. (#1438) · 1a4009f8
```
(cherry picked from commit 6d415c50)
```
  Nicolás Venturo authored Oct 19, 2018
  1a4009f8 Browse Files
- InitialRate must be strictly larger than finalRate. (#1441) · ecae7608
```
(cherry picked from commit a936cbf5)
```
  Nicolás Venturo authored Oct 19, 2018
  ecae7608 Browse Files
- Fixed how allowance crowdsale checks remaining tokens. (#1449) · 47b5d618
```
(cherry picked from commit 1ac1ac98)
```
  Nicolás Venturo authored Oct 19, 2018
  47b5d618 Browse Files
- Deleted unnecessary import. (#1437) · 984fe23a
```
* Deleted unnecessary import.

* Added back SafeMath.

* Removed another unnecessary import.

(cherry picked from commit bbe804a1)
```
  Nicolás Venturo authored Oct 18, 2018
  984fe23a Browse Files
- Made SampleCrowdsale a bit clearer. (#1448) · 5cdf4de1
  Nicolás Venturo authored Oct 18, 2018
  
  5cdf4de1 Browse Files
- Now setting the finalized flag before doing finalization to prevent possbile… · a9bffb37
```
Now setting the finalized flag before doing finalization to prevent possbile reentrancy issues. (#1447)


(cherry picked from commit 5bb86521)
```
  Nicolás Venturo authored Oct 18, 2018
  a9bffb37 Browse Files
- Crowdsale docs improvements. (#1446) · 6e53c4e1
```
* Added a small Crowdsale fallback gas warning.

* Fixed a couple typos.

(cherry picked from commit 94692acb)
```
  Nicolás Venturo authored Oct 18, 2018
  6e53c4e1 Browse Files
- Renamed internal ERC721 check function. (#1445) · 95411da2
```
(cherry picked from commit 384dff9a)
```
  Nicolás Venturo authored Oct 18, 2018
  95411da2 Browse Files
- Made tokenURI external, as per the spec. (#1444) · e2375305
```
(cherry picked from commit 5bf39078)
```
  Nicolás Venturo authored Oct 18, 2018
  e2375305 Browse Files
- ERC20Capped now capps _all_ minting, even internal calls. (#1443) · 0ead40ae
```
(cherry picked from commit c8220aee)
```
  Nicolás Venturo authored Oct 18, 2018
  0ead40ae Browse Files
- IncPriceCrowdsale consistently returns 0 outside of the crowdsale window. (#1442) · 2e848e12
```
(cherry picked from commit 9155bfe2)
```
  Nicolás Venturo authored Oct 18, 2018
  2e848e12 Browse Files
- Closing time must be strictly after opening time. (#1440) · 6e055019
```
(cherry picked from commit 1c5f16ae)
```
  Nicolás Venturo authored Oct 18, 2018
  6e055019 Browse Files
- Internal crowdsales (#1439) · 5ee55c4a
```
* Made some internal crowdsale methods internal.

* Made all Crowdsale constructors internal.

(cherry picked from commit d9fdffe8)
```
  Nicolás Venturo authored Oct 18, 2018
  5ee55c4a Browse Files
- Improved SafeERC20 allowance handling (#1407) · 1b27b4bb
```
* signing prefix added

* Minor improvement

* Tests changed

* Successfully tested

* Minor improvements

* Minor improvements

* Revert "Dangling commas are now required. (#1359)"

This reverts commit a6889776.

* updates

* fixes #1404

* approve failing test

* suggested changes done

* ISafeERC20 removed

* allowance methods in library

* Improved SafeERC20 tests.

* Fixed test coverage.

(cherry picked from commit 315f426f)
```
  Aniket authored Oct 18, 2018
  1b27b4bb Browse Files
- TokenVesting improvements (#1431) · 4115686b
```
* 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 67dac7ae)
```
  Nicolás Venturo authored Oct 18, 2018
  4115686b Browse Files
- SplitPayment improvements (#1417) · 6db4f0bc
```
* 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 a0749979)
```
  cardmaniac992 authored Oct 18, 2018
  6db4f0bc Browse Files
- Added address of pauser/unpauser in events (#1410) · 5f3ecd9c
```
* Added address of pauser/unpauser in events

* Added the account to the Pausable tests.

(cherry picked from commit fcab9c89)
```
  Christopher Glisch authored Oct 18, 2018
  5f3ecd9c Browse Files
- Events added to Secondary (#1425) · c126e3e8
```
* Update contracts/ownership/Secondary.sol

* Update Secondary.sol

* Update Secondary.test.js

* Update Secondary.test.js

* Update Secondary.sol

(cherry picked from commit cbe41486)
```
  Aniket authored Oct 18, 2018
  c126e3e8 Browse Files
- Added leading underscore to internal functions, renamed supportsInterfaces. (#1435) · ab932e18
```
(cherry picked from commit 0231fac5)
```
  Nicolás Venturo authored Oct 18, 2018
  ab932e18 Browse Files
- Added replay attack notice to SignatureBouncer. (#1434) · 43941076
```
(cherry picked from commit ff0c048a)
```
  Nicolás Venturo authored Oct 18, 2018
  43941076 Browse Files
- Made some inherit-only contracts internal. (#1433) · 422b42bb
```
* Made some inherit-only contracts internal.

* Added OwnableMock.

(cherry picked from commit 96d6103e)
```
  Nicolás Venturo authored Oct 18, 2018
  422b42bb Browse Files