Commit Graph

122 Commits

Author SHA1 Message Date
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
Jonathan Rainville 55bb028a13 add test too 2018-09-05 12:35:45 -04:00
Jonathan Rainville 3991880b44 no warning in development 2018-09-05 09:45:34 -04:00
Jonathan Rainville e925200592 disable webserver if false 2018-09-04 16:44:42 -04: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 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
Anthony Laibe df651865c1 Enable no-else-return 2018-08-30 14:53:04 +01:00
Anthony Laibe 307b7dc8e7 EmbarkJS available 2018-08-30 10:04:58 +01: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 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 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
Iuri Matias 9d72030cff remove empty liens 2018-08-21 16:11:07 -04:00
Iuri Matias a55ff613bf fix config 2018-08-21 16:11:07 -04:00
Iuri Matias 6ae697f36a add solc options 2018-08-21 16:11:07 -04:00
Jonathan Rainville c225d97e4b fix reload file removing plugins 2018-08-21 16:07:59 -04:00
Jonathan Rainville eee2f66a22 if no register config, dont register anything 2018-08-21 15:52:50 -04:00
Michael Bradley, Jr 98dcf6ffe3 propagate `embark run` cli webserver flags to config and service 2018-08-21 15:42:05 -04:00
Jonathan Rainville 838fa92775 set isDev as default if there is no blockchain file 2018-08-21 15:30:11 -04:00
emizzle efe649e4e6 Removed p-iteration from embark altogether.
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
2018-08-21 15:12:07 -04:00
emizzle 170d8528eb When communication is disabled in config, do not run the module in embark.
Previous to this change, `Geth: WARN [06-25|16:46:26] origin 'embark' not allowed on WS-RPC interface` would appear in the logs when the module was run while disabled.

Updated the cors component so that when `rpcCorsDomain` and `wsOrigins` are set to `'auto'`, and all components are disabled `rpcCorsDomain` and `wsOrigins` are passed as a null parameter to geth as opposed to being passed as `'auto'`.
2018-08-21 15:08:25 -04:00
VoR0220 056b5a0ab9 bare bones bulk registration example spec
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

add registrars to system

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-08-21 15:03:34 -04:00
emizzle d2b89f88f9 Added cors for whisper 2018-08-21 15:03:34 -04:00
Michael Bradley, Jr 3885128e18 config -- canonicalHost, defaultHost 2018-08-02 15:32:34 -05:00
Iuri Matias 231e48cecb add todo 2018-06-18 11:37:23 -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 5a2cf62ee5 reload config; create a config so it doens't damage original 2018-06-14 09:22:13 -04:00
Iuri Matias 4131cf42ef fix support for .json file in embark.json 2018-06-12 17:59:14 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
emizzle a11047c681 Further fixes for starting dappConnection processes automatically
moved storage process launching to storage module

refactored all cases of storage url building to util methods

updated cors so that a processes will not include itself in cors list

changed child process command console output to trace, so it's visible when --logLevel == trace
2018-06-01 13:36:46 +10:00
emizzle 927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes.
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
2018-06-01 13:35:25 +10:00
emizzle 7aa44c7fe3 Added improvements to storage config 2018-06-01 13:35:11 +10:00
emizzle f6667b6948 Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-06-01 13:28:05 +10:00
Iuri Matias a25330ddec set namesystem enable to true by default 2018-05-28 11:09:48 -04:00
Iuri Matias 8fa325a7af
Merge pull request #452 from embark-framework/DomainNameResolution
ENS Domain name resolution initial integration
2018-05-27 08:12:26 -04:00
VoR0220 8ace5653cd fix some linting issues and add a few forgotten lines to the config function
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:52:57 -05:00
VoR0220 f5a29c7f4d make namesystem service come from a config file for future development
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:02 -05:00
emizzle 5b4e829675 * Adds auto cors updates to geth command when blockchain started via run command.
* Fixes issues with storage/webserver configs not enabled but still having their values put in to geth cors
* Adds fixes for not including port when port  == false
* Refactors of cors logic, and also now in a generic location so can be used by both `embark blockchain` and when blockchain started in separate process
2018-05-25 11:00:26 +10:00
Iuri Matias ba29f0e928 move deploy tracker into a module 2018-05-23 11:15:05 -04:00
Iuri Matias e8210607b7 fix for when config is specified in embark.json 2018-05-11 19:09:38 -04:00
Iuri Matias b804f51de5 fix getting .json config file 2018-05-11 18:22:03 -04:00
Iuri Matias 8b22305833 support js files besides json files 2018-05-11 18:10:48 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Eric Mastro 2bb977df76 WIP to merge in other swarm changes
Adding swarm to embarkjs. WIP.

Add 'auto' setting for geth CORS and websockets origin

* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
test add config and contract and add test

addFileToPipeline test and registerBeforeDeploy with new arg

add more registers but generation one fails in run

WIP commit

Undo changes to test config.

Merge pull request #381 from embark-framework/features/cors-auto

Add 'auto' setting for geth CORS and websockets origin
fix a bug where upload cmd used plugin name

don't error if it's an empty dapp with no contracts yet

Merge pull request #383 from embark-framework/no_contracts

don't error if it's an empty dapp with no contracts yet
remove duplicated entry

force zepplein version for travis

Merge pull request #384 from embark-framework/chores/test-allpligin-apis

Small fixes for plugin APIs
intercept logs in the app itself - stopgap fix

Merge pull request #385 from embark-framework/console_logs_fix

intercept logs in the app itself - stopgap fix
* removed unneeded provider property.
* add 'swarm' as a provider in the storage.config
* update method for swarm service check

Merge branch 'develop' into features/add-swarm-to-embarkjs


More work to add swarm to embarkjs

* added eth-lib to parse result of swarm text
* changed "currentStorage" and "currentMessages" to "currentProvider" for consistency.
* added protocol to storage config
* selectively starts storage service depending on which one is configured in the storage config
* run service check for ipfs/swarm prior to uploaded
* added swarm methods for embarkjs

Updated code based on code review

check if testrpc is installed and warn if not

Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed

check if testrpc is installed and warn if not
Removed timeout

Removed spacer

Merge pull request #382 from embark-framework/react-demo

Updating embark demo to use react instead of jquery
fix on contract add

Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp

Fix adding a contract
redeploy with right config on config change

fix tests

reset watchers after build to make sure files remain watch

Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched

Fix files not being watched
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config

Redeploy with right config on config change
Added swarm support in embarkjs and isAvailable for messages/storage

* reverted currentProvider back to currentStorage and currentMessages
* added `EmbarkJS.Storage.isAvailable` and `EmbarkJS.Messages.isAvailable()` and underlying provider functions for Whisper, Orbit, IPFS, and Swarm
* Finished swarm implementation in embarkjs plus cleanup
* updated test app storage config to swarm to show swarm config option

Merge branch 'develop' into features/add-swarm-to-embarkjs
2018-04-30 15:56:43 +10:00
Jonathan Rainville f39acbdd42 get context from cmd ran and use arrays of contexts 2018-04-25 10:34:17 -04:00
Iuri Matias 782044ef7c
Merge pull request #375 from embark-framework/fix_package_management
Fix package management
2018-04-20 20:10:38 -04:00
Iuri Matias 41f04234d0 clean up 2018-04-20 19:52:51 -04:00
Iuri Matias cf02a10656 use web3 naming instead of web3.js; check if package already exists 2018-04-20 19:45:57 -04:00