bce2d68e7f
convert 2 spaces to 4 spaces
2019-01-17 18:02:50 -03:00
b047d28476
Bump to version 2.0.2
2018-10-22 14:54:57 +02:00
54268bfeed
Move standalone ERC20 and ERC721 to token dir ( #38 )
2018-10-19 11:45:02 -06:00
0c05ce0eb1
Bump to v2.0.1
2018-10-18 20:40:38 +02:00
f28a4427a2
Add missing zos.json files
2018-10-18 20:34:50 +02:00
e5ba8666de
Update readme
2018-10-18 20:12:09 +02:00
2fa3176399
Update to zOS 2.0.0 and version bump to 2.0.0
2018-10-18 20:05:48 +02:00
d1f2b19e6e
Frozen all releases
2018-10-18 19:47:57 +02:00
a8a3e0be05
Deployed openzeppelin-eth to all networks
2018-10-18 19:28:56 +02:00
f38ff1bdbd
Add publish flag to zos.json
2018-10-18 18:34:59 +02:00
34fdb0fe23
Fix split payment contract variable initialization ( #37 )
...
* Remove variables initialization on declaration for SplitPayment contracts
2018-10-18 18:20:05 +02:00
793de306cf
Initialize zos project
2018-10-18 18:17:16 +02:00
0720923115
Add zos CLI as dev dependency and bump zos lib version
2018-10-18 18:17:16 +02:00
95666637b6
Add prepare script ( #36 )
2018-10-18 17:53:56 +02:00
0ae92d78eb
Fix linter issues
2018-10-18 15:22:40 +02:00
5e69036bbc
EVM Package examples ( #32 )
...
* Added StandardToken (on-chain lib)
* Added OnChainERC20 example.
* Added OnChainERC721
* Update OnChainERC721.test.js
* Renamed the contracts to Standalone*.
* Fix path to Initializable in StandardToken example
2018-10-18 15:03:34 +02:00
6395ddac2c
Merge pull request #34 from nventuro/oz-eth
...
Updated package.json
2018-10-18 14:45:26 +02:00
a2a28b02e8
Updated package.json
2018-10-17 15:15:11 -03:00
84a37e1460
Merge pull request #33 from nventuro/erc721-init
...
ERC721 contracts no longer initialize their parents.
2018-10-15 14:32:28 -03:00
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
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
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
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
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
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
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
3c4528b8f4
fix initialization of ReetrancyGuard storage variable
2018-10-03 17:28:22 -03:00
94a7abcebc
Merge pull request #14 from glesaint/patch-1
...
update Math.sol path
2018-10-02 10:57:53 -03:00
