Commit Graph

1635 Commits

Author SHA1 Message Date
Jonathan Rainville 063472a07e skip build if cmpile only 2018-06-25 12:03:22 -04:00
emizzle 7187be969e Fix for `embark build --contracts` writing into the pipeline 2018-06-25 12:03:15 -04:00
Iuri Matias 5a429d0574 make linter happy 2018-06-21 21:07:27 -04:00
Iuri Matias 0ba9990073 use EmbarkJS to initialize ens contracts and set ens contract only when embark is ready 2018-06-21 21:03:23 -04:00
Iuri Matias 650eb5e359 disable ipc client 2018-06-19 17:33:24 -04:00
Iuri Matias aa5063e5ef
Merge pull request #562 from embark-framework/remove_extra_messages
remove extra logs
2018-06-19 15:49:37 -04:00
Iuri Matias 9beaaa2a29 remove extra logs 2018-06-19 15:46:55 -04:00
Iuri Matias 6a031e1dab warn if old cmd is used 2018-06-19 14:07:14 -04:00
Iuri Matias 9574562602
Merge pull request #558 from embark-framework/bug_fix/console-dir-test
Fix testing a directory without ending slash
2018-06-19 11:40:44 -04:00
Jonathan Rainville c1f29fdea4 fix test directory without ending slash 2018-06-19 10:58:09 -04:00
Jonathan Rainville 01277f6014 start web3 service so getGasPrice is available 2018-06-19 10:03:46 -04:00
Jonathan Rainville 1a91f3c688 ping endpoint before connecting to see if available 2018-06-19 09:24:36 -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
Iuri Matias 329af9f348 warn about EmbarkSpec deprecation 2018-06-18 12:46:39 -04:00
Iuri Matias b7d6bc1c45
Merge pull request #547 from embark-framework/contracts_api_fix
Contracts api fix
2018-06-18 11:38:27 -04:00
Iuri Matias a0a2d16cb3
Merge pull request #546 from embark-framework/fix_contract_tracking_issue
fix contract tracking issue
2018-06-18 11:38:16 -04:00
Iuri Matias 7bf1f2420f
Merge pull request #545 from embark-framework/debug_options
add debug option correctly
2018-06-18 11:37:48 -04:00
Iuri Matias 231e48cecb add todo 2018-06-18 11:37:23 -04:00
Iuri Matias b34ddf32cf refactor pluginPath 2018-06-18 11:27:29 -04:00
Iuri Matias e0e3887aaf add command event to add a contract file; fix internal plugin Path 2018-06-18 11:25:43 -04:00
Iuri Matias 5c6e6e50f9 use contractAddress instead of address 2018-06-18 10:22:04 -04:00
Iuri Matias 76ab330546 add debug option 2018-06-18 09:44:16 -04:00
Jonathan Rainville a988962aed change package name 2018-06-18 09:26:17 -04:00
emizzle bb4fdbe369 Run `ipfs init` for the case when user has installed ipfs, but not initialised it.
Runs `ipfs daemon` first, reads stdout for message regarding ipfs not initialised, then runs `ipfs init`, then re-runs `ipfs daemon`.
2018-06-18 22:34:42 +10:00
Iuri Matias 7706e276bf
Merge pull request #533 from embark-framework/bug_fix/ipfs-service-check-error
Storage provider initialisation fixes and improvements.
2018-06-15 18:09:30 -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
Iuri Matias 5614998f89
Merge pull request #525 from embark-framework/bug_fix/solc-loading-issue
Fix for solc loading issue
2018-06-15 17:28:53 -04:00
Iuri Matias 440593f9f0
Merge pull request #539 from embark-framework/bug_fix/simple-app-watch
fix watch for simple apps
2018-06-15 17:24:55 -04:00
Iuri Matias 6b11fb9e45
Merge pull request #540 from embark-framework/profilerErrorLogFix
small fixes to ensure something of a better experience for error reports
2018-06-15 17:24:35 -04:00
Iuri Matias 6845c7124b fix eqls 2018-06-15 17:24:19 -04:00
emizzle ffe0157543 removed unneeded comment 2018-06-15 17:06:59 -04:00
emizzle a100dd4260 Requested PR fixes
Added catch to live-plugin-manager install promise running in child process

Removed some `else`'s ;)

Only showing solc downloading spinner when `--nodashboard` option is used.

When installing package in main process and simultaneous downloads fail, all callbacks called with error.

