Commit Graph

2606 Commits

Author SHA1 Message Date
emizzle 1c27c3465b
Handle case when socket not opened
If the socket is not already opened, listen for ‘open’ event before sending the `outputDone` data.
2018-10-22 19:24:41 +02:00
Anthony Laibe 91d1e5a85e
Fix websocket not open
Make sure the connection is open before
sending the event
2018-10-22 19:24:41 +02:00
Iuri Matias 4b81968482
restore ws functionality to webserver 2018-10-22 19:24:41 +02:00
StevenJNPearce 3aad35209a
Add browser reload on file change/rebuild
Add browser reload on file change/rebuild
2018-10-22 19:13:50 +02:00
Iuri Matias a7a6a03bfe make linter happy 2018-09-28 16:38:42 -04:00
Iuri Matias 24d661a65e fix blockchain defaults for config-less dapps 2018-09-28 16:32:37 -04:00
Iuri Matias a41bdf1b4a output contracts json even if the pipeline is empty 2018-09-28 13:22:03 -04:00
Iuri Matias 69894d2e06
Merge pull request #916 from embark-framework/infura_fix
Infura fix
2018-09-26 19:04:26 -04:00
Iuri Matias 05962a288d lint is mother; lint is father 2018-09-26 18:57:55 -04:00
Iuri Matias 44dad44ef4 increase estimated gas slightly & randomly 2018-09-26 18:45:06 -04:00
Iuri Matias 2374cb1641 limit deployment to 1 for now 2018-09-26 18:44:36 -04:00
Andre Medeiros c81deb9a2d Don't log that we don't know how to handle node 2018-09-26 18:36:56 -04:00
Iuri Matias 3ae5157e47 Revert "Delay contract deploiement if share bytecode"
This reverts commit 527dbcca8b.
2018-09-26 17:39:11 -04:00
Iuri Matias 8d13cd8e9d
Merge pull request #905 from embark-framework/bugfix/infura-simultaneous-tx
Bugfix/infura simultaneous tx
2018-09-26 14:21:30 -04:00
Andre Medeiros 767687b297 Simplify concat 2018-09-26 11:47:02 -04:00
Andre Medeiros b1f9097824 Update function complexity 2018-09-26 11:23:52 -04:00
Andre Medeiros fa8f4b4e41 Support if statements without a list of statements 2018-09-26 11:13:14 -04:00
Iuri Matias 0848d81b3e
Merge pull request #906 from embark-framework/bugfix/ens-require-default-account
Warning if no default account for ens
2018-09-26 09:28:41 -04:00
Iuri Matias 06c0171c39
Merge pull request #908 from embark-framework/bugfix/warn-about-ethereum-node-going-away
Warn about Ethereum node going away
2018-09-26 09:25:35 -04:00
Iuri Matias b4dc48dc32
Merge pull request #904 from embark-framework/bug_fix/ipfs-own-cors
add CORS URL for local ipfs' own server
2018-09-26 08:58:07 -04:00
Iuri Matias c06f39d53e
Merge pull request #899 from embark-framework/bugfix/filter-interface-contracts-from-coverage
Filter out interfaces from the coverage report
2018-09-26 08:53:12 -04:00
Andre Medeiros ad2eb9ad9f Warn, don't trace 2018-09-25 12:41:22 -04:00
Anthony Laibe 23d6b07467 Warning if no default account for ens 2018-09-25 15:30:46 +01:00
Michael Bradley, Jr 36eabda506 rev error handling so error msg from hosted-git-info would be logged 2018-09-25 09:20:59 -05:00
Anthony Laibe b8d3f3cd11 Fix warning 2018-09-25 14:59:08 +01:00
Anthony Laibe 527dbcca8b Delay contract deploiement if share bytecode 2018-09-25 14:58:19 +01:00
Michael Bradley, Jr 16246b1d43 rm unneeded param/arg 2018-09-24 21:07:02 -05:00
Michael Bradley, Jr cad7843c78 add CORS URL for local ipfs' own server (default: localhost:8080) 2018-09-24 20:51:31 -05:00
Michael Bradley, Jr 999d65bda0 whitespace 2018-09-24 20:50:27 -05:00
Michael Bradley, Jr cf67bd0332 rename var 2018-09-24 19:26:51 -05:00
Michael Bradley, Jr d945f8f2f4 don't log complete/ready messages until after `npm install` 2018-09-24 17:44:53 -05:00
Michael Bradley, Jr 67f57217d5 log re: installing pkgs for built-in boilerplate not just demo 2018-09-24 17:44:53 -05:00
Michael Bradley, Jr c8a9ac6048 tweak log messages 2018-09-24 17:44:53 -05:00
Michael Bradley, Jr c2d92b19f3 log browsable url from info gen'd by hosted-git-info 2018-09-24 17:44:53 -05:00
Michael Bradley, Jr 1b7935678c use hosted-git-info pkg to process --template name/url 2018-09-24 17:44:53 -05:00
Iuri Matias e744a24557
Merge pull request #897 from embark-framework/bug_fix/template-downloader-branch-names
allow for '/' in branch name when handling github shortcuts
2018-09-24 16:45:31 -04:00
Andre Medeiros 099e398bf4 Filter out interfaces from the coverage report 2018-09-23 19:08:06 -04:00
Andre Medeiros e952bbc41a Fix contract matching 2018-09-23 18:40:51 -04:00
Michael Bradley, Jr 82de81015b allow for / in branch name when handling github shortcuts 2018-09-23 12:34:23 -05:00
Iuri Matias 9ed08f234d
Merge pull request #895 from embark-framework/bugfix/race-condition-deploy-tracker
Fix race condition on deploy tracker
2018-09-22 10:36:15 -04:00
Anthony Laibe 8d506971e8 BN.js udpated need toString 2018-09-22 15:34:54 +01:00
Anthony Laibe 1dfd2e980f Reduce coupling by using action for event 2018-09-22 15:08:50 +01:00
Anthony Laibe e20d7bfc6a Fix race condition on deploy tracker 2018-09-22 14:43:10 +01:00
Iuri Matias c569dc9d21 add missing semi-colon 2018-09-22 09:21:30 -04:00
Anthony Laibe fe3e4690f6 Remove useless try on ws connect 2018-09-22 13:59:19 +01:00
Iuri Matias 7e710745ce always add ens contracts source so abi definition is always available in environments the contract is already deployed 2018-09-21 19:02:44 -04:00
Iuri Matias 681dddbbf2
Merge pull request #889 from embark-framework/bugfix/ipfs-hash-fetch
Fetch IPFS dir hash deterministically
2018-09-21 18:29:24 -04:00
Iuri Matias 2586b0dc14
Merge pull request #888 from embark-framework/bugfix/resolve-private-key-path
Resolve private key path instead of forcing inside dApp root
2018-09-21 18:29:02 -04:00
Iuri Matias 50effc0a6c revert change made on ens module 2018-09-21 18:26:18 -04:00
Iuri Matias cafe472727 add missing space 2018-09-21 18:16:47 -04:00
Iuri Matias 78814dc9d6 only add & deploy fifs register if it's actually a non live env 2018-09-21 17:53:42 -04:00
Iuri Matias 3b6251eeb1 improve some deployment error messages 2018-09-21 17:52:32 -04:00
Iuri Matias 4af9114681 fix blockchain node not found msg so it actually shows red 2018-09-21 17:51:53 -04:00
Andre Medeiros 0bdafc273f Fetch IPFS dir hash deterministically 2018-09-21 16:52:39 -04:00
Andre Medeiros 12c495502d Resolve private key path instead of forcing inside dApp root 2018-09-21 14:04:04 -04:00
Anthony Laibe 1b649d0e3a
Merge pull request #885 from embark-framework/bugfix/blockchain-not-done
Bugfix/blockchain not done
2018-09-21 15:11:20 +01:00
Iuri Matias 71cbb07ad8
Merge pull request #878 from embark-framework/bug_fix/minewhenneeded-fixes-3
Fix datadir for miner (PR for next branch)
2018-09-21 09:36:06 -04:00
Iuri Matias 9a914d0b5a
Merge pull request #877 from embark-framework/bug_fix/proxy-setup-awaits-blockchain
proxy should try to wait on target endpoint
2018-09-21 09:31:48 -04:00
Anthony Laibe d5d0aa1600 EmbarkJS blockchain must be done 2018-09-20 11:15:48 +01:00
Anthony Laibe 907b486531 Send ready only when the proxy is started 2018-09-20 10:16:48 +01:00
Iuri Matias 4a321e3c0c coerce boolean value using more commmon !! 2018-09-20 15:33:33 +10:00
emizzle ab7784c1e9 Fix datadir for miner
The datadir path was not being passed to the miner, was resolving as `undefined`, and therefore, was not setting up an ipc connection correctly and no communication was happening.

