Commit Graph

640 Commits

Author SHA1 Message Date
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
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 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 c02bd6c444 make linter happy 2018-09-17 13:58:13 -04:00
Iuri Matias 1296545fa3 make function defaul arg instead 2018-09-17 13:36:20 -04: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
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 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 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 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 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
Anthony Laibe c22901ab95 Fix circular JSON and swarm api require 2018-09-13 11:21:17 +01: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 dfe49291be
Merge pull request #797 from subramanianv/pluginCmd
Plugin cmd
2018-09-12 17:57:18 -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
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 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
Andre Medeiros 4a947d4783 Show an error message on account parameters 2018-09-12 09:00:20 -04:00
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
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
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
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
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 cb751b5213 install npm package using shell.js 2018-09-10 14:01:36 +05:30
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
Anthony Laibe 5957be9571 Avoid Solc to die because of compilation 2018-09-06 11:24:29 +01: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 0314fb77c9 return if contract deploy is false 2018-09-03 14:01:26 -04: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 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
Jonathan Rainville f1e5aff3fb dont crash if ens contracts don't deploy 2018-08-31 08:50:15 -04:00
Anthony Laibe a325abe1c2 profile always return 2018-08-31 13:41:41 +01: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 df651865c1 Enable no-else-return 2018-08-30 14:53:04 +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 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 23f7ec396a Allow zero config in blockchain 2018-08-27 10:06:37 +01: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 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 ffbd39882a remove isTest 2018-08-24 09:25:47 -04: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
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
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
Iuri Matias 26cde59fcb
Merge pull request #732 from embark-framework/feature/hide-ens-transaction-log
Hide ENS Transaction log
2018-08-23 14:57:36 -04:00
Jonathan Rainville 7e59b6f0d0 increment port multiple times if multiple embarks 2018-08-23 14:28:44 -04:00
Jonathan Rainville a38c317ecd check port for webserver, if in use ++ port 2018-08-23 14:14:10 -04:00
Jonathan Rainville 86f1cf51d2 enable node=embark 2018-08-23 12:54:43 -04:00
Anthony Laibe 39b9d6e1d8 PR feedback 2018-08-23 09:59:02 +01:00
Anthony Laibe 607c2657c4 Hide ENS Transaction log 2018-08-23 09:23:51 +01:00
Anthony Laibe 60c6bc3e48 Lint 2018-08-22 10:58:01 +01:00
Anthony Laibe b0e0989359 Move ipns function to ipfs 2018-08-22 10:48:45 +01:00
Michael Bradley, Jr cc07f1d3d7 config should be stringified only once 2018-08-21 18:33:39 -05:00
Iuri Matias 8b97b4efb1 move back dev_funds file 2018-08-21 16:17:02 -04:00
Iuri Matias 792e7dff5b lint is king 2018-08-21 16:12:57 -04:00
Anthony Laibe cc7dfbcc60 Remove ENS warning 2018-08-21 16:11:07 -04:00