Commit Graph

163 Commits

Author SHA1 Message Date
Richard Ramos 344efdd06e Obtaining SNT balance 2018-05-22 09:49:22 -04:00
Ricardo Guilherme Schmidt aa93e03035 refactor 2018-05-22 07:46:29 -03:00
Ricardo Guilherme Schmidt f021b36058 merge 000-instance-factory 2018-05-22 07:44:49 -03:00
Barry Gitarts de974ec9d2 add proposal manager 2018-05-21 17:44:06 -04:00
Barry Gitarts 39234c5d92 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-05-21 17:42:34 -04:00
Barry Gitarts a60f36a9e2 add proposal manager 2018-05-21 17:42:23 -04:00
Richard Ramos 55f1e283a1 Moved files 2018-05-21 16:16:29 -04:00
Richard Ramos 3e44fa9b28 Adding ProposalContainer component and changed module.exports to export default 2018-05-21 16:15:46 -04:00
Richard Ramos c905809558 Creating dummy components for the voting dapp 2018-05-21 15:45:57 -04:00
Barry Gitarts 2f5656f2ed Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-05-21 14:30:46 -04:00
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