238 Commits

Author SHA1 Message Date
Jonathan Rainville
a112f18d93 always deploy contracts when in tests and make all test work 2018-06-01 10:05:43 -04:00
Jonathan Rainville
1176a2e8be make require and test work 2018-05-31 08:37:21 -04:00
Jonathan Rainville
093bd13c6a build only once 2018-05-31 08:37:21 -04:00
Jonathan Rainville
b5e96beb81 little oopsie 2018-05-30 12:07:48 -04:00
Jonathan Rainville
ff0d24aa1f Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process
# Conflicts:
#	lib/contracts/blockchain.js
2018-05-30 12:02:30 -04:00
Jonathan Rainville
b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville
a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00
Jonathan Rainville
4d0453fede
Merge pull request #468 from embark-framework/fix_service_check
early return if failing to connect to node
2018-05-30 08:24:15 -04:00
Iuri Matias
cd96aebdcd early return if failing to connect to node 2018-05-28 17:55:59 -04:00
VoR0220
52524c2f59 eliminate nasty outdated test
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 13:22:48 -05:00
Iuri Matias
6c921e3a85 fix typo 2018-05-28 13:58:49 -04:00
Iuri Matias
1eee68e901 fix typo; default environment to development 2018-05-28 13:53:10 -04:00
VoR0220
6fe3064edd spelling correction of metamask
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:45:14 -05:00
VoR0220
f34bd5df4f env check
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:28:38 -05:00
VoR0220
90b42bccb2 template correction to check for development environment and whether metamask is engaged and log that it is
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:27:55 -05:00
Jonathan Rainville
8d9c192e91 fix little oopsie in waterfall 2018-05-28 11:53:35 -04:00
Iuri Matias
ef3bde1053 add missing code init 2018-05-28 11:42:22 -04:00
Jonathan Rainville
a69d12e637 pass isDev and locale to process 2018-05-23 11:52:07 -04:00
Jonathan Rainville
871c2fb228 fix tests 2018-05-23 11:17:02 -04:00
Jonathan Rainville
6145c0b92c start node only when no node is present 2018-05-23 11:17:02 -04:00
Jonathan Rainville
29a50ea9cd refactor assertNodeConnection to use it in watch 2018-05-23 11:17:02 -04:00
Iuri Matias
315d8c2197 fix merge 2018-05-23 11:17:02 -04:00
Jonathan Rainville
47591a39dd restart web3 service on proces launch 2018-05-23 11:17:01 -04:00
Jonathan Rainville
aea270af02 detect no node using request 2018-05-23 11:17:01 -04:00
Iuri Matias
201ec6c652 remove unneeded web3 object assignment 2018-05-23 11:17:01 -04:00
Jonathan Rainville
5f3361d030 conflict in en.json 2018-05-23 11:16:56 -04:00
Iuri Matias
3e9376138b move runCode 2018-05-23 11:16:17 -04:00
Jonathan Rainville
592b4ed4fd conflict in code_generator 2018-05-23 11:16:13 -04:00
Iuri Matias
30b1975e34 use request to get contract 2018-05-23 11:15:06 -04:00
Iuri Matias
c83064adf6 use request to get contract 2018-05-23 11:15:06 -04:00
Iuri Matias
7cebbec7b6 make determine arguments async 2018-05-23 11:15:06 -04:00
Iuri Matias
c0549a6642 refactor to waterfall, in preparation to making determine arguments async 2018-05-23 11:15:06 -04:00
Iuri Matias
3fb2b6fa60 remove direct reference to contracts manager, use a request instead 2018-05-23 11:15:06 -04:00
Iuri Matias
98c5b2dd06 move contractsState emit to contracts 2018-05-23 11:15:06 -04:00
Iuri Matias
250e0b8798 adjust contracts events emission 2018-05-23 11:15:06 -04:00
Iuri Matias
a664492d1f move onDeploy to special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias
31833579a7 finish converting afterDeploy module 2018-05-23 11:15:06 -04:00
Iuri Matias
c800598e9b move afterDeploy code into a special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias
21026e07ae remove unnecessary passing of params around 2018-05-23 11:15:06 -04:00
Iuri Matias
000d7beb27 move code to assert connection to blockchain module 2018-05-23 11:15:06 -04:00
Iuri Matias
0ec4698e6b fix compiler tests 2018-05-23 11:15:05 -04:00
Iuri Matias
16eaacbd54 call compiler through a request 2018-05-23 11:15:05 -04:00
Iuri Matias
0fcf508e17 associate address to contract 2018-05-23 11:15:05 -04:00
Iuri Matias
ba29f0e928 move deploy tracker into a module 2018-05-23 11:15:05 -04:00
Iuri Matias
78f64945ab remove web3 dependency from deploy tracker; use request instead to get block 2018-05-23 11:15:05 -04:00
Iuri Matias
a8e29976b7 move deploy to blockchain component 2018-05-23 11:15:05 -04:00
Iuri Matias
9b1a78cdaa move Contract object to blockchain module 2018-05-23 11:15:05 -04:00
Iuri Matias
84dcfca254 move getBlock to blockchain module 2018-05-23 11:15:05 -04:00
Iuri Matias
1547a115a4 move getCode to blockchain 2018-05-23 11:15:05 -04:00
Iuri Matias
ae93d78cc2 move accounts to web3 module 2018-05-23 11:15:04 -04:00