13 Commits

Author	SHA1	Message	Date
Jonathan Rainville	18f60768f9	fix when using mining script	2018-08-21 15:21:24 -04:00
Jonathan Rainville	dcc7b44377	fix miner	2018-08-21 15:20:12 -04:00
Michael Bradley, Jr	f91baf73bc	proxy -- canonicalHost, defaultHost	2018-08-02 15:36:25 -05:00
Richard Ramos	8f52dd4cf3	Missing semicolon	2018-06-12 10:15:54 -04:00
Richard Ramos	a9065b1eae	Websocket handling	2018-06-12 08:50:49 -04:00
Richard Ramos	a50e7c25a9	Not all messages received are json objects	2018-06-11 16:46:57 -04:00
Richard Ramos	03483052ea	Adding error messages	2018-06-11 16:43:26 -04:00
Richard Ramos	48a3f2afdc	Fixing conflicts	2018-06-11 16:43:08 -04:00
Richard Ramos	09c11662aa	Removing unused variables	2018-06-11 16:40:59 -04:00
Richard Ramos	a669538e70	Adding proxy to config, and closing on error	2018-06-11 16:40:59 -04:00
Richard Ramos	39d510cef4	Displaying status, gas and block number	2018-06-11 16:40:59 -04:00
Richard Ramos	c1621c4029	Websocket support	2018-06-11 16:40:59 -04:00
Richard Ramos	bf25381fa6	Rebasing changes from develop	2018-06-11 16:40:14 -04:00