Commit Graph

184 Commits

Author SHA1 Message Date
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
Ricardo Guilherme Schmidt 6600ee5ccf add basic ethereum signing message methods 2018-04-26 01:03:55 -03:00
Ricardo Guilherme Schmidt 72a4b9e433 include dependency instance factory 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt fade1238b3 reorg 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt 31e362802f include dependency minimetoken 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt 3ee96f0144 reorg 2018-04-23 02:12:55 -03:00
Ricardo Guilherme Schmidt a1dd9d14a9 reorg 2018-04-23 02:11:21 -03:00
Ricardo Guilherme Schmidt 37135766e7 cleanup contents and update solc 2018-04-23 02:04:49 -03:00
Ricardo Guilherme Schmidt 6750c665e8 cleanup bootstrap 2018-04-23 01:58:58 -03:00
Ricardo Guilherme Schmidt 706941acb0 add return factoried contract address + add emit keyword 2018-04-19 05:33:04 -03:00
Richard Ramos a94156dd2f Merge from embark into develop 2018-04-09 10:18:44 -04:00
Ricardo Guilherme Schmidt 212f60d5f1 updated to new solidity keywords and linting 2018-03-30 02:31:08 -03:00
Ricardo Guilherme Schmidt ac54537b74 updated to new solidity keywords and linting 2018-03-30 02:31:08 -03:00
Ricardo Guilherme Schmidt d91bfb7f8e included fee collector, moved executed flag to democracy and + 2018-03-29 16:09:30 -03:00
Ricardo Guilherme Schmidt 497076382b fix typo 2018-03-28 18:37:17 -03:00
Ricardo Guilherme Schmidt f6b2174694 fix typo 2018-03-28 18:37:17 -03:00
Ricardo Guilherme Schmidt 587df6fe40 refactor constitution, abstract democracy 2018-03-28 18:33:33 -03:00
Ricardo Guilherme Schmidt 27d0fc24b6 democracy , constitution and factory refactor 2018-03-27 23:16:51 -03:00
Ricardo Guilherme Schmidt ed798f4a91 democracy , constitution and factory refactor 2018-03-27 23:16:51 -03:00