Commit Graph

1337 Commits

Author SHA1 Message Date
41e6b2e992 Make ERC721.exists internal (#1193)
* Made ERC721.exists internal.

* Removed exists ERC165 identifiers
2018-08-13 16:07:27 -03:00
f00fce53d7 switch to container-based travis run (#1199) 2018-08-13 08:34:36 -03:00
b52912c702 change dos file format to unix (#1198)
used dos2unix program
2018-08-13 06:39:00 -03:00
66c1968913 Changed SplitPayment require to assert. (#1188) 2018-08-12 15:34:37 -03:00
0e65947efb Release v1.12.0 v1.12.0 2018-08-10 19:09:13 -03:00
ac91af9a6a Replace all asserts with chai.should (#1183)
* Moving towards chai.should.

* Fixed failing tests.

* Fixed linter errors.

* Revert package-lock.json changes.

* Fixed failing tests.

* s/eq/equal

* Addressed review comment
2018-08-10 19:03:04 -03:00
a2e7103869 Improved SafeMath inline comments. 2018-08-10 17:34:34 -03:00
c9e91586e7 feat: use require in SafeMath (#1187)
* feat: use require in SafeMath

* fix: grammar with revert
2018-08-10 15:41:06 -03:00
6dab31288e change author to OpenZeppelin Community (#1173) 2018-08-08 18:11:22 -03:00
31fc572abe inLogs no longer returns a promise. (#1169) 2018-08-08 10:57:00 -07:00
4066b5e683 Made the visibility-first and max-len rules mandatory. (#1139) 2018-08-08 14:22:45 -03:00
e819416d04 SafeMath is now more consistent with itself. (#1168) 2018-08-08 11:21:23 -03:00
eca5bf9157 Deploy the contract with the designated owner (#1161)
* Deploy the contract with the designated owner

* Fixed TX origin.
2018-08-08 07:04:14 -03:00
a3e02be459 Initialize MAX_UINT more neatly (#1166)
Use 2 ^ 256 - 1 instead that huge constant value.
2018-08-08 06:58:04 -03:00
d124f18dde add note about next tag in releasing document (#1153) 2018-08-07 16:33:50 -03:00
17309e5924 Change uint to uint256 (#1160)
This is a minor change, aligning to the same convention used in the other contracts.
2018-08-07 15:05:56 -03:00
94797978bb SplitPayment now requires payees. (#1131)
* SplitPayment now requires payees.

* Improved test phrasing.
2018-08-06 16:21:34 -03:00
31ac59b224 reentrancy mutex gas optimization (#1155)
* reentrancy mutex gas optimization

* 1) uint => uint256 2) ++ to += 1
2018-08-06 15:22:08 -03:00
bf34911857 Remove Math.min64 and Math.max64 (#1156)
* remove Math.min64 and Math.max64

* refactor Math tests to use return values

* enhance Math coverage
2018-08-06 15:18:19 -03:00
59cb2e2d0f release candidate v1.12.0-rc.2 v1.12.0-rc.2 2018-08-03 15:47:22 -03:00
ba85aef95e Renamed behaviour to behavior. (#1151) 2018-08-03 14:41:54 -03:00
448a7b3048 Fixed HasNoTokens test. (#1149) 2018-08-03 00:12:54 -03:00
ef347ffccc Consolidated ERC20 Interface and Implementation Files (#1125)
* Consolidted ERC20 Interface and Implementation Files

* Fixed CanReclaimToken's tests to use StandardTokenMock instead of BasicTokenMock

* Changed token's variable type in TokenTimelock to ERC20

* Merged the StandardBurnableToken with BurnableToken since it now inherits from StandardToken; Fixed TokenTimelock so it uses SafeERC20 for ERC20

* Fixed variable type for _token in TokenTimelock constructor

* Fixed linting warning in BurnableToken

* Added back burnFrom tests.
2018-08-02 23:12:31 -03:00
418a6b5791 Crowdsale inheritance order (#1128)
* Changed Crowdsale inheritance order.

* Changed FinalizableCrowdsale inheritance order.

(cherry picked from commit 3d86c58d2c)
2018-08-02 18:37:39 -03:00
3d86c58d2c Crowdsale inheritance order (#1128)
* Changed Crowdsale inheritance order.

* Changed FinalizableCrowdsale inheritance order.
2018-08-02 17:57:17 -03:00
e77d70f8c1 Remove .babelrc 2018-08-02 17:46:20 -03:00
4544df47da All tests now use account names, and dont use accounts[0] (except ERC… (#1137)
* All tests now use account names, and dont use accounts[0] (except ERC721)

* Added account names to some missing contracts.
2018-08-02 16:55:31 -03:00
f49721576f Remove abbreviations from parameters (#1142)
* Add an initial document for our code style

* Remove abbreviations from parameters

* Rename the param in AddressUtils

* fix comment
2018-08-02 16:38:54 -03:00
7fdca7b025 updated the typo in Readme (#1143) 2018-08-02 12:49:58 -03:00
1dcefa6bd3 Add an initial document for our release process (#1140)
* Add an initial document for our release process

* add more detail and explanation to releasing guide

* fix details of the RELEASING.md document

* Update RELEASING.md

* Update RELEASING.md

* Update RELEASING.md

* Update RELEASING.md
2018-08-01 19:16:56 -03:00
89ccb03e6e Add an initial document for our code style (#1141)
* Add an initial document for our code style

* add parameter types
2018-08-01 17:13:41 -03:00
5ae8aa4e2e Updated package-lock.json 2018-08-01 15:07:09 -03:00
3806d6128e release candidate v1.12.0-rc.1 v1.12.0-rc.1 2018-08-01 15:00:38 -03:00
052fd3425d Made the visibility-first rule mandatory. 2018-08-01 13:13:08 -03:00
4d799f3cbe Sorted .soliumrc.json rules. 2018-08-01 13:09:40 -03:00
07a27f0e5e Disabled Solium's error-reason rule. (#1138) 2018-08-01 12:56:28 -03:00
ca9e317259 Update Truffle and Solium (#1105)
* fixed visibility warnings

* solved visibility and line length warning

* change a test assertion that fails due to chai dependence update

* linter, constructor style and solved visibility warnings

* Changed Windows line endings to Unix.
2018-08-01 10:11:37 -03:00
9638ecd87a Typo fix. 2018-08-01 08:31:05 -03:00
56735a706c Use address(this) instead of this (#1134)
* Use address(this) instead of this

It's preferred to use `address(this)` vs `this`

* Change to address(this) vs this
2018-07-31 13:36:38 -03:00
2765350248 Prefix all parameters with underscore (#1133) 2018-07-31 13:06:53 -03:00
1200969eb6 Refactor/reentrancy guard gas optimization #1056 (#1057)
* optimizing ReentrancyGuard gas usage

* style fixed
2018-07-27 22:36:17 -03:00
90b98a7bef Add pure to tokenFallback function (#1122)
Silences warning
2018-07-27 22:25:39 -03:00
16429b1522 Making visibility explicit for storage variables (#759)
* Making visibility explicit for storage variables

* Made BasicToken's variables internal.
2018-07-27 17:50:33 -03:00
ae2980b072 Add EditorConfig (#1119)
* Add EditorConfig file.

This allows users with a wide variety of editors to easily code in
OpenZeppelin's preferred 2 space indentation code style.

See https://editorconfig.org for more information.

* Eslint: Always disallow trailing space

* Eslint: Error on missing EOL at file end
2018-07-27 14:55:24 -03:00
f5b0bb3246 Added more comprehensive usage information to the Getting Started guide: (#1089)
* Added an Architecture section that speaks to the different types of contracts
* Added a Tests section that provides high-level visibility into what is used for unit testing
* Added a How To Use and Modify OpenZeppelin Contracts section
* Added development principles to the existing Security section
2018-07-27 13:33:13 -03:00
4c6575bf2f fix: solium linting errors (#1113)
* fix: solium linting errors, fixes #1092

* fix: remove uppercase requirement
2018-07-26 23:53:24 -03:00
2f6c8b05f6 Test/assertRevert: Fix late return bug (#1123)
We now ensure that if an exception is thrown while awaiting the promise,
the exception _has_ to be a revert. We throw 'Expected revert not
received' only afterwards. This solves any problems with confusing the
word 'revert'.

Fix #775
2018-07-26 23:53:06 -03:00
567b773242 Prefer const in test files (#1117)
* Removed all instances of var.

* Sorted eslintrc rules.

* Made eslint rule severity explicit.

* Now prefering const over let.
2018-07-26 13:25:10 -03:00
6e19ed47be fix: bounty tests, superceeds #799 (#1112)
* fix: bounty tests, superceeds #799

* fix: updates from PR notes
2018-07-26 12:17:16 -03:00
e6c15b34da Remove chai-as-promised (#1116)
* Test: Remove chai-as-promised calls

* Test/Helpers: expectThrow accepts optional message

* NPM: Remove chai-as-promised

* Contracts/DestructibleMock: Fix lint
2018-07-26 11:53:33 -03:00