Updated logging in npmTimer.
2018-06-15 17:06:59 -04:00
emizzle 5e20f27c99 Solc loading issue now fully resolved
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
2018-06-15 17:06:59 -04:00
emizzle b96df79c59 Finally fixed the solc loading issue.
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
2018-06-15 17:06:59 -04:00
emizzle ceb57cfdf6 removed unneeded log message 2018-06-15 17:02:54 -04:00
emizzle eedcdc77a7 Solc loading issue now fully resolved
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
2018-06-15 17:02:53 -04:00
emizzle 62f3b85bc4 Finally fixed the solc loading issue.
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
2018-06-15 16:54:08 -04:00
Iuri Matias 5ee9843973
Merge pull request #541 from embark-framework/bug_fix/testnet-hang
remove deprecated geth params
2018-06-15 16:46:16 -04:00
Iuri Matias dae9e4ae7f
Merge pull request #460 from embark-framework/fix_overridecompiler
Allow plugins to override core compilers
2018-06-15 16:39:09 -04:00
Jonathan Rainville d77083ee8c enable syncMode 2018-06-15 16:33:59 -04:00
VoR0220 ad6a6cf328 small fixes to ensure something of a better experience for error reporting on the profiler side
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 15:22:27 -05:00
Jonathan Rainville e9becec515 sorry senior lint 2018-06-15 15:58:19 -04:00
Jonathan Rainville 2996f51314 fix watch for simple apps 2018-06-15 15:50:23 -04:00
Jonathan Rainville eb0ccbe7cc remove useless param 2018-06-15 15:22:06 -04:00
Jonathan Rainville 55bd69baa5 rmeove logs 2018-06-15 15:18:39 -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
VoR0220 391777d5bf fix test app config and swap olympic for rinkeby as testnet option
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 13:18:37 -05:00
Jonathan Rainville 6991215b40 catch error and warn if no provider 2018-06-15 10:04:19 -04:00
emizzle 24e1ed36f7 Fixed issue with IPFS not starting when swarm failed.
Added logging when starting of all storage providers has completed, and whether or not there were errors during starting of one of the providers.

Added parallel processing for starting dappConnection storage providers.

