Commit Graph

2373 Commits

Author SHA1 Message Date
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