29 Commits

Author	SHA1	Message	Date
Jonathan Rainville	de34486d8e	conflict in api	2018-08-22 19:18:10 -04:00
Michael Bradley, Jr	b99a8d3804	blockchain -- defaultHost, dockerHostSwap	2018-08-22 19:17:29 -04:00
Jonathan Rainville	c6d8cc80e4	remove useless change	2018-08-22 19:14:52 -04:00
Jonathan Rainville	7467494591	wip fixes	2018-08-22 19:14:25 -04:00
Iuri Matias	15aa5d6e75	fixes due to bad rebase	2018-08-22 18:32:43 -04:00
Michael Bradley, Jr	6bd72e709d	blockchain -- defaultHost, dockerHostSwap	2018-08-21 17:40:28 -04:00
Jonathan Rainville	15198ccf2a	remove useless change	2018-08-21 17:16:41 -04:00
Jonathan Rainville	93f568b6fc	wip fixes	2018-08-21 17:00:40 -04:00
Iuri Matias	8b97b4efb1	move back dev_funds file	2018-08-21 16:17:02 -04:00
Iuri Matias	792e7dff5b	lint is king	2018-08-21 16:12:57 -04:00
hodlbank	cc39931852	[m] Simplified networkId check for simulator.	2018-08-21 16:11:07 -04:00
hodlbank	b9cd0cf74e	[m] Setting up network id for simulator from blockchainConfig or options.	2018-08-21 16:11:07 -04:00
Iuri Matias	f90132af1e	remove line causing crash	2018-08-21 16:10:22 -04:00
Anthony Laibe	926ed7c258	Fix transaction logger	2018-08-21 16:09:49 -04:00
Michael Bradley, Jr	4821997866	resolve ganache-cli bin using pkg-up	2018-08-21 16:09:48 -04:00
Andre Medeiros	19c81e187b	Cleaning touches	2018-08-21 16:09:13 -04:00
Andre Medeiros	676f15fb49	Progress	2018-08-21 16:09:13 -04:00
Iuri Matias	58ba4bde48	move simulator & proxy to blockchain process module	2018-08-21 16:07:58 -04:00
Jonathan Rainville	363608287f	fixes and linting	2018-08-21 16:05:59 -04:00
Jonathan Rainville	0204eb6d46	swarm adjustements	2018-08-21 16:05:58 -04:00
Iuri Matias	29b0d01f22	move processes into core	2018-08-21 16:04:22 -04:00
Iuri Matias	8a5ccac1ee	fix requires	2018-08-21 16:03:35 -04:00
Iuri Matias	2f2b61da51	cleanup	2018-08-21 16:03:35 -04:00
Iuri Matias	5175b5710a	update to fix tests	2018-08-21 16:02:18 -04:00
Iuri Matias	dc86cbaccb	move proxy out of core	2018-08-21 16:02:18 -04:00
Iuri Matias	2ed7238190	move process files into processes folder	2018-08-21 16:02:18 -04:00
Iuri Matias	c32de30ca3	fix checking node connection	2018-08-21 16:02:18 -04:00
Iuri Matias	d7c67ffcf7	move blockchain process related files into blockchain module	2018-08-21 16:02:18 -04:00
Iuri Matias	2ea982d0e5	move blockchain process to own module	2018-08-21 16:01:14 -04:00