Commit Graph

2272 Commits

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