36043ecc3e
Merge pull request #27 from nventuro/init-asserts
...
Added assertions to leaf initializers of (some) pseudo-abstract contr…
2018-10-15 14:32:20 -03:00
d75ba16223
ERC721 contracts no longer initialize their parents (but have some safety checks).
2018-10-15 13:41:51 -03:00
03dfb2965c
Improve encapsulation on ERC165 and update code style guide ( #1379 )
...
* use prefix underscore for internal state variables
* make _supportedInterfaces private
2018-10-12 19:13:35 -03:00
9f822906b8
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.
2018-10-10 20:55:10 -03:00
eb92fd1f48
Fix typo in ARCHITECTURE.md ( #1406 )
2018-10-10 15:15:38 -03:00
076cb7decd
Add a code style rule to make all state variables private ( #1390 )
2018-10-10 12:06:22 -06:00
1961032592
Merge pull request #31 from nventuro/peer-dep
...
Added zos-lib as a peer dependency and used its Initializable.
2018-10-10 12:53:51 -03:00
da67e435b1
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
2018-10-10 09:33:26 -03:00
fffa406aa4
Merge branch 'master' into peer-dep
2018-10-10 09:09:06 -03:00
488c3de389
Merge pull request #29 from nventuro/storage-slots
...
Added gaps at the end of the storage of each contract.
2018-10-10 09:07:29 -03:00
45747144ff
Trying to get the Travis build to pass.
2018-10-09 19:05:39 -03:00
bc7ba69f9b
Removed Initializable, now using zos-lib's.
2018-10-09 17:56:56 -03:00
423c6523ba
Added zos-lib peer dependency.
2018-10-09 17:56:40 -03:00
ecd6c57faa
Added internal check methods.
2018-10-09 17:21:53 -03:00
19de09afe1
Merge branch 'master' into storage-slots
2018-10-09 16:30:52 -03:00
b0da0fded0
Replaced assertJump, assertRevert and expectThrow with shouldFail. ( #1363 )
...
* Replaced assertJump, assertRevert and expectThrow with shouldFail.
* Fixed linter errors.
* Fixed typo.
* Made the helpers async.
2018-10-09 16:23:55 -03:00
58a42443df
added a test helper with common constants ( #1400 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1206
2018-10-09 15:46:09 -03:00
af42c39e6c
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
2018-10-09 13:32:45 -03:00
3acc2b4216
Added a constructor to BreakInvariantBounty. ( #1395 )
2018-10-08 17:01:35 -06:00
932a39f5fd
Added gaps at the end of the storage of each contract.
2018-10-08 14:42:02 -03:00
6956b935b3
Merge pull request #28 from nventuro/accidental-death
...
Removed BreakInvariantBounty.
2018-10-08 13:38:34 -03:00
7bdefbeb9a
Removed BreakInvariantBounty.
2018-10-08 12:51:11 -03:00
6fe9b340b4
Added assertions to leaf initializers of (some) pseudo-abstract contracts.
2018-10-08 12:45:58 -03:00
b25e8b91a5
Merge pull request #26 from nventuro/sender-param
...
Added sender parameter to initializers using msg.sender.
2018-10-08 11:03:10 -03:00
f7e53d90fa
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.
2018-10-08 11:01:33 -03:00
41f84f8b40
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
2018-10-08 10:51:06 -03:00
b17de011dc
Removed old, unused mocks. ( #1382 )
2018-10-05 19:18:59 -06:00
14dd3f6610
Added sender parameter to initializers using msg.sender.
2018-10-05 17:40:38 -03:00
716efc4b51
Merge pull request #24 from nventuro/init-improvs
...
Initialization improvements
2018-10-05 16:39:44 -03:00
143ccf7a74
Removed Initializable from mocks, removed explicit inheritances in the crowdsale mocks.
2018-10-05 16:34:29 -03:00
dd750bc094
Added missing initializations.
2018-10-05 16:34:29 -03:00
ef83f895b9
Added initializer to ERC721MetadataMintable.
2018-10-05 16:34:29 -03:00
cd3be5fb02
Merge pull request #23 from nventuro/oz-sol-rc3
...
Merging OZ 2.0.0.rc3
2018-10-05 16:29:08 -03:00
f29e98f772
Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3
2018-10-04 12:00:12 -03:00
2d30918149
Release candidate v2.0.0-rc.3
2018-10-04 11:17:57 -03:00
0db1f8144d
Removed unnecessary Secondary inheritance from RefundEscrow. ( #1381 )
...
(cherry picked from commit 308e5e9cc0
2018-10-04 11:15:53 -03:00
308e5e9cc0
Removed unnecessary Secondary inheritance from RefundEscrow. ( #1381 )
2018-10-04 11:15:22 -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
bd8345a153
Separate ERC721Mintable ( #1365 )
...
* separate part of ERC721Mintable into ERC721MetadataMintable
* remove mint and burn from 721 tests
* Fixed linter error.
* fix ERC721 mint tests
* Minor fixes.
(cherry picked from commit 744f567f40
2018-10-04 11:12:05 -03:00
744f567f40
Separate ERC721Mintable ( #1365 )
...
* separate part of ERC721Mintable into ERC721MetadataMintable
* remove mint and burn from 721 tests
* Fixed linter error.
* fix ERC721 mint tests
* Minor fixes.
2018-10-04 11:10:08 -03:00
b41b125c15
this is used in tests (#1380 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1200
* suggested change
2018-10-04 09:57:37 -03:00
3df0a786e4
Merge pull request #18 from OpenZeppelin/release-v2.0.0
...
Merge OpenZeppelin 2.0 with initializer functions
2018-10-04 08:36:30 -03:00
fd4de77651
Replaces amount with value for consistency ( #1378 )
...
* fixes #1372
* done in ERC20Capped and ERC20Mintable
2018-10-04 07:51:52 -03:00
ace14d3ad7
Add note about compiling artifacts to releasing steps ( #1377 )
...
* add note about compiling artifacts to release notes
* add explanation of truffle bug
2018-10-03 23:17:06 -03:00
5c228805ad
Update issue templates ( #1376 )
...
* Update issue templates
* improve pull request template
* remove previous issue template
2018-10-03 23:13:46 -03:00
3c4528b8f4
fix initialization of ReetrancyGuard storage variable
2018-10-03 17:28:22 -03:00
c87433e0c2
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.
2018-10-03 12:50:01 -03:00
f3888bb0b0
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
2018-10-03 12:23:08 -03:00
