6035bd522b
simplify crowdsale weiRaised update
2017-07-17 21:36:09 -03:00
b8884687df
fix off by one error in VestedToken
2017-07-17 21:34:38 -03:00
18581f138f
converted if() throw convention to require()/assert()/revert()
2017-07-17 15:35:09 -03:00
f3867f8477
Merge pull request #315 from joeykrug/patch-1
...
Added Constant to SafeMath functions as they don't modify storage
2017-07-15 15:52:36 -03:00
353285e5d9
Added Constant to SafeMath functions as they don't modify storage
2017-07-15 11:37:35 -07:00
a56bcbf8fd
Correctly call super.transferableTokens
...
Fix #307
2017-07-14 18:17:09 -03:00
81297fac88
Merge pull request #308 from frangio/fix/erc20
...
Make ERC20 and token contracts conform to standard
2017-07-13 17:28:50 -03:00
6331dd125d
fix ERC20 to conform to standard
2017-07-13 12:05:45 -03:00
f8790c1ed7
Merge pull request #304 from cgewecke/fix-coveralls
...
Fix coverage
2017-07-10 23:24:45 -03:00
5afbdf00db
Fix coverage
2017-07-10 15:45:12 -07:00
322a9598ab
Merge pull request #289 from ezynda3/master
...
update according to changes in #288
2017-07-06 11:07:13 -03:00
ba86e8e095
Merge pull request #296 from frangio/fix/293-tokentimelock-claim
...
Add TokenTimelock#release function that anyone can call
2017-07-05 11:47:15 -03:00
5e423bc353
add release function, deprecate claim
2017-07-05 11:24:59 -03:00
6eac859781
Test if unpause prevents events allowed in paused state
2017-07-03 17:06:47 +01:00
f2c2c01f8e
Merge branch 'master' of github.com:OpenZeppelin/zeppelin-solidity
2017-07-02 15:50:40 -07:00
7434b3d6d2
v1.1.0
2017-07-02 18:53:32 -03:00
63b5fc5971
Merge pull request #290 from frangio/fix/safemath-references
...
Fix references to SafeMath in crowdsale contracts
2017-07-02 18:50:29 -03:00
f507a0ea29
fix references to SafeMath in crowdsale contracts
2017-07-02 18:39:51 -03:00
c254d8703d
update according to changes in #288
2017-07-02 14:33:15 -07:00
981ec2dbdc
v1.1.0
2017-07-02 18:27:18 -03:00
d5a75362ec
Merge pull request #288 from frangio/refactor/math
...
Move SafeMath and create Math library for assorted operations
2017-07-02 18:13:47 -03:00
e748c3ea36
Merge pull request #283 from OpenZeppelin/crowdsale
...
Add Crowdsale contracts
2017-07-02 17:59:19 -03:00
421ed4f8ab
fix references to max and min functions
2017-07-02 17:56:34 -03:00
0b1f08043b
change Math to a library instead of a contract
2017-07-02 17:56:10 -03:00
759f8de81f
fix import directories
2017-07-02 17:52:44 -03:00
96b550b722
Merge pull request #287 from jakub-wojciechowski/test/day-limit
...
Added new test for a day passed scenario to the DayLimit contract
2017-07-02 17:37:28 -03:00
b961eea89d
fix claimRefund precondition
2017-07-02 17:10:11 -03:00
d2dd6e40b6
added new test for a day passed scenario to the DayLimit contract
2017-07-02 21:06:58 +01:00
070bcbcdbd
rename purchaseValid to validPurchase
2017-07-02 17:05:06 -03:00
46fe7ee76d
guard against beneficiary == 0x0
2017-07-02 16:51:26 -03:00
ba383a6d20
refactor max and min out of SafeMath
2017-07-02 13:01:55 -03:00
a66f5f8f03
format SafeMath documentation as NatSpec
2017-07-02 13:00:23 -03:00
262b7dd7dd
Merge pull request #285 from frangio/feature/token-timelock
...
Add a TokenTimelock contract
2017-06-30 23:14:24 -03:00
5d847ed4d9
tweak TokenTimelock documentation
2017-06-30 21:28:45 -03:00
b3ca0c73b3
add a TokenTimelock contract
2017-06-30 21:25:59 -03:00
d6a45ef14e
Merge pull request #282 from jasonbellamy/fix/standard-contract-docs-typo
...
fix(token): typo in documentation
2017-06-30 18:31:53 -03:00
54d74b1c26
rename canBuy to purchaseValid
2017-06-30 17:54:26 -03:00
657c56c650
remove unecessary whitespace
2017-06-30 17:54:07 -03:00
50a903a62d
use npm test script for travis
2017-06-30 17:40:34 -03:00
0791e6639a
add extra arguments to test command for development testing
2017-06-30 15:52:11 -03:00
59e9609926
remove CrowdsaleToken
...
it is superseded by the new crowdsale contracts
2017-06-30 15:50:47 -03:00
fadb2cf47e
add tests for crowdsale contracts
2017-06-30 15:50:47 -03:00
4d55d8fa8e
give more balance to testrpc accounts
...
includes fix to MultisigWallet test because bigger balances result in
floating point errors (see #204 )
2017-06-30 15:50:47 -03:00
e31abffcb6
fix(token): typo in documentation
...
Implemantation -> Implementation
2017-06-30 14:40:15 -04:00
cd47fbe953
Improve Crowdsale#rate documentation
2017-06-30 11:23:28 -03:00
42c6392533
fix(token): typo in documentation
2017-06-30 00:41:12 -04:00
3c9638b62e
Refactoring to not DRY.
...
The latest test case is not affected since the aproval is for
accounts[1], which does the transaction, and it is independent of
the amount of tokens that accounts[0] might have.
2017-06-29 13:18:54 -05:00
60ef284a9a
Typo in variable, using global tAMOUNT for the latest test case.
2017-06-29 13:13:53 -05:00
b40a01e97b
Small refactoring to not DRY
2017-06-29 13:12:58 -05:00
34e3ce4ab4
Typo fix: avaible -> available
2017-06-29 12:44:14 -05:00