The fix passes the `datadir` from the blockchain config to the miner in the constructor.
2018-09-20 15:30:06 +10:00
emizzle c477445896 Start HTTP and WS proxies individually
As geth is starting up, the output is monitored for endpoint info. Once the HTTP or WS endpoints are opened, the corresponding proxies are started.

This is more maintainable in the long run in case the geth process being started does not allow for rpc or websockets, or geth modifies the order in which endpoint are opened.
2018-09-20 15:08:02 +10:00
Michael Bradley, Jr eba9ce361e setupProxy should not be conditional on isDev 2018-09-19 22:31:54 -05:00
Michael Bradley, Jr 917757b04c outer function doesn't need to be async 2018-09-19 21:13:19 -05:00
Michael Bradley, Jr e19b3b2f51 simplify syntax 2018-09-19 21:13:06 -05:00
Michael Bradley, Jr 2b816af9a8 eslint doesn't like `void 0` here 2018-09-19 21:12:37 -05:00
Michael Bradley, Jr 1408abf8d9 supply radix 2018-09-19 21:12:20 -05:00
Michael Bradley, Jr fa274675a5 timer function doesn't need to be async, since it returns a promise 2018-09-19 21:11:55 -05:00
Michael Bradley, Jr 4fc9827080 need parent contract's realRuntimeBytecode 2018-09-19 20:55:00 -05:00
Michael Bradley, Jr aae7954020 await proxy just before createFundAndUnlockAccounts 2018-09-19 20:11:36 -05:00
Michael Bradley, Jr 35c772d727 async setupProxy 2018-09-19 20:10:46 -05:00
Michael Bradley, Jr b9975668b8 proxy should attempt to wait on target 2018-09-19 20:10:15 -05:00
Michael Bradley, Jr 3846db79f7 make sure port is an integer, port var should hold offset port value 2018-09-19 20:10:15 -05:00
Michael Bradley, Jr ae8a59cf9b timer utility 2018-09-19 19:47:38 -05:00
Andre Medeiros c6d7bec9d7 Do not request legacyAST from solc to speed up compilation 2018-09-19 15:51:11 -04:00
Iuri Matias b817c0f012
Merge pull request #872 from embark-framework/feature/warning-for-gas
Display warning for gas price
2018-09-19 13:57:17 -04:00
Anthony Laibe b1df72be3f Update text 2018-09-19 13:46:39 +01:00
Anthony Laibe 2a61857990 Display warning for gas price 2018-09-19 12:02:33 +01:00
Andre Medeiros 9151466a75 Simplify code 2018-09-18 16:36:21 -04:00
Andre Medeiros f54d572b3d Handle cases where deploy address isn't set 2018-09-18 16:30:32 -04:00
Iuri Matias 904c716d89
Merge pull request #856 from embark-framework/features/config-browser-open
cli and config options for browser auto-open
2018-09-18 13:11:55 -04:00
Iuri Matias 7f66e24b2f
Merge pull request #863 from embark-framework/bug_fix/minewhenneeded-fixes-2
Geth creates new account - add password warning
2018-09-18 13:02:01 -04:00
Iuri Matias ce8f5f7dc0
Merge pull request #861 from embark-framework/feature/webserver-coverage
Add coverage to webserver
2018-09-18 12:45:01 -04:00
Iuri Matias 0504d12739
Merge pull request #860 from embark-framework/bugfix/proxy-not-ready
Delay the start of the proxy
2018-09-18 12:44:32 -04:00
Iuri Matias d9c5369c20
Merge pull request #859 from embark-framework/bugfix/runcode-type
Fix typo
2018-09-18 12:42:59 -04:00
Anthony Laibe bdcefbe269 Add coverage to webserver 2018-09-18 14:28:17 +01:00
Anthony Laibe 4c0b4c2410 Delay the start of the proxy 2018-09-18 12:12:17 +01:00
Anthony Laibe 6fe3db4235 Fix typo 2018-09-18 09:42:46 +01:00
emizzle d965ba6db9 Geth creates new account - add password warning
When `isDev` is false, and `mineWhenNeeded` is true, embark attempts to create a new account using `geth account new`, and uses the password file specified in `blockchain/config > accounts > password`. This warning informs the user that the create account command may fail if the password is missing.
2018-09-18 16:28:23 +10:00
Michael Bradley, Jr 8acab6ef5b disable browser auto-open when webserver first starts, not the `open browser` console cmd 2018-09-17 18:47:19 -05:00
Michael Bradley, Jr d03cfebbdf supply radix -- make the linter happy 2018-09-17 18:13:21 -05:00
Michael Bradley, Jr ebcbc1efe6 if port === 0 (per cli or config), auto-assign a port 2018-09-17 17:59:52 -05:00
Michael Bradley, Jr c6232de878 host from config (config has been merge w/ cli by core/config) 2018-09-17 17:59:52 -05:00
Michael Bradley, Jr c685432ea2 pass port number through parseInt 2018-09-17 17:59:52 -05:00
Michael Bradley, Jr 1b7aed8b80 openBrowser config option 2018-09-17 17:59:52 -05:00
Michael Bradley, Jr c360975e8f webServer svc doesn't need to handle cli opts (handled in core/config) 2018-09-17 17:59:52 -05:00
Andre Medeiros 7746404905 Match coverage path 2018-09-17 15:25:07 -04:00
Iuri Matias 7ce92211f9
Merge pull request #842 from embark-framework/fix_cb_issue
take into account when event does not trigger a callback
2018-09-17 14:56:40 -04:00
Iuri Matias fade54fca4
Merge pull request #852 from embark-framework/improve-coverage-ux
Improve coverage UX
2018-09-17 14:18:27 -04:00
Iuri Matias 11828c3086
Merge pull request #851 from embark-framework/bugfix/gasPrice-with-coverage
Gas Price not modified by coverage
2018-09-17 14:17:28 -04:00
Iuri Matias cc8649aa95
Merge pull request #850 from embark-framework/bug_fix/re-add-dev_funds-calling-code
Adding back calling code block for dev_funds
2018-09-17 14:12:25 -04:00
Iuri Matias d6f1925cec
Merge pull request #849 from embark-framework/bugfix/better-support-for-await
Better support for await
2018-09-17 14:11:20 -04:00
Iuri Matias c02bd6c444 make linter happy 2018-09-17 13:58:13 -04:00
Iuri Matias fc98b1ccef
Merge pull request #848 from embark-framework/bug_fix/embark-console-kills-embark
Fix for embark run crashing after console connects to it
2018-09-17 13:39:05 -04:00
Iuri Matias 1296545fa3 make function defaul arg instead 2018-09-17 13:36:20 -04:00
Andre Medeiros b021d99bab Improve coverage UX 2018-09-17 10:37:24 -04:00
Anthony Laibe 18a9349d77 Gas Price not modified by coverage 2018-09-17 14:12:20 +01:00
emizzle 472b87f4cd Adding back calling code block for dev_funds
This may have been removed in the rebase, adding it back in.
2018-09-17 22:48:24 +10:00
Anthony Laibe 3a210f602b Better support for await 2018-09-17 09:57:51 +01:00
emizzle 31d3125baf Fix for embark run crashing after console connects to it
The providerUrl being provided to the console VM was looking for a WebsocketProvider-specific property which did not exist on the HttpProvider.

