bce2d68e7f
convert 2 spaces to 4 spaces
2019-01-17 18:02:50 -03:00
54268bfeed
Move standalone ERC20 and ERC721 to token dir ( #38 )
2018-10-19 11:45:02 -06: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
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
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
fffa406aa4
Merge branch 'master' into peer-dep
2018-10-10 09:09:06 -03:00
bc7ba69f9b
Removed Initializable, now using zos-lib's.
2018-10-09 17:56:56 -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
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
14dd3f6610
Added sender parameter to initializers using msg.sender.
2018-10-05 17:40:38 -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
f29e98f772
Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3
2018-10-04 12:00:12 -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 a6889776f4 .
* updates
* fixes #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 a6889776f4 .
* updates
* fixes #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
3c4528b8f4
fix initialization of ReetrancyGuard storage variable
2018-10-03 17:28:22 -03:00
32d0f6770c
fix lint errors
2018-10-01 18:56:50 -03:00
621d4b30da
remove constructors from Crowdsales
2018-09-28 17:51:59 -03:00
693907d3c8
convert SampleCrowdsale and SampleCrowdsaleToken to initializers
2018-09-28 17:48:07 -03:00
2108641a37
convert distribution crowdsales to initializers
2018-09-28 16:38:04 -03:00
418b6f7cb3
convert IncreasingPriceCrowdsale to initializers
2018-09-28 16:01:57 -03:00
8c394de450
Add SignatureBouncer test for when msg.data is too short ( #1360 )
...
* add test for msg.data too short
* fix test to hit that branch
* Update SignatureBouncer.test.js
(cherry picked from commit 1a4e5346ed )
2018-09-28 09:38:48 -03:00
ed200a0219
convert IndividuallyCappedCrowdsale to initializers
2018-09-27 19:28:14 -03:00
c4487ba836
convert CappedCrowdsale
2018-09-27 19:24:02 -03:00
2c2d80d9a0
convert TimedCrowdsale to initializers
2018-09-27 19:14:30 -03:00
6247a7bf7c
convert AllowanceCrowdsale to initializers
2018-09-27 18:57:59 -03:00
22f8660c8e
convert MintedCrowdsale to initializers
2018-09-27 18:53:31 -03:00
175e2c7254
convert Crowdsale to initializers
2018-09-27 18:43:58 -03:00
a0a3187b30
make roles initializers idempotent
2018-09-26 19:21:25 -03:00
f3b5f9e8f0
convert SignatureBouncer to initializers
2018-09-26 19:01:36 -03:00
e6d5379e39
convert TokenVesting to initializers
2018-09-26 18:59:07 -03:00
8bf7356f38
convert ERC20Migrator to initializers
2018-09-26 18:49:47 -03:00
d7b7644e68
convert ERC1046 to initializers
2018-09-26 18:30:45 -03:00
8dd0739072
convert BreakInvariantBounty to initializers
2018-09-26 18:26:45 -03:00
838509c0a4
Merge branch 'release-v2.0.0' of github.com:OpenZeppelin/openzeppelin-solidity into release-v2.0.0
2018-09-26 18:19:41 -03:00
e6252d511c
convert SimpleToken to initializers
2018-09-26 18:08:29 -03:00
e2e05294b0
convert RefundEscrow to initializers
2018-09-26 18:01:02 -03:00
3130a3f3de
convert ConditionalEscrow to initializers
2018-09-26 17:55:08 -03:00
884d5e0132
convert SplitPayment to initializers
2018-09-26 17:51:33 -03:00
8d28bd445a
covnert TokenTimelock into initializers
2018-09-26 17:46:54 -03:00