Commit Graph

348 Commits

Author SHA1 Message Date
Iuri Matias 0099078e94 fix lint 2018-07-18 17:53:37 +03:00
Iuri Matias c1809e3752 Merge branch 'fund_accounts' of github.com:embark-framework/embark into fund_accounts 2018-07-18 17:48:58 +03:00
Iuri Matias 20406ba51a fix lint 2018-07-18 17:47:53 +03:00
emizzle 9382f98933 Housekeeping and removal of none additions
Clean up debugging statements from fund_accounts.

Removed the addition of the nonce increment for contracts deploy as this was only affecting mneumonic-generated accounts which is not meant for dev environment.
2018-07-18 14:08:32 +02:00
Iuri Matias 91f1748d60 don't wait for account funds 2018-07-17 17:30:23 +03:00
Iuri Matias 231199c0dc ad missing emit 2018-07-17 16:13:12 +03:00
Iuri Matias d0162a6c78 move - for now - determining gas price to deployment to avoid race conditions 2018-07-17 15:10:22 +03:00
emizzle 296663edc7 password read from config file and fix for gasprice 2018-07-16 21:19:01 +02:00
emizzle 11d6980f70 further dev funding 2018-07-16 18:48:32 +02:00
Jonathan Rainville 8875b1b7ab trim the contract name to have the warning correctly 2018-07-12 12:36:54 -04:00
Iuri Matias 6ee387653d fix metamask check for non dev environment 2018-06-29 18:14:21 -04:00
Iuri Matias db3356cec0 detect if there is a connection error and pass it down to the ready function 2018-06-29 18:14:08 -04:00
Jonathan Rainville aa02aeb74c move pingEndpoint to utils 2018-06-19 09:02:19 -04:00
emizzle ba66d763fe Add support for infura network hosts with api key.
Fix bug with non-development code generation.
2018-06-19 15:14:37 +10:00
emizzle b56def7c57 Updated web3 endpoint for use with infura api key and https
Allows `protocol` to be specified in config/contract.js[on] for `<env>/deployment/protocol`.
2018-06-19 14:43:55 +10:00
Jonathan Rainville ed1ac3af2e register web3 after init 2018-06-18 14:33:25 -04:00
Jonathan Rainville a988962aed change package name 2018-06-18 09:26:17 -04:00
Iuri Matias 37ab60d6de
Merge pull request #538 from embark-framework/features/ws-node
Enable connection to websocket node
2018-06-15 18:01:12 -04:00
emizzle 15faf3a336 Fix for starting embark with a contract that has an error, then fixing, seems to still break the pipeline.
Needed to reset the `compileError` flag once compilation succeeded.
2018-06-15 17:31:17 -04:00
Jonathan Rainville eb0ccbe7cc remove useless param 2018-06-15 15:22:06 -04:00
Jonathan Rainville f32ac90e71 enable connecting to ws node in tests 2018-06-15 15:16:55 -04:00
Jonathan Rainville c8c0a5c42f enable websocket provider 2018-06-15 14:35:50 -04:00
Jonathan Rainville dcbd868b78 get gasPrice if no gasPrice set in contract.json 2018-06-14 15:22:50 -04:00
Iuri Matias a48a05cd27 remove unnended event listeners 2018-06-14 11:03:06 -04:00
Iuri Matias 5a2cf62ee5 reload config; create a config so it doens't damage original 2018-06-14 09:22:13 -04:00
Jonathan Rainville 8766c9b761 show warning if dependency is not deploying 2018-06-13 13:47:11 -04:00
Iuri Matias c8b52a1746 fix errors handling so it doesn't attempt to continue building when there are fatal errors compiling contracts 2018-06-08 07:07:27 -04:00
Jonathan Rainville a6a5bac053 use new provider when using account with a node specified 2018-06-07 16:07:58 -04:00
Jonathan Rainville 1b89199f50 fund accounts in wallet using contracts config 2018-06-07 13:06:09 -04:00
Jonathan Rainville a5ecd9f1f4 add tests for getBalance 2018-06-07 13:01:13 -04:00
Jonathan Rainville bb3e87d85e move getBalance in accountParser 2018-06-07 13:01:12 -04:00
Jonathan Rainville ac631f90dc fix missing error callback 2018-06-07 13:01:12 -04:00
Jonathan Rainville bfc8663a61 change account funding order to enable starting a node before 2018-06-07 12:55:07 -04:00
Iuri Matias cd6dcb7548 fix setting default account 2018-06-06 10:39:02 -04:00
Jonathan Rainville b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville 8664570d7c conflict in test 2018-06-01 13:43:43 -04:00
Jonathan Rainville d0a289a450 conflict in deployManager 2018-06-01 13:42:05 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
Iuri Matias 20d7496980 take into account errors when determining arguments 2018-05-31 10:02:57 -04:00
Iuri Matias 7d795fa180 remove unused var 2018-05-30 13:38:08 -04:00
Iuri Matias 4f20d31b4c add emitAndRunActionsForEvent 2018-05-30 13:38:08 -04:00
Iuri Matias 45f7767313 remove contracts manager dependency from deploy manager 2018-05-30 13:38:08 -04:00
Iuri Matias 1d782c0e53 emit contractsDeployed event only 2018-05-30 13:38:08 -04:00
Iuri Matias 68e6782f49 remove unneded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 9b368bc1b3 remove unneeded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 1912981d7d move contract deploy code to contract deployer; move it to events 2018-05-30 13:38:08 -04:00
Iuri Matias 70f38d863e fix code generator event 2018-05-30 13:35:36 -04:00
Iuri Matias 69e5af2308 replace beforeAction plugin api with event action api 2018-05-30 13:35:36 -04:00
Iuri Matias 16653d491b move onDeploy to new api 2018-05-30 13:35:36 -04:00
Iuri Matias 93e5003c64 cleanup 2018-05-30 13:35:36 -04:00
Iuri Matias 4f45b4fa13 add new plugin method for generalized event actions 2018-05-30 13:35:36 -04:00
Iuri Matias f08bb56337 simplify determine args method 2018-05-30 13:35:36 -04:00
Iuri Matias cf13f098ac refactor deploy method 2018-05-30 13:35:36 -04:00
Iuri Matias f4010bd66e remove unnecessary determin params call 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 3f9c55131b use requests instead of contractsManager directly 2018-05-30 13:35:36 -04:00
Iuri Matias 5f64376c84 refactor generateContractsJson 2018-05-30 13:35:36 -04:00
Iuri Matias fc92b69211 use self 2018-05-30 13:35:03 -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