Type checking was added to provide the necessary type-dependent property.
2018-09-17 13:03:55 +10:00
Iuri Matias 7d6809b57f take into account when event does not trigger a cb 2018-09-15 12:52:11 -04:00
Iuri Matias 32a1ba0f32 fix dashboard state so it doesn't show pending for contracts that were not deployed due to deployIf directive 2018-09-15 12:20:20 -04:00
Iuri Matias e3273b7867
Merge pull request #835 from embark-framework/fix-coverage-timing
Update coverage report after suite
2018-09-14 18:18:24 -04:00
Iuri Matias b53eb11285
Merge pull request #833 from embark-framework/bug_fix/http-inception
Fix contracts with http import inceptions
2018-09-14 18:15:52 -04:00
Iuri Matias 3c167b197c
Merge pull request #823 from embark-framework/features/embark-help-addition
`embark test —node` help, plus fix for vm option
2018-09-14 18:13:07 -04:00
Iuri Matias 9b2fa9402b
Merge pull request #822 from embark-framework/bugfix/circular-json
Fix circular JSON and swarm api require
2018-09-14 18:11:34 -04:00
Iuri Matias 8b28bb9691
Merge pull request #830 from embark-framework/feature/process-wrapper-options
Better manage default options
2018-09-14 18:09:41 -04:00
Iuri Matias 286e1d2c95
Merge pull request #824 from embark-framework/feature/swarm-use-local-datadir
Swarm use local data dir
2018-09-14 18:07:54 -04:00
Andre Medeiros 103262f435 Write coverage report asynchronously 2018-09-14 16:43:58 -04:00
Andre Medeiros a8a9f3e9a8 Setup coverage to listen to the test embark events
This allows us to catch an event to know when the tests are done running. In turn, this will tell us when to save the coverage file and run the report.
2018-09-14 16:31:40 -04:00
Andre Medeiros d8becfe54f Lint lyfe 2018-09-14 13:21:47 -04:00
Andre Medeiros cd8980151b Update coverage report after each step 2018-09-14 13:16:02 -04:00
Jonathan Rainville fc0825aeca set downloaded flag at the very end 2018-09-14 11:50:24 -04:00
Anthony Laibe 2c30271d29 please linter 2018-09-14 10:30:20 +01:00
Anthony Laibe ab859d4ef5 Better manage default options 2018-09-14 10:17:01 +01:00
Iuri Matias 9887a2204d
Merge pull request #826 from embark-framework/feature/clean-pipeline
Clean build dir before starting
2018-09-13 19:47:14 -04:00
Iuri Matias 6d54a40bb2
Merge pull request #827 from embark-framework/bug_fix/prepend-embark-plugin-install
Prepend "embark-" to plugin names and little fixes
2018-09-13 19:46:49 -04:00
Jonathan Rainville 293fce63a9 add thens to catch errors 2018-09-13 15:56:36 -04:00
Jonathan Rainville 43a9640297 add option to generate the coverage 2018-09-13 14:30:15 -04:00
Jonathan Rainville 3e1db81d5b preprend embark to plugin name 2018-09-13 10:29:03 -04:00
Jonathan Rainville 70763fc717 restructure plugin_cmd 2018-09-13 10:08:15 -04:00
Anthony Laibe 0cb12e0591 Clean build dir before starting 2018-09-13 14:07:14 +01:00
Anthony Laibe 8ffc9b89e2 Swarm use local data dir 2018-09-13 13:37:44 +01:00
Anthony Laibe 583318169a Fix loading swarm-api in node or browser 2018-09-13 12:29:44 +01:00
emizzle 60703b86c5 `embark test —node` help, plus fix for vm option
Add better help info for `embark test —node`.

