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

466 Commits

Author SHA1 Message Date
Iuri Matias e0e3887aaf add command event to add a contract file; fix internal plugin Path 2018-06-18 11:25:43 -04:00
emizzle a100dd4260 Requested PR fixes 
Added catch to live-plugin-manager install promise running in child process

Removed some `else`'s ;)

Only showing solc downloading spinner when `--nodashboard` option is used.

When installing package in main process and simultaneous downloads fail, all callbacks called with error.

Updated logging in npmTimer.
 2018-06-15 17:06:59 -04:00
Jonathan Rainville 6d4d904825 sort by internal so first ones are internal and plugins last 2018-06-14 16:58:03 -04:00
Iuri Matias 502788c7e0
Merge pull request #528 from embark-framework/cached_gas_issue 
fix cached gas issue
 2018-06-14 11:17:54 -04:00
Iuri Matias 5a2cf62ee5 reload config; create a config so it doens't damage original 2018-06-14 09:22:13 -04:00
Jonathan Rainville 37b69b43ff fix watch by not restarting anymore and enable config for contracts 2018-06-14 09:15:31 -04:00
Jonathan Rainville e1c5487ba4 fix callback already called on file download fail 2018-06-13 14:37:15 -04:00
Iuri Matias 4131cf42ef fix support for .json file in embark.json 2018-06-12 17:59:14 -04:00
Richard Ramos 8f52dd4cf3 Missing semicolon 2018-06-12 10:15:54 -04:00
Richard Ramos a9065b1eae Websocket handling 2018-06-12 08:50:49 -04:00
Richard Ramos a50e7c25a9 Not all messages received are json objects 2018-06-11 16:46:57 -04:00
Richard Ramos 03483052ea Adding error messages 2018-06-11 16:43:26 -04:00
Richard Ramos 48a3f2afdc Fixing conflicts 2018-06-11 16:43:08 -04:00
Richard Ramos 09c11662aa Removing unused variables 2018-06-11 16:40:59 -04:00
Richard Ramos a669538e70 Adding proxy to config, and closing on error 2018-06-11 16:40:59 -04:00
Richard Ramos 39d510cef4 Displaying status, gas and block number 2018-06-11 16:40:59 -04:00
Richard Ramos 8ef2dc124f Extracted console logging to its own file 2018-06-11 16:40:59 -04:00
Richard Ramos c1621c4029 Websocket support 2018-06-11 16:40:59 -04:00
Richard Ramos bf25381fa6 Rebasing changes from develop 2018-06-11 16:40:14 -04:00
Iuri Matias c6e63af12d remove unneded param 2018-06-08 13:55:24 -04:00
Jonathan Rainville 3d70028cc5 fixing small stuff 2018-06-07 13:01:12 -04:00
Iuri Matias 805091aa66
Merge pull request #482 from embark-framework/fuzzer 
Fuzzer
 2018-06-06 10:54:28 -04:00
Iuri Matias f44ed981b5
Merge pull request #481 from embark-framework/ipc 
add socket support
 2018-06-05 16:42:44 -04:00
