Commit Graph

203 Commits

Author SHA1 Message Date
Barry Gitarts 46a063bab5 small cleanup 2018-05-21 14:29:57 -04:00
Richard Ramos a73dd44783 Updated contracts.json to not deploy anything initially 2018-05-21 14:14:47 -04:00
Ricardo Guilherme Schmidt ea0ea87ba1 Merge branch 'minimetoken' into 172-topic-democracy 2018-05-21 14:46:36 -03:00
Ricardo Guilherme Schmidt bea6deb15e improve tests 2018-05-20 20:52:26 -03:00
Ricardo Guilherme Schmidt c76a499b31 Merge branch 'bootstrap' into minimetoken 2018-05-19 23:36:46 -03:00
Ricardo Guilherme Schmidt 9f97714ba5 add test to controlled, use "Contract" as generic name 2018-05-19 23:36:34 -03:00
Ricardo Guilherme Schmidt b68fc98b71 add test for Controlled 2018-05-19 23:36:12 -03:00
Ricardo Guilherme Schmidt 6c5e6ce311 Merge branch 'bootstrap' into minimetoken 2018-05-19 22:38:45 -03:00
Ricardo Guilherme Schmidt 1582881629 improve abstract erc20token test 2018-05-19 22:37:58 -03:00
Ricardo Guilherme Schmidt 469a16cab1 start testscript for minimetoken 2018-05-19 22:37:40 -03:00
Ricardo Guilherme Schmidt e6694854e4 Merge branch 'bootstrap' into minimetoken 2018-05-19 17:00:33 -03:00
Ricardo Guilherme Schmidt e63ae2af6e make erc20token test abstract 2018-05-19 17:00:16 -03:00
Ricardo Guilherme Schmidt 3a31893538 require tokenfactory in mmt constructor, fixes in interfaces, bump solcv 2018-05-19 16:53:46 -03:00
Ricardo Guilherme Schmidt cfb26fc1c3 Merge branch 'bootstrap' into minimetoken 2018-05-19 16:17:29 -03:00
Ricardo Guilherme Schmidt 204892e3ce add placement of dropdown, balances, addresses are accounts 2018-05-19 03:09:13 -03:00
Ricardo Guilherme Schmidt 70b7d13ffc add account list 2018-05-18 16:17:46 -03:00
Ricardo Guilherme Schmidt 082c1d19b7 add topbar 2018-05-17 16:53:23 -03:00
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