Fixed issue with `embark test —node vm` where the `vm` was attempted to be parsed as a URL instead of running the simulator.
2018-09-13 20:34:58 +10:00
Anthony Laibe c22901ab95 Fix circular JSON and swarm api require 2018-09-13 11:21:17 +01:00
Anthony Laibe 1b242baefd No webserver and no ipc server on console 2018-09-13 09:19:57 +01:00
Iuri Matias 53e3136ac6
Merge pull request #821 from embark-framework/bug_fix/double-import
Fix double http import
2018-09-12 18:53:54 -04:00
Iuri Matias edd9ece585
Merge pull request #820 from embark-framework/bug_fix/error-deploy-pending
Don't stop everything on contract deploy fail
2018-09-12 18:50:56 -04:00
Iuri Matias e7ae3fbc76
Merge pull request #809 from embark-framework/bug_fix/bad-redeploy
fix redeploy of contracts on spaces
2018-09-12 18:37:29 -04:00
Iuri Matias cdf5a37ac4
Merge pull request #808 from embark-framework/eth_call_coverage
Add call coverage to pure functions
2018-09-12 18:31:22 -04:00
Iuri Matias dfe49291be
Merge pull request #797 from subramanianv/pluginCmd
Plugin cmd
2018-09-12 17:57:18 -04:00
Jonathan Rainville a4400a303d fix double import by using newContent 2018-09-12 14:08:00 -04:00
Jonathan Rainville 4c912b8ecf stop on error 2018-09-12 12:04:33 -04:00
Jonathan Rainville 9f7a932252 don't stop on contract fail 2018-09-12 11:55:29 -04:00
Anthony Laibe da0b2f4e66
Merge pull request #806 from embark-framework/feature/new-repl-command
Adding new repl options
2018-09-12 15:07:45 +01:00
Jonathan Rainville 52a99ee4ef
Merge pull request #815 from embark-framework/fix-invalid-account-param-error
Show an error message on account parameters
2018-09-12 10:01:55 -04:00
Jonathan Rainville b34174738c
Merge pull request #814 from embark-framework/bugfix/ens-without-config-no-crash
Prevent embark to crash when there is no config for ens
2018-09-12 10:01:26 -04:00
Anthony Laibe e08892664f Adding new repl options 2018-09-12 15:00:55 +01:00
Jonathan Rainville 4e3e27df6c
Merge pull request #810 from embark-framework/bug_fix/fix-log-ipns
Make sure the string is an IPFS hash and some linting
2018-09-12 09:59:38 -04:00
Subramanian Venkatesan c8eec064b1 log the error 2018-09-12 19:27:19 +05:30
Jonathan Rainville 1bbd8beef8
Merge pull request #802 from embark-framework/swarm-support-latest
Switch to SwarmJS which supports latest version of Swarm
2018-09-12 09:57:19 -04:00
Jonathan Rainville f427980cfe
Merge pull request #800 from embark-framework/bugfix/ens-test-app
Better trace register ens
2018-09-12 09:56:35 -04:00
Jonathan Rainville 0f635f8a33
Merge pull request #799 from embark-framework/feature/trace-console-log
Use trace logger for code runner error
2018-09-12 09:55:47 -04:00
Anthony Laibe 5f90b4516c Ens disabled by default 2018-09-12 14:01:21 +01:00
Andre Medeiros 4a947d4783 Show an error message on account parameters 2018-09-12 09:00:20 -04:00
Anthony Laibe 1ce8474824 Prevent embark to crash when there is no config for ens 2018-09-12 12:05:31 +01:00
Subramanian Venkatesan b2d6421ea6 fix code formatting 2018-09-12 11:50:20 +05:30
Subramanian Venkatesan 1a756e8a05 Added better error logging, dashboard doesnt break in run mode 2018-09-12 11:27:28 +05:30
emizzle 5021d39cae Add console help for swarm command 2018-09-12 12:57:46 +10:00
emizzle 680db4d575 Change over to published swarm-api library 2018-09-12 12:43:10 +10:00
Michael Bradley, Jr a9865eedc5 provide helpful messages when template download fails 2018-09-11 15:44:54 -05:00
Michael Bradley, Jr a4af0d8f5b assume cb is always supplied 2018-09-11 15:44:37 -05:00
Michael Bradley, Jr 803b3f5050 should return after callback w/ error 2018-09-11 15:22:35 -05:00
Michael Bradley, Jr a44be3740b template generator should report err msg and exit if download fails 2018-09-11 15:19:15 -05:00
Michael Bradley, Jr ed48599aa9 downloadFile should callback w/ err msg if response code is not 200 2018-09-11 15:18:32 -05:00
Jonathan Rainville 742936efc3 make sure the string is an IPFS hash and some linting 2018-09-11 16:09:46 -04:00
Jonathan Rainville 47ec2f2d8a fix redeploy of contracts on spaces 2018-09-11 15:20:57 -04:00
Andre Medeiros 29c1ea39f8 Address feedback 2018-09-11 14:50:43 -04:00
Andre Medeiros 799a87f35e Clean up; Lint 2018-09-11 14:32:40 -04:00
Iuri Matias 4f50229beb temp/poc for eth_call coverage 2018-09-11 14:32:40 -04:00
Subramanian Venkatesan b3eedc4ba2 embark config 2018-09-10 23:12:04 +05:30
Subramanian Venkatesan fe0bbc3559 changes from the code review 2018-09-10 22:38:17 +05:30
Anthony Laibe 6ad9c0dc5a Update error with or 2018-09-10 17:08:09 +01:00
Anthony Laibe 32a6b53c6a Add missing callback 2018-09-10 17:05:11 +01:00
Anthony Laibe 16c870ac34 Use error logger 2018-09-10 13:57:54 +01:00
Subramanian Venkatesan 2782acf438 fix plugin command 2018-09-10 18:25:17 +05:30
emizzle 1d03f01531 Update warnings in embark after upload
warn user that they need to run a blockchain node and swarm for the dapp to work correctly.
2018-09-10 22:47:31 +10:00
emizzle b759e9eed7 Add ‘defaultpath’ for upload
Hardcode to ‘index.html’
2018-09-10 22:42:10 +10:00
emizzle 9d39fa39ac Swarm updates for embark
Change __embarkSwarm to use new SwarmJS and change over from promises.

