embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,947 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

179 Commits

Author SHA1 Message Date
emizzle 6ef78ff770 include fix for bug 2018-05-01 00:03:31 +10:00
Jonathan Rainville 0d20d422ce hotfix for watch not defined 2018-04-30 09:29:31 -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 0dd2938abe reset watchers after build to make sure files remain watch 2018-04-27 16:34:13 -04:00
Jonathan Rainville 2827deb418 fix on contract add 2018-04-27 13:50:57 -04:00
Iuri Matias 1cfe46db55 intercept logs in the app itself - stopgap fix 2018-04-26 17:19:45 -04:00
Eric Mastro 4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm 2018-04-26 19:05:56 +10:00
emizzle f59a187bce Removed unused host/port options passed in to the swarm service. 2018-04-26 12:59:57 +10:00
Jonathan Rainville f39acbdd42 get context from cmd ran and use arrays of contexts 2018-04-25 10:34:17 -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
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 16909c7f1a if version name doesn't have /, then just use the full name 2018-04-23 12:14:48 -04: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
emizzle d985a5ed69 Fixing `--logLevel` option for `embark run` 
Intercepting logs for embark run and including logLevel for displayed logs.
 2018-04-17 16:17:59 +10:00
Jonathan Rainville dc9e6c168b start vyper implementation 2018-04-13 14:59:01 -04:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts 
Graphviz contracts
 2018-04-13 11:29:23 -04:00