Jonathan Rainville df3c5c2fd0 fix blockchain already booted 2018-06-05 14:39:18 -04:00
VoR0220 2056a7e9ad finish engine addition 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
Iuri Matias 0e6d526ab4 comply with linter 2018-06-05 08:37:27 -04:00
Iuri Matias 85443959e0 remove unneded option 2018-06-05 08:04:27 -04:00
Iuri Matias c0e559a7d9 assign roles so ipc connections don't conflict; fallback if can't connect to ipc 2018-06-04 18:15:37 -04:00
Iuri Matias a57bce2a40 refactor to use callbacks on ipc requests 2018-06-04 18:15:37 -04:00
Iuri Matias 37ade68804 debug console logs 2018-06-04 18:15:37 -04:00
Iuri Matias 1821e89346 refactor ipc to a module 2018-06-04 18:15:37 -04:00
Iuri Matias b16c06025b use ipc for compiler 2018-06-04 18:15:37 -04:00
Iuri Matias 72e24f5e1b improve loading time by only doing require when needed 2018-06-02 09:54:32 -04:00
Iuri Matias 083961fc21 remove unneeded assignments 2018-06-01 19:32:14 -04:00
Iuri Matias eadbeb0498 use monitor as a service 2018-06-01 19:32:14 -04:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Iuri Matias a3de13e011 refactor to addPluginType 2018-06-01 19:30:51 -04:00
Jonathan Rainville f3d55f6742 patch weird event max listeners bug 2018-06-01 13:44:54 -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 85117cf55c Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-06-01 13:35:11 +10:00
emizzle 6ac8672a31 Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:34:49 +10:00
emizzle 942a57aa3a 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:33:44 +10:00
emizzle 0cb79d84a0 Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-06-01 13:30:01 +10:00
emizzle ec15823dbc Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:28:28 +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 9929415da8 remove unneded passing of contracts manager 2018-05-31 10:09:26 -04:00
Iuri Matias b43a766de7 cleanup module call 2018-05-30 13:38:08 -04:00
Iuri Matias 4f20d31b4c add emitAndRunActionsForEvent 2018-05-30 13:38:08 -04:00
Iuri Matias 45f7767313 remove contracts manager dependency from deploy manager 2018-05-30 13:38:08 -04:00
Iuri Matias 1d782c0e53 emit contractsDeployed event only 2018-05-30 13:38:08 -04:00
Iuri Matias 1912981d7d move contract deploy code to contract deployer; move it to events 2018-05-30 13:38:08 -04:00
Iuri Matias f1cb7d1187 lint is king 2018-05-30 13:35:36 -04:00
Iuri Matias 8458acd207 filter for plugins that have defined properties 2018-05-30 13:35:36 -04:00
Iuri Matias 3f20f400dd certify pluginTypes are uniques, to avoid issue with a plugin call being called twice or more 2018-05-30 13:35:36 -04:00
Iuri Matias 71cd523f30 remove old methods 2018-05-30 13:35:36 -04:00
Iuri Matias 16653d491b move onDeploy to new api 2018-05-30 13:35:36 -04:00
Iuri Matias 4f45b4fa13 add new plugin method for generalized event actions 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 742632eccf remove contractsManager dependency 2018-05-30 13:35:36 -04:00
Jonathan Rainville b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville 023d8f7f5f fix logs 2018-05-30 10:57:25 -04:00
Jonathan Rainville f08c700151 reverse plugin.js changes 2018-05-30 10:57:25 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
VoR0220 90b42bccb2 template correction to check for development environment and whether metamask is engaged and log that it is 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-28 12:27:55 -05:00
Iuri Matias ef3bde1053 add missing code init 2018-05-28 11:42:22 -04:00
Iuri Matias 3750fc297b add missing module init 2018-05-28 11:10:09 -04: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
Jonathan Rainville a69d12e637 pass isDev and locale to process 2018-05-23 11:52:07 -04:00
Jonathan Rainville 4815555a89 remove engine onReady 2018-05-23 11:17:02 -04:00
Jonathan Rainville 6145c0b92c start node only when no node is present 2018-05-23 11:17:02 -04:00
Jonathan Rainville 29a50ea9cd refactor assertNodeConnection to use it in watch 2018-05-23 11:17:02 -04:00
Iuri Matias 315d8c2197 fix merge 2018-05-23 11:17:02 -04:00
Jonathan Rainville f935fee566 add i18n for blockchain node logs 2018-05-23 11:17:02 -04:00
Jonathan Rainville e69b8bab56 conflict in en.json 2018-05-23 11:17:02 -04:00
Jonathan Rainville 7f45b6724a finish hiding logs 2018-05-23 11:17:01 -04:00
Jonathan Rainville 2062f9032c conflict in en.json 2018-05-23 11:17:01 -04:00
Jonathan Rainville 3fcc36a7a1 launch blockchain in separate process 
works but still cant getAccounts
 2018-05-23 11:17:01 -04:00
Jonathan Rainville aea270af02 detect no node using request 2018-05-23 11:17:01 -04:00
Jonathan Rainville 5f3361d030 conflict in en.json 2018-05-23 11:16:56 -04:00
Iuri Matias 3e9376138b move runCode 2018-05-23 11:16:17 -04:00
Jonathan Rainville 592b4ed4fd conflict in code_generator 2018-05-23 11:16:13 -04:00
Iuri Matias a664492d1f move onDeploy to special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias c800598e9b move afterDeploy code into a special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias 000d7beb27 move code to assert connection to blockchain module 2018-05-23 11:15:06 -04:00
Iuri Matias 16eaacbd54 call compiler through a request 2018-05-23 11:15:05 -04:00
Iuri Matias ba29f0e928 move deploy tracker into a module 2018-05-23 11:15:05 -04:00
Iuri Matias 68c277cad1 remove unneded references to web3 objects; leave clarifying notes 2018-05-23 11:15:05 -04:00
Iuri Matias ac45b7a19b remove unneded assigment; add clarification/TODO 2018-05-23 11:15:05 -04:00
Iuri Matias ae93d78cc2 move accounts to web3 module 2018-05-23 11:15:04 -04:00
Iuri Matias 4d0ebc03ad move web3 init to its own module 2018-05-23 11:15:04 -04:00
emizzle db9fbef140 Add loading placeholder page while embark is building asset files. 
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
 2018-05-22 15:15:34 +10:00
