1625 Commits

Author SHA1 Message Date
emizzle
72cce7d4d2 Fixes to make lint and tests happy 2018-04-30 22:07:37 +10: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
Iuri Matias
acf1fa427b
Merge pull request #372 from embark-framework/bug_fix/upload-to-swarm
swarm deploy refactored to use web3.bzz instead of command line
2018-04-26 05:58:41 -04:00
Iuri Matias
51cfafaef9
Merge pull request #380 from embark-framework/bug_fix/fix-web3-dependencies
Fix issues with missing web3 dependencies
2018-04-26 05:56:21 -04:00
Eric Mastro
4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm 2018-04-26 19:05:56 +10:00
emizzle
6fe162a8da Fix issues with missing web3 dependencies
The issue was the npm dependency graph was causing the web3 dependencies to be nested inside the `node_modules/web3/node_modules` folder. After removing web3 from  `package-lock.json`, and allowing npm to rebuild the graph with `npm install`, the web3 depedencies (ie web3-bzz) were correctly installed at the same level as web3.

However, this also introduced a new dependency issue in that web3-providers-ws required and depended on the websocket package at a specific github commit and was causing the same issue with websocket being installed at `node_modules/web3-providers-ws/node_modules/websocket`. Removing the web3-providers-ws dependency on websocket and replacing with version 1.0.25 requirement brought the websocket package back to the same level as web3.
2018-04-26 15:08:37 +10:00
emizzle
f59a187bce Removed unused host/port options passed in to the swarm service. 2018-04-26 12:59:57 +10:00
Iuri Matias
0c57f37377
Merge pull request #379 from embark-framework/features/context-in-plugins
Support multiple contexts at once
2018-04-25 16:11:30 -04:00
Jonathan Rainville
fba491592d add function to check if context has specified context 2018-04-25 10:57:23 -04:00
Jonathan Rainville
f39acbdd42 get context from cmd ran and use arrays of contexts 2018-04-25 10:34:17 -04:00
Iuri Matias
c77d52c926
Merge pull request #378 from embark-framework/bug_fix/limit-plugins-on-envs
Add context to limit plugins that should not run in the simulator
2018-04-24 17:24:59 -04:00
Jonathan Rainville
97e91d4c44 only log loaded plugins in list plugins and warn when plugin is not right 2018-04-24 15:53:19 -04:00
Jonathan Rainville
51c2c8f880 check context and on changing context, load plugins that work 2018-04-24 14:42:56 -04:00
Iuri Matias
5fb3cb3730
Merge pull request #377 from embark-framework/bug_fix/tests-passing-when-one-fails
stop tests when deploy fails
2018-04-24 10:24:13 -04:00
Jonathan Rainville
52d0c5a8dd stop tests when deploy fails 2018-04-24 10:19:01 -04:00
emizzle
cc30ff390e Implemented PR review changes
* Removed config init from `cmd.js` for upload.
* refactored `upload()` to use engine services instead of loading and using plugins directly.
* now passing web3 directly to the `Swarm` constructor
2018-04-24 10:27:11 +10:00
Iuri Matias
edb6876d7a
Merge pull request #376 from embark-framework/tolerate_node_names
if node version name doesn't have /, then just use the full name
2018-04-23 12:17:49 -04:00
Iuri Matias
16909c7f1a if version name doesn't have /, then just use the full name 2018-04-23 12:14:48 -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
b4129e975b update tests 2018-04-20 20:01:11 -04:00
Iuri Matias
ade2ad1a67 comply with linter 2018-04-20 19:59:47 -04:00
Iuri Matias
a63aa2ea0f remove commented line; use beta 34 2018-04-20 19:58:16 -04:00
Iuri Matias
4f55b9eba2 update templates 2018-04-20 19:53:57 -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
Iuri Matias
1b6d747dbd fixing package management test 2018-04-20 17:17:49 -04:00
Jonathan Rainville
f6479d69fe Merge branch 'features/import-http-from-contract' into develop 2018-04-20 14:55:05 -04:00
Iuri Matias
a5fb9befed
Merge pull request #374 from embark-framework/bug_fix/node-modules-import-windows
make sure all file names are using forward slashes
2018-04-20 14:52:04 -04:00
Iuri Matias
35c858ea53
Merge pull request #373 from embark-framework/features/import-http-from-contract
Enable importing from HTTP inside sol contracts
2018-04-20 14:49:40 -04:00
Jonathan Rainville
c212a9b90c make sure all file names are using forward slashes 2018-04-20 13:40:41 -04:00
Jonathan Rainville
d48c971471 improve url regexes 2018-04-20 12:04:27 -04:00
Jonathan Rainville
c1bed28c00 code and test importing the http contract 2018-04-20 11:39:17 -04:00
Jonathan Rainville
9bf06aebce refacotr how we handle files already parsed 2018-04-20 10:03:03 -04:00
Jonathan Rainville
abc89b2015 add code to parse all files to check for http imports 2018-04-20 09:52:13 -04:00
emizzle
c05915b0e9 swarm deploy refactored to use web3.bzz instead of command line
* `Embark.upload()` refactored to build own `Engine` and services so `web3` could be passed to `Swarm` module
* `Swarm.deploy()` modified to use `web3.bzz.upload()`
* needs detection of running swarm node
2018-04-20 17:39:45 +10:00
Iuri Matias
9a79df68d9
Merge pull request #371 from embark-framework/features/download-imports-too
Download Imports for downloaded contracts
2018-04-19 15:38:16 -04:00
Jonathan Rainville
df5b647ecb fix and add tests 2018-04-19 15:25:27 -04:00
Jonathan Rainville
9cdcc4f6d4 add code to import in solcP 2018-04-19 15:25:26 -04:00
Jonathan Rainville
60fb6b14d4 downlaod import files 2018-04-19 15:25:26 -04:00
Jonathan Rainville
05b1f61c9b download files in full path of url 2018-04-19 15:25:26 -04:00
Jonathan Rainville
6c5415b27f base code for import parse 2018-04-19 15:25:26 -04:00
Iuri Matias
e1a9023bb2
Merge pull request #370 from embark-framework/feature/log-level-as-argument
Support setting log level as an argument
2018-04-19 13:03:00 -04:00
emizzle
09ca551a22 Add --loglevel validation for run and build 2018-04-19 14:43:41 +10:00
emizzle
96495b99c3 Support setting log level as an argument
* Add loglevel and logfile switch to `embark build`
* Support existing `loglevel` and `logfile` switch for `embark run/upload`
* make casing consistent for `loglevel` and `logfile`
* remove passing engine to `build()` and instead pass needed objects in options.
* prevent duplicate plugin initiation (above point)
* allow `Events` object to be passed to `Engine` constructor and `init()`
* prevent echo of upload commands to allow interception and control via logging
2018-04-19 14:25:43 +10:00
Iuri Matias
849e34a16b
Merge pull request #369 from embark-framework/features/mapping-urls
Add new mappings for Solidity (HTTP and Github)
2018-04-18 15:42:54 -04:00
Jonathan Rainville
a435bcc328 oopsie removed zeppelin config 2018-04-18 15:36:54 -04:00
Jonathan Rainville
5ca9dd73de package locks 2018-04-18 15:04:04 -04:00
Jonathan Rainville
df226919c0 change file creation with using File.types 2018-04-18 15:02:50 -04:00
Jonathan Rainville
5925124978 fix unit tests and add test_appp test for http contracts 2018-04-18 14:56:18 -04:00
Jonathan Rainville
b931efcf7d fix dir in contractsDirectory 2018-04-18 12:59:58 -04:00