Iuri Matias 9d261472f9 extract node name and version (so it displays just like in 2.6.0) 2018-04-10 15:14:00 -04:00
Iuri Matias 044759ef52 get node name and version 2018-04-10 15:08:08 -04:00
Richard Ramos d7b33a309b Changed logic of deploy manager to be able to only compile the code and not deploy it 2018-03-23 10:02:23 -04:00
Iuri Matias c1d258b819 add events to logger 2018-03-15 16:44:05 -04:00
Iuri Matias 83227beaa1 add option to specify a logfile to output the logs 2018-03-10 13:45:56 -05:00
Iuri Matias 445133cfdf move setStatus from logger to event bus 2018-02-27 15:49:21 -05:00
Iuri Matias 41baca4b51 don't redeploy if an asset has been changed and not a contract 2018-02-21 18:43:34 -05:00
Iuri Matias e2aa46eac8 define default account for each contract 2018-01-12 18:06:51 -05:00
Iuri Matias 59642b4160 fix web3 versioning 2018-01-10 10:43:25 -05:00
Iuri Matias 4fcfc6c142 update whisper check 2018-01-05 15:30:52 -05:00
Iuri Matias 59c3d82260 update web3.js 2018-01-05 15:10:47 -05:00
Iuri Matias 3e1f16c673 update tests 2017-12-30 17:07:13 -05:00
Iuri Matias 11af38268b refactor: get versions from module instead of config 2017-12-30 16:48:53 -05:00
Iuri Matias dee49ec5ed add createPlugin; move cmds to library managers 2017-12-30 15:52:51 -05:00
Iuri Matias 310712567f move whisper to a module 2017-12-28 12:40:11 -05:00
Iuri Matias 17a7dcf3e6 remove unsupported whisper protocol msg 2017-12-27 20:58:14 -05:00
Iuri Matias eaf9016c79 move ipfs service check to its module 2017-12-26 20:32:51 -05:00
Iuri Matias 799da089af refactor webserver code 2017-12-19 09:50:29 -05:00
Iuri Matias 76be683ed2 refactor webserver 2017-12-18 09:37:16 -05:00
Iuri Matias 14d330a729 fix webserver service check 2017-12-17 18:58:55 -05:00
Iuri Matias 113bb25142 add webserver start/stop cmd 2017-12-17 18:34:41 -05:00
Iuri Matias 67dd4a22cb update tests 2017-12-16 17:10:11 -05:00
Iuri Matias ce4f75ddc4 extract solc to its own module 2017-12-16 17:08:18 -05:00
Iuri Matias 301ba94ef6 refactor httpGet 2017-12-15 22:11:55 -05:00
Iuri Matias c55b011675 fix eslint issues 2017-12-13 20:15:57 -05:00
Iuri Matias 4106531bd7 warn user when IPFS comes back online 2017-12-13 18:15:59 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias b7b5fae2c8 imports with shared web3 object 2017-12-13 15:53:29 -05:00
Iuri Matias 58cf9ca78d take into account config in ipfs service check 2017-12-07 10:26:17 -05:00
Iuri Matias dd8135445d Merge branch 'next' into develop 2017-10-17 07:03:54 -04:00
Iuri Matias 460f78cc55 update events name for code generation 2017-10-17 07:03:13 -04:00
Iuri Matias 0e9b90b4ee comply with linter 2017-10-14 10:13:30 -04:00
Iuri Matias 2dc1941e48 rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator 2017-08-03 19:29:09 -04:00
Iuri Matias 232f6fc88b support list of fallbacks for dapp web3 connection, support separate connection config for deployment 2017-07-06 18:48:20 -04:00
Iuri Matias f882b3486b use deployment config from contracts.json instead of blockchain.json 2017-07-05 20:24:28 -04:00
Iuri Matias f45ce963b4 add file type so files are loaded when needed; support to configure web3 and solc versions 2017-07-05 08:35:51 -04:00
Iuri Matias ffbf6a70c5 include whisper version in the dashboard 2017-06-27 17:05:35 -04:00
Iuri Matias 2a2a5820fc fix testing functionality in develop 2017-06-26 09:01:54 -04:00
Iuri Matias 47f313b12c generate json files 2017-04-04 06:37:50 -04:00
Iuri Matias 86335e0c74 move http request to utils 2017-04-02 14:40:10 -04:00
Iuri Matias 9ce25d7651 refactor services check to use on/off and let monitor decide colors 2017-04-01 23:22:43 -04:00
Iuri Matias faf0e1ff48 revert some of the recent changes 2017-03-31 07:34:43 -04:00
Todd Baur fbe3f302b2 cleanup code from linter feedback 2017-03-30 20:38:14 +09:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Todd Baur 5bf1475ea4 swap more var -> let 2017-03-30 02:50:05 +09:00
Iuri Matias 447f967061 add service check functionality to plugin api 2017-03-16 07:31:52 -04:00
Iuri Matias e8c8a85713 fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything 2017-03-12 21:32:06 -04:00
Iuri Matias c514765d0b move misc utils modules to their own folder 2017-03-11 11:03:20 -05:00
Iuri Matias ea70d09e8c move ethereum and whisper checks; refactor web3 connection 2017-03-11 10:29:45 -05:00
Iuri Matias 4bf31328e2 use eachObject to avoid async issues; support non-recurrent checks 2017-03-11 07:32:16 -05:00
Iuri Matias 173c571147 remove old services monitor; add new services monitor to engine; move previous checks to their modules inits 2017-03-10 22:00:30 -05:00
Todd Baur 83f3e1c5ee dot notation preferred 2017-03-08 23:52:17 +09:00
Todd Baur 486fbec108 read version in from package.json instead of strings 2017-03-08 23:20:23 +09:00
Iuri Matias 71121cdc4b update to 2.4.0 2017-03-07 06:39:56 -05:00
Iuri Matias b42031de6b fix cmd line webserver host override 2017-03-06 22:08:43 -05:00
Iuri Matias 8325943bd7 add new events for output generation and first deployment 2017-03-05 11:00:47 -05:00
Iuri Matias a797f8fcf6 fix account selection when it isn't configured; improve error message on tests 2017-03-04 21:51:28 -05:00
Iuri Matias 85659987d9 add support for website config file; reflect real web server config in the dashboard 2017-03-04 14:20:28 -05:00
Iuri Matias 269552aee0 add events to plugin api 2017-03-04 12:42:24 -05:00
Iuri Matias 617d263341 reduce complexity of engine main metod 2017-03-03 21:48:32 -05:00
Iuri Matias 6799e1d8a5 remove comment 2017-03-03 01:25:14 -05:00
Iuri Matias cd45a2be77 refactor, move calls to engine; fix tests 2017-03-03 01:22:12 -05:00