Iuri Matias e2c2373249 accept hash of objects as second param for runcode 2018-05-18 15:55:34 -04:00
Jonathan Rainville 6c1d9d9b39 rename startProvider to startWeb3Provider 2018-05-18 13:39:35 -04:00
Jonathan Rainville 09cdab7e2b fund account only in dev 2018-05-18 13:39:35 -04:00
Jonathan Rainville 6c8653ef09 move code to front end. funds on provider start 2018-05-18 13:39:34 -04:00
Jonathan Rainville 418c55851b remove warning when dev 2018-05-18 13:39:34 -04:00
Iuri Matias 01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline 
Refactor pipeline
 2018-05-16 18:15:51 -04:00
Jonathan Rainville e651884473 set to 200 per Iuri's request 2018-05-16 15:27:38 -04:00
Iuri Matias 00e3af9012 lint is king 2018-05-16 15:18:12 -04:00
Jonathan Rainville 0611fee841 set max listeners to 50 2018-05-16 15:08:22 -04:00
Iuri Matias 4dcd644b7c remove listeners for command handlers 2018-05-16 13:57:27 -04:00
Jonathan Rainville 38cf7a4aa8 throttle contracts too 2018-05-15 15:41:24 -04:00
Jonathan Rainville 8cee44cbd7 conflict in package lock 2018-05-15 14:42:06 -04:00
Jonathan Rainville 38dffb9eed move provider to contracts 2018-05-15 12:45:38 -04:00
Jonathan Rainville fdf8791c1c fix mnemonic accounts 2018-05-15 11:33:19 -04:00
Jonathan Rainville c5f80c72b9 add 0x if private key doesn't have it 2018-05-14 16:38:15 -04:00
Jonathan Rainville 7b1a219b51 pass isDev to engine so that it can show a warning 2018-05-14 14:32:19 -04:00
Jonathan Rainville 3f09d5d3f0 add tests for getContract 2018-05-14 14:04:26 -04:00
Jonathan Rainville e470a63905 enable comma separated keys in file 2018-05-14 13:30:13 -04:00
Jonathan Rainville 890faf260d remove sync methods as they are now unsupported 2018-05-14 12:12:14 -04:00
Jonathan Rainville 37ca90ad9b add wallet and clean up 2018-05-14 12:08:03 -04:00
Jonathan Rainville 00bc3050ba intercept get accounts 2018-05-14 11:18:48 -04:00
Jonathan Rainville b7908a3797 conflict in package lock 2018-05-14 11:18:48 -04:00
Jonathan Rainville a32c04c751 fix conflict in engine 2018-05-14 11:18:48 -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
Jonathan Rainville a3f8c809a0 add queue for changes to do only one file build at the time 2018-05-10 13:28:12 -04:00
Jonathan Rainville a35ce6f73e pass normalizeInput 2018-05-10 11:14:25 -04:00
Jonathan Rainville ed1d0ce67c make only webpack in a separate process 2018-05-10 10:10:09 -04:00
Iuri Matias 911efe4e84
Merge pull request #400 from embark-framework/features/write-files-process 
Write files in a different process
 2018-05-09 16:57:43 -04:00
VoR0220 cdf46f2b30 fix linting errors and clean up ze code 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-08 10:53:34 -05:00
VoR0220 ab53bfba0c fix linting errors 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-08 10:41:38 -05:00
Jonathan Rainville dc7a002c1e improve logging 2018-05-08 11:31:47 -04:00
VoR0220 819dec1bc3 profile me officer, here's a new module 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-08 10:30:46 -05:00
Jonathan Rainville 7d64b705a3 touch ups 2018-05-08 09:52:06 -04:00
Jonathan Rainville 4ec7fbb9db async buildContracts 2018-05-08 09:36:50 -04:00
Jonathan Rainville 1fe6f4ee2c more async 2018-05-08 09:02:46 -04:00
Jonathan Rainville 1d5f015aaa async some functions 2018-05-08 08:54:10 -04:00
Jonathan Rainville e85d8b1ae5 fix file writing, now working 2018-05-07 16:33:30 -04:00
Jonathan Rainville d2d29be334 fix getting web3 location and provider code 2018-05-07 15:48:01 -04:00
Jonathan Rainville 148a74f3d6 make pipeline js in a different process (still doesnt work) 2018-05-07 14:30:30 -04:00
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 94c493e854 redeploy with right config on config change 2018-04-27 15:10:24 -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
Jonathan Rainville 61be2c7bd7 addFileToPipeline test and registerBeforeDeploy with new arg 2018-04-26 09:40:32 -04:00
Jonathan Rainville c818326f2e test add config and contract and add test 2018-04-26 09:40:26 -04:00