Commit Graph

230 Commits

Author SHA1 Message Date
Ricardo Guilherme Schmidt 4b43dba374 better increaseTime 2018-05-17 12:47:41 -03:00
Ricardo Guilherme Schmidt 7936cf2f25 remove duplicated timeout 2018-05-17 12:08:00 -03:00
Ricardo Guilherme Schmidt bc2c4d872c small fix and comment unstable code 2018-05-15 17:49:01 -03:00
Ricardo Guilherme Schmidt 8520b8afb4 time units + proper handle of incresetime 2018-05-15 17:00:40 -03:00
Ricardo Guilherme Schmidt a4ab1cbe11 add increseTime 2018-05-15 16:03:40 -03:00
Ricardo Guilherme Schmidt 2f13c0e321 add instance factory contracts to readme 2018-05-15 08:56:13 -03:00
Ricardo Guilherme Schmidt 3d88d5eec2 Merge branch 'bootstrap' into 000-instance-factory 2018-05-15 08:45:36 -03:00
Ricardo Guilherme Schmidt 0923267e66 add readme 2018-05-14 20:58:30 -03:00
Ricardo Guilherme Schmidt 90b45ff462 update testutils 2018-05-14 18:00:21 -03:00
Ricardo Guilherme Schmidt 750661069a fix test utils 2018-05-13 23:34:50 -03:00
Ricardo Guilherme Schmidt 3ad4094040 add some test utils 2018-05-13 22:37:14 -03:00
Ricardo Guilherme Schmidt 675cbd2377 instance factory merge bootstrap 2018-05-13 18:00:07 -03:00
Ricardo Guilherme Schmidt eab0c133d1 fix tests 2018-05-13 17:54:05 -03:00
Ricardo Guilherme Schmidt b2c07c63f7 add ERC20Receiver+tests 2018-05-13 14:01:59 -03:00
Ricardo Guilherme Schmidt 31fb6a416d add package-lock to.json .gitignore 2018-05-13 12:41:38 -03:00
Ricardo Guilherme Schmidt 87dbdbef39 missing emit 2018-05-13 06:17:39 -03:00
Ricardo Guilherme Schmidt f8d71b40e4 Merge branch 'bootstrap' into 000-instance-factory 2018-05-13 02:51:28 -03:00
Ricardo Guilherme Schmidt 75d85c70be add react to package 2018-05-13 02:49:20 -03:00
Ricardo Guilherme Schmidt ddf7dd916f no auto deploy of factory or instances 2018-05-13 02:48:14 -03:00
Ricardo Guilherme Schmidt 5dab2021c0 update to latest solc 2018-05-13 02:47:51 -03:00
Ricardo Guilherme Schmidt d1a92c93b7 Merge branch 'bootstrap' into 000-instance-factory 2018-05-13 02:41:13 -03:00
Ricardo Guilherme Schmidt a89d67f11a fix in log 2018-05-13 01:40:56 -03:00
Ricardo Guilherme Schmidt 62bf93868c simple token UI 2018-05-13 01:31:01 -03:00
Ricardo Guilherme Schmidt 611649fbd7 rename return value 2018-05-13 01:28:15 -03:00
Ricardo Guilherme Schmidt 0a1cbb5fff test script for testtoken and erc20token 2018-05-12 21:16:18 -03:00
Ricardo Guilherme Schmidt 04e13c6913 small fixes 2018-05-08 20:17:00 -03:00
Ricardo Guilherme Schmidt 72dffc3a47 Merge remote-tracking branch 'origin/bootstrap' into minimetoken 2018-05-08 00:54:10 -03:00
Ricardo Guilherme Schmidt a597410b66 fix comment blocks 2018-05-08 00:53:51 -03:00
Ricardo Guilherme Schmidt 0e77dafacd Merge branch 'bootstrap' of https://github.com/status-im/contracts into bootstrap 2018-05-08 00:52:19 -03:00
Ricardo Guilherme Schmidt 9d5518ea24 update to new solidity 2018-05-08 00:51:07 -03:00
Ricardo Guilherme Schmidt ae4221a2ec Merge remote-tracking branch 'origin/bootstrap' into minimetoken 2018-05-08 00:29:57 -03:00
Ricardo Guilherme Schmidt 7b79862005 make constructors internal of abstract contracts 2018-05-07 23:38:54 -03:00
Ricardo Guilherme Schmidt 9067b7a21c Implement TestToken 2018-05-07 23:38:01 -03:00
Ricardo Guilherme Schmidt bc3933b1f5 change ERC20Token to interface 2018-05-07 23:37:45 -03:00
Richard Ramos 23eb306fab Merge branch '096-tribute-to-talk' of https://github.com/status-im/contracts into 096-tribute-to-talk 2018-05-07 09:32:18 -04:00
Richard Ramos d9e0d463b3 Updated package.json to include embark 3.0.0 2018-05-07 09:32:06 -04:00
Richard Ramos abe83d47e6
Updating readme 2018-05-07 09:28:55 -04:00
Richard Ramos d89586a6fc
Updated documentation to add Ropsten address 2018-04-30 07:20:27 -04:00
Richard Ramos dc162ffbb8 Merge branch '096-tribute-to-talk' of https://github.com/status-im/contracts into 096-tribute-to-talk 2018-04-27 11:37:54 -04:00
Richard Ramos 4b6b338449 Formatting parameters 2018-04-27 11:37:19 -04:00
Richard Ramos 3b0d17c979
Typo fix. 2018-04-27 11:11:28 -04:00
Richard Ramos 6440a0d2b4 Updated documentation 2018-04-27 11:07:22 -04:00
Richard Ramos c168779225 Finished the documentation for contract 2018-04-27 11:05:11 -04:00
Richard Ramos 01eb5964e5 Link to docs in Readme 2018-04-27 10:14:01 -04:00
Richard Ramos 766d5f8255 Adding documentation 2018-04-27 10:12:52 -04:00
Richard Ramos 037517eab0 Scope fix 2018-04-26 17:15:38 -04:00
Richard Ramos e6b9d24dc0 Removed comments 2018-04-26 17:11:33 -04:00
Richard Ramos cb5265d824 Updated test unit to reflect message signing logic 2018-04-26 17:08:59 -04:00
Ricardo Guilherme Schmidt 3ac4be7bbd encapstulate message hashing as views 2018-04-26 01:48:14 -03:00
Ricardo Guilherme Schmidt 6fbb3b703a bump solidity version 2018-04-26 01:39:02 -03:00