Removed irrelevant IPFS error from trace logs when IPFS not available.
2018-06-15 16:35:05 +10:00
Jonathan Rainville 6d4d904825 sort by internal so first ones are internal and plugins last 2018-06-14 16:58:03 -04:00
Jonathan Rainville 930aa72bc6 revert original changes, sorry Ramos 2018-06-14 16:57:38 -04:00
Richard Ramos dac06c10ea Change based in code review 2018-06-14 16:29:23 -04:00
Richard Ramos 02de6089ed Changed code to allow registering more than one compiler for same ext. 2018-06-14 16:29:23 -04:00
Richard Ramos a058fbd349 Removing warning from appveyor 2018-06-14 16:29:23 -04:00
Richard Ramos 3dd4b2ada9 Verify that compiler for extension hasn't been loaded 2018-06-14 16:29:22 -04:00
Jonathan Rainville dcbd868b78 get gasPrice if no gasPrice set in contract.json 2018-06-14 15:22:50 -04:00
Jonathan Rainville a09f680ca7 fix testnet and olympic network types 2018-06-14 15:22:01 -04:00
Iuri Matias 9a261681da
Merge pull request #530 from embark-framework/bug_fix/after-deploy-dev
Add file build to embark build and fix afterDeploy
2018-06-14 12:11:16 -04:00
Iuri Matias 502788c7e0
Merge pull request #528 from embark-framework/cached_gas_issue
fix cached gas issue
2018-06-14 11:17:54 -04:00
Jonathan Rainville a62a74d162 callback error from runCode and use that in onDeploy codes 2018-06-14 11:10:31 -04:00
Iuri Matias a48a05cd27 remove unnended event listeners 2018-06-14 11:03:06 -04:00
Jonathan Rainville d90d591fdc fix after deploy and build files 2018-06-14 10:39:39 -04:00
Iuri Matias 50ff4d4a48
Merge pull request #527 from embark-framework/bug_fix/test-app-file-bug
Fix watch by not restarting anymore and enable config for contracts
2018-06-14 09:54:12 -04:00
Iuri Matias 5a2cf62ee5 reload config; create a config so it doens't damage original 2018-06-14 09:22:13 -04:00
Iuri Matias be6ada2909 remove old instructions 2018-06-14 09:22:13 -04:00
Jonathan Rainville 37b69b43ff fix watch by not restarting anymore and enable config for contracts 2018-06-14 09:15:31 -04:00
Iuri Matias 8fe9ccedf2 don't send message if process isn't connected 2018-06-13 14:56:26 -04:00
Iuri Matias 977b472217
Merge pull request #523 from embark-framework/bug_fix/bad-branch
Fix callback already called on file download fail
2018-06-13 14:42:08 -04:00
Jonathan Rainville e1c5487ba4 fix callback already called on file download fail 2018-06-13 14:37:15 -04:00
Iuri Matias d44021d7f9
Merge pull request #522 from embark-framework/zombie_fix
track if couldn't send message to parent process
2018-06-13 14:23:59 -04:00
Iuri Matias f1f4f2520c reset counter 2018-06-13 14:09:59 -04:00
Iuri Matias 9219c17924 return process send 2018-06-13 14:00:21 -04:00
Iuri Matias a62122a6d3 track if couldn't send message to parent process 2018-06-13 13:53:55 -04:00
Jonathan Rainville 8766c9b761 show warning if dependency is not deploying 2018-06-13 13:47:11 -04:00
Iuri Matias 3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix
use neo blessed
2018-06-13 11:44:47 -04:00
Iuri Matias 06eb0eda95
Merge pull request #517 from embark-framework/package_fix
point to a forked npm package (for now), to avoid the npm install iss…
2018-06-13 11:36:12 -04:00
Iuri Matias daaee7d828 use neo-blessed 2018-06-13 11:17:55 -04:00
Jonathan Rainville 8205f91802 enable loglevel for test logger and actually log 2018-06-13 09:44:19 -04:00
Iuri Matias 19aa117503 update references to package 2018-06-13 09:40:19 -04:00
Iuri Matias 735e72703b
Merge pull request #515 from embark-framework/jsonfix
fix support for .json file in embark.json
2018-06-12 18:03:43 -04:00
Iuri Matias aa01bd37a8
Merge pull request #514 from embark-framework/bug_fix/no-good-file
stop test execution if file doesn't exist
2018-06-12 18:01:06 -04:00
Iuri Matias 5ccbdbb41c
Merge pull request #513 from embark-framework/remove_backtrace
remove anoying backtrace
2018-06-12 18:00:02 -04:00
Iuri Matias 4131cf42ef fix support for .json file in embark.json 2018-06-12 17:59:14 -04:00
Jonathan Rainville 0f84fe2127 fix callback 2018-06-12 15:32:38 -04:00
Jonathan Rainville ef5e1e2707 stop test execution if file doesn't exist 2018-06-12 15:12:50 -04:00
Iuri Matias e6ed016cc0
Merge pull request #510 from embark-framework/gastimation
Gastimation
2018-06-12 14:11:28 -04:00
Iuri Matias e0ff5b3580 remove anoying backtrace 2018-06-12 13:58:21 -04:00
VoR0220 41f77793f4 more patchy mcpatchface
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:54:41 -05:00
VoR0220 3ede75ce50 Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 12:52:36 -05:00
VoR0220 258d9b3fe0 patchy mcpatchface
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:52:23 -05:00
Iuri Matias a88513f58d Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 13:24:30 -04:00
Iuri Matias 1dcd30b3a8 don't crash and instead inform user if contract cannot be profiled 2018-06-12 13:24:21 -04:00
VoR0220 acf67071c8 fix name
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:21:31 -05:00
VoR0220 cd67500dd1 minor cleanup
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:16:19 -05:00
VoR0220 539c035aa6 unnecessary declaration
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:14:02 -05:00
VoR0220 a601541bb0 get rid of one more line and get rid of unused cb
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:12:37 -05:00
VoR0220 43c8525d48 fix callbacks in gas estimator, add more fallback support and clean up console logs to better display potential errors
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:10:35 -05:00
Iuri Matias 5b1eeab7ed make debug a default api option 2018-06-12 12:21:46 -04:00
Iuri Matias 4ebeb86c3c
Merge pull request #506 from embark-framework/bug_fix/slow-pipeline
Speed up the webpack process a little bit
2018-06-12 12:15:02 -04:00
Iuri Matias 03870953a7
Merge pull request #508 from embark-framework/test_fixes
warn if configured account has no funds
2018-06-12 12:10:05 -04:00
Iuri Matias 79282f8d64
Merge branch 'develop' into bug_fix/slow-pipeline 2018-06-12 12:06:01 -04:00
Iuri Matias ad4c79390a
Merge pull request #504 from embark-framework/conn-proxy
Proxy for inspecting function calls for contracts and retrieve trx information and display it on console
2018-06-12 12:02:20 -04:00
VoR0220 e0470b8ef4 clean up junk and fix logger formatting
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:44:21 -05:00
VoR0220 335670f2ca package lock update and linting errors fixed
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:39:45 -05:00
VoR0220 57f098239d add support for null inputs and fallback and constructor types
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
VoR0220 0ff39f48b3 fix the callback schema for async and pretty it up a bit
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
VoR0220 90f342b65a redo logic so that it uses the async library
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
VoR0220 5c7e9f0054 changes to the logic around gas estimator and profiler
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
VoR0220 311ec7d9cb switch the keys around and make a few logical changes to the way things are structured. Currently stuck at method calling
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
VoR0220 fedbe0d2bc first attempt at gas estimation using a 3 round fuzzer and linking it into the profiler
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -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
Iuri Matias 787162575e
Merge pull request #507 from embark-framework/bug_fix/webpack-piling
kill webpack processes when they are done
2018-06-11 17:31:30 -04:00
Iuri Matias 56724aecd4 lint is king 2018-06-11 17:22:08 -04:00
Richard Ramos a50e7c25a9 Not all messages received are json objects 2018-06-11 16:46:57 -04:00
Richard Ramos 9e92069667 Fixing conflicts 2018-06-11 16:44:34 -04:00
Richard Ramos 03483052ea Adding error messages 2018-06-11 16:43:26 -04:00
Richard Ramos 38e6a9571d Updating tests 2018-06-11 16:43:26 -04:00
Richard Ramos 48a3f2afdc Fixing conflicts 2018-06-11 16:43:08 -04:00
Iuri Matias e46f6aa5b7 color output 2018-06-11 16:40:59 -04:00
Iuri Matias a4985fde40 make proxy mode the default 2018-06-11 16:40:59 -04:00
Richard Ramos 80052fc5e1 Displays json as a string in the console 2018-06-11 16:40:59 -04:00
Richard Ramos 6040509942 Adding line break 2018-06-11 16:40:59 -04:00
Richard Ramos f467fc5a31 Launching ipc connection depending on role 2018-06-11 16:40:59 -04:00
Richard Ramos 09c11662aa Removing unused variables 2018-06-11 16:40:59 -04:00
Richard Ramos 0f853ba841 Typo 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 c9a2014ac7 Formatting input parameters 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 8ef2dc124f Extracted console logging to its own file 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
Richard Ramos 05f5a145f1 Added proxy to blockchain 2018-06-11 16:38:29 -04:00
Richard Ramos 84c01c3197 Extracted proxy to its own file 2018-06-11 16:38:29 -04:00
Richard Ramos 339ffa5869 Adding proxy for simulator 2018-06-11 16:38:29 -04:00
Iuri Matias 20acb5425f remove comment 2018-06-11 16:34:41 -04:00
Jonathan Rainville 812cefafb1 kill processes when they are over 2018-06-11 15:55:57 -04:00
Iuri Matias 4aab8cd374 warn if configured account has no funds 2018-06-11 14:39:17 -04:00
Jonathan Rainville 046cb46ff4 move requires inside functions that need them 2018-06-11 14:36:52 -04:00
Iuri Matias 6b26f2a9d7 set default gas 2018-06-11 13:37:06 -04:00
Iuri Matias 8783f04a9c add node version of embarkjs to avoid export issues with webpack.. (for now...) 2018-06-10 12:55:59 -04:00
Iuri Matias c4ca4e52b8 support embarkjs in the tests 2018-06-10 12:11:34 -04:00
Iuri Matias c6e63af12d remove unneded param 2018-06-08 13:55:24 -04:00
Iuri Matias aff1dabb3a
Merge pull request #499 from embark-framework/dont_continue_on_errors
Fix tests error reporting when there are deployment errors
2018-06-08 13:02:13 -04:00
Iuri Matias 7fd7c770de
Merge pull request #501 from embark-framework/bug_fix/storage-message
Put message if swarm or ipfs is not installed
2018-06-08 12:55:29 -04:00