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
32d0f6770c
fix lint errors
2018-10-01 18:56:50 -03:00
caa0db9fa9
Merge branch 'master' into release-v2.0.0
2018-10-01 18:54:26 -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
76169cda40
Fixed a broken payment test (+ another small fix) ( #1318 )
...
* Fixed a broken payment test
* In PR template, npm run lint:fix, not lint:all:fix
* In SplitPayment test, replaced an await-in-loop with Promise.all
(cherry picked from commit b79196f911
2018-09-28 11:36:06 -03:00
08bf6bbed9
Add missing tests to ECSDA ( #1248 )
...
* fix: refactor sign.js and related tests
* fix: remove unused dep
* fix: update package.json correctly
* Add missing tests to ECRecovery
* fix lint
* Reorganize the tests
* Reuse signature
* fix static errors
* Apply suggestions by @frangion and @nventuro
* Remove only
* More suggestions
* Remove unnecessary max-len
* remove only
(cherry picked from commit 75c0a59bb4
2018-09-28 11:28:46 -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
d643caf8fe
convert CapperRole and SignerRole to initializers
2018-09-26 17:18:45 -03:00
a010d88def
convert ERC721Pausable to initializers
2018-09-26 17:12:16 -03:00
d3116fcea8
add Initializable to simple ERC721 contracts
2018-09-26 17:12:16 -03:00
cda2866e7c
convert ERC721Burnable to initializers
2018-09-26 16:45:37 -03:00
fa5ecd03cb
Improved bounty tests. ( #1350 )
...
* Improved bounty tests.
* Fixed linter errors.
* Addressed review comments.
(cherry picked from commit ae109f69cc
2018-09-26 16:37:31 -03:00
1b0c6b94b9
Removed mintingFinished. ( #1351 )
...
* Removed mintingFinished from ERC20Mintable.
* Removed MintingFinished from ERC721Mintable.
* Removed MintingFinished event.
(cherry picked from commit 5fdeaa81d5
2018-09-26 16:06:27 -03:00
652243b7c3
Removed assertions from Escrow and SplitPayment. ( #1349 )
...
(cherry picked from commit db2e1d2c74
2018-09-26 12:57:15 -03:00
c9e8a66e85
Add the missing test for ERC721Holder ( #1249 )
...
* Add the missing test for ERC721Holder
* fix lint
* Move the holder test to a separate file
(cherry picked from commit 396680b856
2018-09-26 12:15:08 -03:00
e7c99dd7dd
Roles now emit events in construction and when renouncing. ( #1329 )
...
* release candidate v2.0.0-rc.1
* fix linter error
(cherry picked from commit c12a1c689821198bf1c1
2018-09-26 12:14:34 -03:00
aa6a44bb20
convert PullPayment to initializers
2018-09-25 19:38:15 -03:00
10642d14ea
convert Escrow to initializers
2018-09-25 19:33:58 -03:00
