|
|
bcda5bfe9b
|
Merge branch 'master' into feature/merkleproof
|
2017-09-18 14:01:10 -04:00 |
|
|
|
6d8bb497c8
|
removing trailing whitespace
|
2017-09-16 10:20:06 -04:00 |
|
|
|
dc1017c929
|
Simplify implementation using similar interface as PullPayment contract
|
2017-09-09 12:04:31 -03:00 |
|
|
|
69e83e5086
|
Add a SplitPullPayment contract that combines distribution of funds and delayed withdrawal from each party
|
2017-08-29 12:06:24 -03:00 |
|
|
|
8336785a9b
|
Add a SplitPayment contract to distribute funds among multiple beneficiaries
|
2017-08-29 12:06:23 -03:00 |
|
|
|
dcdc453a55
|
Merge pull request #413 from frangio/add-safe-erc20
Add SafeERC20 helpers
|
2017-08-28 19:43:32 -03:00 |
|
|
|
00f80c726a
|
fix reference to mock contract
|
2017-08-28 19:31:19 -03:00 |
|
|
|
74db6c2b3b
|
add missing test for error when doing transferFrom to 0x0
|
2017-08-28 19:31:19 -03:00 |
|
|
|
d095ba84bf
|
Add tests to check transfers to 0x0 fail
|
2017-08-28 19:31:19 -03:00 |
|
|
|
c37c233d22
|
add SafeERC20 tests for succeeding operations
|
2017-08-28 19:27:56 -03:00 |
|
|
|
c7636bdc4c
|
add safe ERC20 helpers
|
2017-08-28 17:32:18 -03:00 |
|
|
|
51906bae6c
|
refactor
|
2017-08-24 21:42:31 +02:00 |
|
|
|
406004a99a
|
refactor HasNoTokens.sol
|
2017-08-24 21:42:31 +02:00 |
|
|
|
289fd87ef8
|
Tests increase and decrease allowance for spender
- Spender starts with 0 tokens allowed to spend
- Spender is granted 50, then decreased it's allowance by 10
Refs PR #224
|
2017-08-20 23:20:09 -05:00 |
|
|
|
0ed98ea9b9
|
Merge pull request #368 from jakub-wojciechowski/master
Remove moment.js dependencies
|
2017-08-16 10:17:53 -03:00 |
|
|
|
0d6846a882
|
Remove moment.js dependencies - updates after review
|
2017-08-15 12:31:49 +02:00 |
|
|
|
36452136f1
|
add test for finishMinting
|
2017-08-13 22:41:25 -03:00 |
|
|
|
e86ac90853
|
Refactor and remove moment.js usages
|
2017-08-14 00:27:09 +02:00 |
|
|
|
99e0f5b5cb
|
Refactor time manipulation in TokenTimelock tests
|
2017-08-14 00:21:57 +02:00 |
|
|
|
4fc6bb7977
|
remove token.finishMinting() from default finalization
|
2017-08-12 22:02:44 -03:00 |
|
|
|
b972f43513
|
Merge pull request #345 from SylTi/master
Add Transfer event when token is minted
|
2017-08-11 14:47:43 -03:00 |
|
|
|
2b079136fb
|
Merge pull request #353 from jakub-wojciechowski/master
Change crowdsales to use timestamps instead of block numbers #350
|
2017-08-10 12:42:55 -03:00 |
|
|
|
46c5759b88
|
Introduce increaseTimeTo helper method.
|
2017-08-10 16:23:52 +02:00 |
|
|
|
7c883b6368
|
Duration helper and eliminated hardcoded periods
|
2017-08-10 13:13:49 +02:00 |
|
|
|
69daed7746
|
Merge pull request #341 from lsaether/master
Added contracts/token/BurnableToken.sol
|
2017-08-09 17:22:58 -03:00 |
|
|
|
2261039d52
|
Simplify advanceBlock in tests
|
2017-08-07 18:29:09 +02:00 |
|
|
|
24323d3ce3
|
MerkleTree util class hashes elements
|
2017-08-07 11:23:52 -04:00 |
|
|
|
c6e055689b
|
Change crowdsales to use timestamps instead of block numbers #350 update example
|
2017-08-06 16:42:16 +02:00 |
|
|
|
2b5192b9ce
|
Change crowdsales to use timestamps instead of block numbers #350 update derived crowdsales
|
2017-08-06 16:41:43 +02:00 |
|
|
|
77dfcb6e23
|
Change crowdsales to use timestamps instead of block numbers #350
|
2017-08-06 16:40:19 +02:00 |
|
|
|
4fe837704b
|
Add Transfer event when token is minted to be fully ERC20 compliant &
tests
|
2017-08-05 00:14:01 +02:00 |
|
|
|
cf58330936
|
added tests for BurnableToken
|
2017-07-31 17:23:23 -07:00 |
|
|
|
a9e1fcd623
|
Add complex crowdsale example #331 requested changes
|
2017-07-29 09:00:54 +01:00 |
|
|
|
04e0b2e5c2
|
Add complex crowdsale example #331 tests
|
2017-07-29 00:29:59 +01:00 |
|
|
|
863ad48a81
|
Check proof length multiple of 32. Use keccak256 instead of sha3
|
2017-07-28 10:38:32 -04:00 |
|
|
|
6fccd202fe
|
Fix invalid number of args for solidity function errors in tests
|
2017-07-26 17:20:28 -03:00 |
|
|
|
58e2e4d742
|
remove MultisigWallet in favor of ConsenSys/MultiSigWallet
|
2017-07-24 13:26:48 -03:00 |
|
|
|
60bc6a6da5
|
Merge pull request #327 from jakub-wojciechowski/master
fix testing error throwing
|
2017-07-22 22:17:32 -03:00 |
|
|
|
b3f60b9320
|
refactor testing error throwing
|
2017-07-22 21:40:01 +01:00 |
|
|
|
e9cf6dfb60
|
Merge pull request #323 from pooleja/fix/ownable_error
Fix/ownable error - Silent transferOwnership Failure
|
2017-07-22 15:57:45 -03:00 |
|
|
|
5e7847537a
|
fix testing error throwing
|
2017-07-22 11:46:49 +01:00 |
|
|
|
64787b1ac5
|
Add semicolon to match coding standards
|
2017-07-21 23:07:50 -07:00 |
|
|
|
58fdb956b5
|
Add assert to prevent regression
|
2017-07-21 23:04:50 -07:00 |
|
|
|
1bb1d41beb
|
Merge pull request #281 from rudygodoy/master
Tests refactoring and typo fixes
|
2017-07-21 11:57:13 -03:00 |
|
|
|
1db46aa5d5
|
Merge pull request #292 from jakub-wojciechowski/test/pausable
Test if unpause prevents events allowed in paused state
|
2017-07-21 11:39:42 -03:00 |
|
|
|
6735a3ccd6
|
Renamed tAMOUNT to much friendly amount
|
2017-07-20 16:01:41 -05:00 |
|
|
|
6d565ef841
|
Fix auto-formatting
|
2017-07-20 10:58:16 -07:00 |
|
|
|
b2e36314cb
|
Add requirement for address to not be 0 and throw error
|
2017-07-20 10:51:57 -07:00 |
|
|
|
6904f12032
|
Merge with upstream/master
|
2017-07-20 07:01:58 -05:00 |
|
|
|
93b953fb48
|
changed instances of uint to uint256; fixes issue #226
|
2017-07-19 09:59:46 -04:00 |
|