48a7cd4e60
add workaround because truffle doesn't support transitive dependencies
2018-05-21 15:54:35 -03:00
acd34a9372
fix bug in DetailedPremintedToken
2018-05-21 15:26:44 -03:00
2ce67a25ef
add more contracts from openzeppelin-solidity
2018-05-21 15:26:44 -03:00
700b811813
fix linter errors and warnings
2018-05-21 15:26:44 -03:00
16f04b13d7
revert truffle-config.js changes from 95fdc7b
2018-05-21 15:26:44 -03:00
e3ad4a5e14
remove unnecessary sender arguments
2018-05-21 15:26:28 -03:00
579446d5d9
Fixed MintableToken's initialize not being called.
2018-05-19 01:02:12 -03:00
fc07f7a0ff
RBACWithAdmin now has an initialize function instead of a constructor.
2018-05-19 00:58:52 -03:00
dd6054efeb
remove unnecessary sender arguments
2018-05-18 21:45:45 -03:00
27a6a15d66
add explicit initializers
2018-05-18 21:45:34 -03:00
32e93579fa
added package.zos files
2018-05-18 21:44:56 -03:00
c8719ce418
fix initialize versions
2018-05-18 21:44:08 -03:00
39fe05dfad
add more openzeppelin-solidity library contracts
2018-05-18 21:44:08 -03:00
be101154fa
update to newer zos.json format
2018-05-18 21:21:37 -03:00
c329fc0a5f
update zos to latest version
2018-05-18 21:01:23 -03:00
e55dbc9681
update to latest zos and zos-lib
2018-05-18 19:07:15 -03:00
6f1c67af0d
commit new package-lock.json format generated by npm 6
2018-05-18 18:55:24 -03:00
5284a6df88
update nan 2.6.2 -> 2.10.0 for node 10 compatibility
2018-05-18 18:19:15 -03:00
8bce0a4f2e
update sha3 1.2.0 -> 1.2.2 for node 10 compatibility
2018-05-18 18:19:12 -03:00
11d2bbc092
Merge tag 'v1.9.0' into zos-release
...
1.9.0
2018-05-17 20:04:00 -03:00
746673a94f
style: use the max-len solidity rule ( #944 )
2018-05-14 11:42:32 -06:00
ba4cf03da7
contracts mocks: replace deprecated constant with view ( #931 )
2018-05-10 10:43:15 -06:00
39370ff690
Adding RBAC Mintable token ( #923 )
...
* added the RBACMintableToken
* added MintedCrowdsale with RBACMintableToken test
* added a mintable behaviour for tests
* moved minting tests in behaviour
* created a minted crowdsale behaviour to be tested with both mintable and rbacmintable token
2018-05-09 18:01:25 -07:00
ad12381549
update constructor syntax for solidity 0.4.23 in numerous contracts ( #921 )
...
* update solidity-coverage to ^0.5.0
* update truffle dependency to ^4.1.8
* update solium to ^1.1.7
* update all contracts to solidity ^0.4.23
2018-05-08 18:02:00 -07:00
20b85be6aa
Ownable behavior ( #929 )
...
* added function to renounce ownership
* Provide an Ownable behavior for testing (#905 )
* Fix indentation
* Convert to use should assertions
2018-05-08 17:33:37 -07:00
4223c9d50e
feat: refactor whitelist.sol to use RBAC ( #893 )
...
* feat: refactor whitelist.sol to use RBAC
* fix: remove poor backwards compat attempt
2018-05-08 17:20:28 -07:00
f0eea31bdf
Fix ERC721Token.sol code indent ( #909 )
2018-05-07 11:39:54 -07:00
ce0a928a6c
Fix typos in ERC721BasicToken comments ( #889 )
2018-05-07 11:20:12 -07:00
85f079ee89
Removing more asserts in favor of require ( #834 )
...
* Removed asserts and replaced them in favor of require
* Adapted tests to work with requires
2018-05-03 14:04:02 -03:00
7e44204d9b
added function to renounce ownership ( #907 )
2018-05-03 13:25:18 -03:00
4a10f727c4
1.9.0
v1.9.0
2018-04-26 16:36:06 -03:00
e79dc645e4
Merge branch 'rename-openzeppelin-solidity'
2018-04-26 16:35:19 -03:00
0e5799c93b
Clean up npm package ( #904 )
...
* ignore everything but official contracts for npm
* add tests to npm package
* remove truffle migrations stuff
* remove seemingly unused npm dependency
* clean up dependencies
2018-04-26 12:36:41 -03:00
90413e75f1
add version script to update ethpm.json ( #906 )
2018-04-25 20:32:09 -03:00
9c262571ae
rename to openzeppelin-solidity
2018-04-25 19:19:15 -03:00
76fe1548ae
Fix ERC721 test is not checking name and symbol properly #910 ( #911 )
2018-04-23 20:36:47 -03:00
8f2a4785cb
Make ERC827 methods payable ( #838 )
...
* Make ERC827 methods payable
* Suppress linter errors
* Add some ERC827 payable tests
* Remove failOnBuy method from MessageHelper
* Fix linter warning
* Fix tests
2018-04-23 15:16:55 +02:00
16535fbb87
Update ERC827.sol to not use function overloading ( #871 )
...
* Update ERC827.sol to not use function overloading
* updated tests for erc827 function name changes
* fixed broken test
* removed findMethod from erc827 tests that is no longer necessary
2018-04-23 13:39:34 +02:00
ff69c54497
move zos (cli) to devDependency
2018-04-20 22:47:38 -03:00
6669f3fcee
Merge branch 'zos-release' of github.com:OpenZeppelin/zeppelin-solidity into zos-release
2018-04-20 21:37:28 -03:00
18e16a5db0
added package.zos
2018-04-20 20:38:23 -03:00
95fdc7bd8a
update contracts and config
2018-04-20 19:58:16 -03:00
77cc33fc5c
cleaned up unsued variable definition ( #753 )
2018-04-20 16:01:05 -03:00
27d696aa7d
add deployable erc20 contracts
2018-04-20 13:31:27 -03:00
ff6a565452
bump version
2018-04-20 13:31:27 -03:00
5f079c8605
add prepack step to build contracts
2018-04-20 13:31:27 -03:00
ea335ebc64
ignore everything but official contracts for npm
2018-04-20 13:31:27 -03:00
b1a801566c
fix initializers and tests
2018-04-20 13:31:26 -03:00
2eac2a79b7
add mintable erc721 token
2018-04-20 13:30:22 -03:00
f9fc8d2e96
adapt contracts for upgradeability
2018-04-20 13:29:50 -03:00