Add note after upload that blockchain nodes needs to be running to access the swarm uploaded dapp.

Fix typo with swarm “on” available.

Linting / cleanup
2018-09-10 22:42:10 +10:00
emizzle e44b62d550 SwarmJS browser support 2018-09-10 22:42:10 +10:00
emizzle 3f5fe21b90 change to ‘uploadDirectory’ 2018-09-10 22:42:10 +10:00
emizzle 2dc8d8c276 Fix issue with swarm isAvailable 2018-09-10 22:42:10 +10:00
emizzle fcb75dee11 Move to swarmjs and await geth ready
Move to swarmjs library (in embark-framework).

Wait for geth to start before start of swarm check.
2018-09-10 22:42:10 +10:00
emizzle b5e8546ebd Converted upload procedure to local SwarmGW lib
# Conflicts:
#	package-lock.json
2018-09-10 22:42:00 +10:00
Anthony Laibe 68ef5454e0 Avoid multiple connect to IPC 2018-09-10 11:52:06 +01:00
Subramanian Venkatesan 53de6dcb19 Fixes to npm command parsing 2018-09-10 16:19:37 +05:30
Anthony Laibe 613921169a Better trace register ens 2018-09-10 10:12:02 +01:00
Subramanian Venkatesan 78bc27ad95 fix runCmd 2018-09-10 14:16:02 +05:30
Subramanian Venkatesan f20934ac8c Use Object.assign 2018-09-10 14:11:40 +05:30
Subramanian Venkatesan 4823d2312e remove console.log 2018-09-10 14:07:02 +05:30
Subramanian Venkatesan cb751b5213 install npm package using shell.js 2018-09-10 14:01:36 +05:30
Anthony Laibe b41bcbbe17 Use trace logger for code runner error 2018-09-10 09:26:37 +01:00
Subramanian Venkatesan c8e812e638 Plugin Command Module 2018-09-09 23:22:57 +05:30
Subramanian Venkatesan 74f0d05ca0 Plugin Command 2018-09-09 23:07:55 +05:30
Iuri Matias 833fcef22a
Merge pull request #795 from embark-framework/bug_fix/webserver-config-change
Watch webserver config and restart it
2018-09-07 19:04:17 -04:00
Iuri Matias 4128a96997
Merge pull request #796 from embark-framework/bug_fix/web3-location
getWeb3Location should use require.resolve()
2018-09-07 19:03:59 -04:00
Michael Bradley, Jr 7549c1f8e6 require.resolve() should start by looking in embark's own node_modules 2018-09-07 16:28:03 -05:00
Michael Bradley, Jr 13e21702d2 getWeb3Location should use require.resolve() for "version:get:web3" event 2018-09-07 15:52:30 -05:00
Jonathan Rainville 3d37fe6362 catch webserver config and restart it 2018-09-07 14:54:15 -04:00
Anthony Laibe 4c580dd54d Pr feedback using once 2018-09-07 14:57:49 +01:00
Anthony Laibe 4481e6eb99 Ens config is run only once 2018-09-07 11:18:43 +01:00
Iuri Matias 18ab1ce101
Merge pull request #790 from embark-framework/bugfix/solc-die
Avoid Solc to die because of compilation
2018-09-06 13:31:39 -04:00
Jonathan Rainville bee3aa1fde
Merge pull request #789 from eiselems/extendTemplateGenerator
Extend template_generator to support git urls and branches
2018-09-06 09:33:07 -04:00
Anthony Laibe 5957be9571 Avoid Solc to die because of compilation 2018-09-06 11:24:29 +01:00
eiselems c99d75c9f1 Extend template_generator to support git urls and branches
This change will also:
* upgrade calls from HTTP to HTTPS
* update / add some tests
See: #765
2018-09-06 02:09:46 +02:00
Iuri Matias 10035fe46b
Merge pull request #786 from embark-framework/bug_fix/upload-simple
Fix uploading a simple app
2018-09-05 18:23:27 -04:00
Iuri Matias 48a3d70df2
Merge pull request #785 from embark-framework/bug_fix/no-warning-dev
No accounts warning in development
2018-09-05 18:22:09 -04:00
Iuri Matias 428820f2c6
Merge pull request #781 from embark-framework/bug_fix/no-webserver-if-false
Do not start webserver if set to false in embark.json
2018-09-05 18:20:31 -04:00
Michael Bradley, Jr 7d29e53048 remove stray `?` in webpack.config.js 2018-09-05 16:49:26 -05:00
Jonathan Rainville 55bb028a13 add test too 2018-09-05 12:35:45 -04:00
Jonathan Rainville 56147ba200 fix order and remove ? 2018-09-05 11:47:53 -04:00
Jonathan Rainville 047286b46d skip webpack if no js files 2018-09-05 11:38:09 -04:00
Jonathan Rainville 3991880b44 no warning in development 2018-09-05 09:45:34 -04:00
Anthony Laibe c92f6f8865 Fix dynamic IPC 2018-09-05 10:40:37 +01:00
Jonathan Rainville e925200592 disable webserver if false 2018-09-04 16:44:42 -04:00
Iuri Matias 0f1f3a782a
Merge pull request #779 from embark-framework/chore/add-embarkjs-to-help
Add embarkJS to help
2018-09-04 15:26:31 -04:00
Jonathan Rainville 9351a12444 add embarkJS to help 2018-09-04 14:12:12 -04:00
Iuri Matias bf8183cf76
Merge pull request #778 from embark-framework/fix_deploy
Fix issue with changes in config file not causing a proper reload
2018-09-04 14:02:54 -04:00
Iuri Matias 7ee02525a7
Merge pull request #770 from embark-framework/features/open-browser
open browser when Embark's webserver starts
2018-09-04 13:51:57 -04:00
Michael Bradley, Jr d4be16ba3c move reporting to final callback 2018-09-04 08:20:58 -05:00
Michael Bradley, Jr b67aa8cc2d best practice re: early return w/ callback invocation 2018-09-04 08:20:27 -05:00
Michael Bradley, Jr c02199db0f rev comment 2018-09-04 07:36:21 -05:00
Michael Bradley, Jr 7d65c2b0cd rename placeholder event: 'build-placeholder' 2018-09-04 07:35:53 -05:00
Michael Bradley, Jr 57b2c5c4e4 'browser open' console command 2018-09-04 07:35:02 -05:00
Michael Bradley, Jr 68c6d1549a 'open-browser' event 2018-09-04 07:34:37 -05:00
Michael Bradley, Jr 103bb43a05 consistent naming, quotes-style 2018-09-04 07:32:31 -05:00
Anthony Laibe 5ad17be140 Fix Gas Price 2018-09-04 08:21:31 +01:00
Iuri Matias c3f7c58b8d delete require cache for config file so configs are actually reloaded 2018-09-03 14:01:46 -04:00
Iuri Matias 0314fb77c9 return if contract deploy is false 2018-09-03 14:01:26 -04:00
Michael Bradley, Jr 03c51fba46 pipeline fires placeholder event only after first build 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr de0034c1fc formatting -- pipeline.js 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 9cd96ddd29 formatting -- webserver/server.js 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 52ed0e2856 webserver uses event and waterfall for triggering placeholder build, opening browser 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 6ee195aba9 make webserver module responsible for building placeholder 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 1d38af1f58 expose buildDir to webserver in same manner as its done for pipeline 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 1d9237820a make isFirstStart, opened props of Server instance 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 4f8107bf17 fail silently if opn doesn't work 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 72943dc0e5 open default browser when webserver has started 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr f778dad589 write placeholder page when webserver is first starting 2018-09-03 10:17:45 -05:00
Iuri Matias 15467e6f49 use es string templates 2018-09-01 09:35:14 -04:00
Iuri Matias 9912c71b6f cleanup 2018-09-01 09:35:14 -04:00
Iuri Matias 1be58863e7 cleanup 2018-09-01 09:35:14 -04:00
Iuri Matias af947910c4 re-add context code 2018-09-01 09:35:14 -04:00
Iuri Matias 262a6d3aef move older code to embarkjs & refactor 2018-09-01 09:35:13 -04:00
Iuri Matias e42c4f94d8 remove utils; use EmbarkJS.connect method 2018-09-01 09:30:37 -04:00
Anthony Laibe 98e63ad424 Fix message events already declared 2018-08-31 18:55:38 +01:00
Iuri Matias 43945f6a49
Merge pull request #759 from embark-framework/bug_fix/ens-crash
Don't crash if ENS contracts don't deploy
2018-08-31 09:05:43 -04:00
Iuri Matias aeb4c0d0c0
Merge pull request #758 from embark-framework/bugfix/profile-do-not-crash
profile always return
2018-08-31 08:57:03 -04:00
Jonathan Rainville f1e5aff3fb dont crash if ens contracts don't deploy 2018-08-31 08:50:15 -04:00
Jonathan Rainville 3e89729331 conflict with indents 2018-08-31 08:46:08 -04:00
Anthony Laibe a325abe1c2 profile always return 2018-08-31 13:41:41 +01:00
Iuri Matias a1c2d7e77a
Merge pull request #756 from embark-framework/feature/console-ipc-server-client
Console can be a client or server ipc
2018-08-31 07:58:55 -04:00
Iuri Matias f0221bbb10
Merge pull request #755 from embark-framework/chores/es-lint-no-else
Enable no-else-return
2018-08-31 07:49:25 -04:00
Iuri Matias 46076c8d4e
Merge pull request #751 from embark-framework/feature/embarkjs-console
Feature/embarkjs console
2018-08-31 07:46:54 -04:00
Anthony Laibe e0f73c7d22 Make console a module 2018-08-31 09:36:50 +01:00
Andre Medeiros bb92582c0a Fix passing compiler options 2018-08-30 16:11:42 -04:00
André Medeiros 026da48e74
Merge pull request #749 from embark-framework/features/coverage-loops-declarations-events
Improve code coverage
2018-08-30 14:46:34 -04:00
Andre Medeiros 34f6a130d8 Update complexity 2018-08-30 13:50:36 -04:00
Andre Medeiros f3857e4084 Import directives and struct definitions don't really count as executed code 2018-08-30 13:46:26 -04:00
Andre Medeiros 05dea5844a Fix the way we pass compiler options instead of assuming via the environment 2018-08-30 13:27:18 -04:00
Andre Medeiros 2c2e54b613 Fix feedback 2018-08-30 13:01:13 -04:00
Andre Medeiros bc5de4ef90 Support modifiers 2018-08-30 12:49:41 -04:00
Anthony Laibe 59e82d5fc6 Console can be a client or server ipc 2018-08-30 15:45:01 +01:00
Anthony Laibe df651865c1 Enable no-else-return 2018-08-30 14:53:04 +01:00
Anthony Laibe 31cb79bf5b PR feedback 2018-08-30 10:41:13 +01:00
Anthony Laibe 581b0c9f42 Fix lint 2018-08-30 10:04:58 +01:00
Anthony Laibe 98c785a4bb Fix register var and runcode 2018-08-30 10:04:58 +01:00
Anthony Laibe cc312a91b6 Refactor code runner 2018-08-30 10:04:58 +01:00
Anthony Laibe deb433c0fb Fix ens enabled 2018-08-30 10:04:58 +01:00
Anthony Laibe b9944b18d2 Pass web3 as params 2018-08-30 10:04:58 +01:00
Anthony Laibe 0a261b050d Name available in console 2018-08-30 10:04:58 +01:00
Anthony Laibe a8c5205b67 Extract global and web3js 2018-08-30 10:04:58 +01:00
Anthony Laibe 83c01cffdc Storage and Whisper connect 2018-08-30 10:04:58 +01:00
Anthony Laibe 00ccad1d9b Fix isavailable 2018-08-30 10:04:58 +01:00
Anthony Laibe 6c63179fa1 Fix lint 2018-08-30 10:04:58 +01:00
Anthony Laibe 6a2b91d99b Add console/require to codeRunner 2018-08-30 10:04:58 +01:00
Anthony Laibe 307b7dc8e7 EmbarkJS available 2018-08-30 10:04:58 +01:00
Anthony Laibe d772b4fdaf Add embarkjs to console 2018-08-30 10:04:58 +01:00
Iuri Matias bd49e3672c
Merge pull request #752 from embark-framework/feature/silent-already-deployed
Silent already deployed
2018-08-29 17:37:54 -04:00
Iuri Matias 7eb52c1f8f
Merge pull request #735 from embark-framework/bugfix/allow-zero-config-blockchain
Allow zero config in blockchain
2018-08-29 17:33:15 -04:00
Anthony Laibe c94b5574cf Silent already deployed 2018-08-29 11:23:24 +01:00
Michael Bradley, Jr 12d37f8f68 don't load the CompressionPlugin by default 2018-08-28 15:50:40 -05:00
Michael Bradley, Jr fccdee35ed don't have webpack produce a .gz of output by default 2018-08-28 15:45:11 -05:00
Michael Bradley, Jr 08fc21c890 gateway URLs: http -> https 2018-08-28 15:44:50 -05:00
Andre Medeiros 824353fb32 Lint 2018-08-28 13:51:55 -04:00
Andre Medeiros 543f883b7d Fix consolidation of coverage and compiler events; Cleanup 2018-08-28 13:39:18 -04:00
Andre Medeiros 4c127d1192 Events 2018-08-28 11:27:37 -04:00
Andre Medeiros 4e9d2823e5 Improvements 2018-08-28 11:27:37 -04:00
Andre Medeiros 5dcd679e12 Add for loops and variable declarations; Coverage improvements 2018-08-28 11:27:37 -04:00
Anthony Laibe fdd2d10d38 Add warning 2018-08-28 09:32:39 +01:00
Anthony Laibe 23f7ec396a Allow zero config in blockchain 2018-08-27 10:06:37 +01:00
Michael Bradley, Jr 8fa5bddde5 rev comment re: webpack-bundle-analyzer 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 6149921562 rev comments 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 65d2153638 prefer early return for config.stats tests 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 9e62d9c1a9 isDir test should support possible use of '\' by devs on Windows 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 8bec33177e rm some else clauses 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr f4b11ce29f explanatory comment 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 382122c6d9 mapCb -> eachCb 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 04a5e3335d self.logger -> self.logger.error 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr f66552b044 errorMessage helper moved to utils 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr c8cd5f4229 consistent indentation 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 46c4aea520 rev comment re: NODE_PATH in webpack config 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr cec7dc5750 DRY resolve 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 792a8f57eb consistent handling of error messages, no double reporting 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 421927d815 paths more DRY 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr f1edc28f6d anchoredPath helper (more DRY) 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 67147f2cad make the linter happy 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 7fb9c552dc assetFileWrite no longer processes files corresponding to .js keys 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 0161a9b402 "writing file" messages for files that will be written by webpack 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr e1fb746aa7 relocate webpack.config.js under lib/pipeline/ 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 53a4fd2089 rm redundant setup of env vars 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 76502fa693 rm utils.pwd() -- redundant now that fs.dappPath is anchored to env var 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr f0f95554a5 prefer fs.dappPath 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 8be1090a44 prefer joinPath to +'ing strings together 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 40c14a08de whitespace 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 019f0b68c8 anchor fs.dappPath, fs.embarkPath to env vars setup in cmd.js 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr b3c8e5fa45 missing spaces 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 3ad834d93d rev comment to reflect code changes 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 35f92f2ae8 more DRY re: config 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 04fcb1510a rev comment 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 1f56f717b8 'running webpack' message should indicate config name 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 7291fd1187 can use `this`, don't need `self` 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 963ecc0d92 formatting 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 878186660b change timing of "writing file" messages 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr f654c0a013 single webpack run 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr e9ec968598 whitespace 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 6282e092f1 note/question 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 2f2f007d5c use embark's webpack config, or a dapp's webpack config if it exists 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr c60d26e258 make fs.embarkPath more flexible 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr b41f5a397d --pipeline option for `ebmark build|run` to spec webpack config name 2018-08-24 15:04:15 -05:00
Iuri Matias f0a6b913c4
Merge pull request #747 from embark-framework/features/password-protected-keyfiles
Unlock account using keystore file with password
2018-08-24 16:01:55 -04:00
Iuri Matias a0d864b8ae
Merge pull request #746 from embark-framework/bug_fix/tests-ws-bug
Fix test_app with a WS node
2018-08-24 15:53:54 -04:00
Jonathan Rainville 9d4a3fd228 if there is a password field in privateKeyFile object, decode keystore 2018-08-24 15:30:44 -04:00
Jonathan Rainville 13e0d453ae fix websocket test, but still some hangs on second test run 2018-08-24 12:09:38 -04:00
Iuri Matias 864b41a2c2
Merge pull request #745 from embark-framework/deployIf
deployIf field + minor refactor
2018-08-24 10:33:58 -04:00
Iuri Matias 4305d63108 clarify param is not used 2018-08-24 10:31:40 -04:00
Iuri Matias eb57b358cd
Merge pull request #738 from embark-framework/bug_fix/double-embark
Enable multiple Embark runs at the same time
2018-08-24 10:09:45 -04:00
Iuri Matias 052ffb72f9
Merge pull request #744 from embark-framework/bugfix/buffer-contract
Isolate the code runner
2018-08-24 10:03:11 -04:00
Iuri Matias ffbd39882a remove isTest 2018-08-24 09:25:47 -04:00
Anthony Laibe de57e48cff Isolate the code runner 2018-08-24 14:05:19 +01:00
Iuri Matias c52142cb4c move always deploy on tests to deploy tracker 2018-08-24 08:59:56 -04:00
Iuri Matias 8f5b47adf4 add deployIf directive support 2018-08-23 18:00:52 -04:00
Michael Bradley, Jr 2280d30cd1 don't continue with template install if destination path exists 2018-08-23 15:43:42 -05:00
Iuri Matias a56431d19a refactor run actions for events to a reduce; add initial plug for shouldDeploy using deployIf 2018-08-23 16:25:28 -04:00
Michael Bradley, Jr 1a3e1a18df use console.warn and yellow text for locale fallback msg 2018-08-23 15:00:25 -05:00
Michael Bradley, Jr 72c1a9cd4c fix locale detection so it works w/ env var and/or --locale 2018-08-23 14:51:33 -05:00
Jonathan Rainville b9c65f2d58 use listen(0) to find a port 2018-08-23 15:11:43 -04:00
Iuri Matias 5fe86e35d1
Merge pull request #736 from embark-framework/features/test-node-option
Add --node option for tests
2018-08-23 15:07:10 -04:00