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

614 Commits

Author SHA1 Message Date
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
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 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
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
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
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
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 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
Jonathan Rainville df226919c0 change file creation with using File.types 2018-04-18 15:02:50 -04:00
Jonathan Rainville b931efcf7d fix dir in contractsDirectory 2018-04-18 12:59:58 -04:00
Jonathan Rainville 9faf644c31 add loading in file.js but includes a patch to fix 2018-04-18 12:09:42 -04:00
Jonathan Rainville ce34d40fe7 integrate downloadCOntract function in contract get function 2018-04-18 09:07:39 -04:00
Jonathan Rainville 2568ec1aec implement the download function 2018-04-17 16:34:37 -04:00
Jonathan Rainville cf14b3784f add getUrl function for external contracts + tests 2018-04-17 15:07:00 -04: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 5ed1e787b2 print error if contract file is not found 2018-04-12 20:30:20 -04:00
Iuri Matias 7dd36a7a3b support getting contract from module; fix bug in which entire contract path was being replaced instead of just the beginning (if matching contracts in embark.json) 2018-04-12 18:50:47 -04:00
Iuri Matias e3fde1ad22 support mapping contract file in contracts config 2018-04-12 17:54:08 -04:00
Iuri Matias e0982e0427
Merge pull request #355 from embark-framework/bug_fix/node_name 
restore properly display node name and version
 2018-04-11 08:06:42 -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
Iuri Matias 3a89b3f951 intercept dir and pass it to the logger 2018-04-09 15:24:01 -04:00
Richard Ramos d038ed414d Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts 2018-04-05 11:35:19 -04:00
Iuri Matias 2ec7589f90 refactor to use dappPath 2018-04-02 15:30:16 -04:00
Iuri Matias e0db5ed61a refactor to use dappPath 2018-04-02 15:06:56 -04:00
Iuri Matias 10f7d21f81 fix tests, enable blockchain component by default 2018-04-02 14:44:55 -04:00
Iuri Matias d3b0787895 eslint is king 2018-03-31 21:15:53 -04:00
Iuri Matias 02e407f90b completly disable opted-out components 2018-03-31 21:08:25 -04:00
Iuri Matias bab0171120 revert versions update for now; support granular config on embark json 2018-03-31 21:06:00 -04:00
Iuri Matias 03f0b07d81 support versions on embark json config 2018-03-31 19:35:20 -04:00
Iuri Matias d5a21d579c fallback to shelljs if pwd is empty (windows issue) 2018-03-26 15:08:07 -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 9582efbe65 fix logger call 2018-03-15 17:18:20 -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 66e9d6afa3 move contractsState from logger to event bus 2018-02-27 15:40:05 -05:00
Iuri Matias 96df409229 comply with linter 2018-02-24 09:26:43 -05:00
Iuri Matias 349807496a improve directory copying 2018-02-23 20:36:11 -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 3b60793b25 remove old jshint directives 2018-02-07 19:49:54 -05:00
Iuri Matias 639612579b if no env present just return final object 2018-01-20 09:01:18 -05:00
Iuri Matias b19194fc6b refactor config code 2018-01-19 22:08:39 -05:00
Iuri Matias 10c4c75236 move tests related files to their own folder 2018-01-19 21:13:20 -05:00
hodlbank 07c6be968a [+] Added beforeDeploy handlers. 
[+] Plugins can call embark.registerBeforeDeploy() to register beforeDeploy handlers.
 2018-01-17 23:04:19 +00:00
Iuri Matias a322d03053 support external node in tests 2018-01-15 09:51:45 -05:00
Iuri Matias ea8f3a2232 improve gas handling and errors 2018-01-13 11:38:10 -05:00
Iuri Matias ef0bc04f77 clean up; fix gas requirements 2018-01-12 18:36:29 -05:00
Iuri Matias e2aa46eac8 define default account for each contract 2018-01-12 18:06:51 -05:00
Iuri Matias 61c00819ec add reset cmd 2018-01-11 09:22:58 -05:00
Iuri Matias 82681fec8f support versioning ipfs-api 2018-01-10 11:15:32 -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 c7f8698e58 refactor events handler so it can handle multiple args 2017-12-30 17:51:52 -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 411ed41c84 fix console cmds api 2017-12-29 18:21:36 -05:00
Iuri Matias cb5230f569 comply with linter 2017-12-29 08:46:01 -05:00
Iuri Matias f00fa1c4aa refactor; flatten property list 2017-12-29 08:26:31 -05:00
Iuri Matias 4c1adf258b refactor: add method to get directly property 2017-12-29 08:08:04 -05:00
Iuri Matias 9ca337eeb1 extract storage provider 2017-12-28 17:42:25 -05:00
Iuri Matias 310712567f move whisper to a module 2017-12-28 12:40:11 -05:00
Iuri Matias e833ebd019 move ipfs embarkjs code to module 2017-12-28 12:16:50 -05:00
Iuri Matias 8de81c33bd Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-28 07:00:17 -05:00
Iuri Matias 17a7dcf3e6 remove unsupported whisper protocol msg 2017-12-27 20:58:14 -05:00
Iuri Matias 750eace6ce always define contract code so ondeploy cmds work 2017-12-27 11:40:21 -05:00
Iuri Matias cff999def8 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-27 08:21:15 -05:00
Iuri Matias eaf9016c79 move ipfs service check to its module 2017-12-26 20:32:51 -05:00
Iuri Matias 50f1072372 move upload to its own module 2017-12-26 19:55:42 -05:00
Iuri Matias cd0fd94386 updatests; include options 2017-12-22 13:07:43 -05:00
Iuri Matias 52953a1d0d warn about cycling dependencies 2017-12-20 14:54:47 -05:00
Iuri Matias bc34e00268 better errors when parsing invalid json 2017-12-19 12:57:03 -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 8999d619c5 update tests 2017-12-16 17:55:27 -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 130b37f6fd minor refactor 2017-12-16 11:48:20 -05:00
Iuri Matias 7e1493c039 clean up 2017-12-16 11:45:29 -05:00
Iuri Matias a76dbb69b9 tolerate lack of blockchain config file 2017-12-16 08:48:37 -05:00
Iuri Matias 747237de76 fix defaults when contracts config file is not present 2017-12-16 08:12:38 -05:00
Iuri Matias 301ba94ef6 refactor httpGet 2017-12-15 22:11:55 -05:00
Iuri Matias 1666be1158 fix contract directories config 2017-12-15 17:14:00 -05:00
Iuri Matias c55b011675 fix eslint issues 2017-12-13 20:15:57 -05:00
Iuri Matias 9211279f8e fix eslint issues 2017-12-13 19:49:05 -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 92e22ea519 support special imports 2017-12-13 15:53:29 -05:00
Iuri Matias 038f57e7d2 fix new index example 2017-12-13 15:53:29 -05:00
Iuri Matias 3d36aaaeb3 support both old system and imports in the pipeline 2017-12-13 15:53:29 -05:00
Iuri Matias 33711c8db2 support imports 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 be64d2ff6b fix IPFS dependency 2017-12-06 11:37:44 -05:00
Iuri Matias e2cbc2a488 fix linting issues 2017-12-05 18:14:46 -05:00
Antonio Tenorio Fornés 4bb77ae8d5 Merge branch 'develop' into buildFixes 2017-10-24 20:56:57 +02:00
Iuri Matias 2690ada62d Merge branch 'next' into develop 2017-10-22 09:47:11 -04:00
Iuri Matias 05ebefff9a downgrade to 0.4.17 2017-10-22 09:44:32 -04:00
Iuri Matias f3a8e68c60 Merge branch 'next' into develop 2017-10-22 08:37:24 -04:00
Iuri Matias 38b1cf480e update solc version 2017-10-21 15:17:54 -04:00
Iuri Matias 398aff3af7 fix multiple issues with multiple file writes 2017-10-21 14:21:18 -04:00
Iuri Matias a18fb65e53 Merge branch 'next' into develop 2017-10-19 19:16:18 -04:00
Iuri Matias e23e4bc417 add blockchain ws config support; fix whisper provider setting 2017-10-19 18:55:49 -04: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 6157968c5e update default solc version; update spec; fix issue with compiler warnings 2017-10-17 06:51:52 -04:00
Iuri Matias 0e9b90b4ee comply with linter 2017-10-14 10:13:30 -04:00
Iuri Matias d1762a0fb4 refactor code generation 2017-10-13 20:01:35 -04:00
Iuri Matias 322fabab3d update tests; fix test module 2017-10-13 05:56:42 -04:00
Iuri Matias ef98346963 fix issues with the console 2017-10-07 19:53:57 -04:00
Iuri Matias a9e63069fb fix connecting to correct provider 2017-10-07 15:20:51 -04:00
Iuri Matias a78d8b00bf fix support for 1.0 versions of web3 2017-10-06 07:30:34 -04:00
Iuri Matias f41702634f add deprecated warning for deprecated events 2017-08-03 20:03:17 -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 2bf91b6d9a make storage getUrl configurable 2017-07-23 08:15:40 -04:00
Iuri Matias 414c875082 add versions command 2017-07-06 19:50:36 -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 2ed4eee831 display loading message when new libs are being installed 2017-07-05 18:26:44 -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 0991a87b73 add support for embark_js directive 2017-07-03 18:54:31 -04:00
Iuri Matias 0e904bba33 support contract as an alias 2017-07-03 18:15:43 -04:00
Iuri Matias 8e349cc6ed support directive 2017-07-02 18:03:14 -04:00
Iuri Matias 61e44b31e9 support specifying web3.js separetly 2017-07-02 14:55:35 -04:00
Iuri Matias 31ecaf0837 support to download specified versions of web3 2017-07-02 13:33:11 -04:00
Iuri Matias 263fdb6d8b support specifying file or folder when running tests 2017-07-02 11:32:16 -04:00
Iuri Matias ec9293af60 get rid of mocha requirement 2017-07-02 00:27:14 -04:00
Iuri Matias b473d68a1e include specific contract config given contract name 2017-07-01 12:55:46 -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
Antonio Tenorio Fornés 6f93d7e824 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 18:58:15 +02:00
Antonio Tenorio Fornés 46e18e34c5 remove duplicate dependency 2017-06-21 18:57:25 +02:00
Iuri Matias 4bb7f18155 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-06-19 06:33:07 -04:00
roo2 5232f0e74d fix crash in logger if message is null or undefined 2017-04-09 14:55:24 +10: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 f4dbeb4b7e revert some of the recent changes 2017-03-31 07:39:33 -04:00
Iuri Matias faf0e1ff48 revert some of the recent changes 2017-03-31 07:34:43 -04:00
Todd Baur 613e4e6abe integration testing fixes 2017-03-30 22:16:46 +09: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
Todd Baur 4ae5757bae add back in missing load commands 2017-03-30 02:04:35 +09:00
Todd Baur 2f5c647c39 this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects. 2017-03-30 00:37:30 +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
Todd Baur 124177c8fc speed up testing 2017-03-13 00:21:19 +09:00
Todd Baur 383b3c31a5 speed up test class - unstable 2017-03-12 12:23:30 +09:00
Iuri Matias 54420b327e detect when ethereum node comes back online and redeploy 2017-03-11 12:27:10 -05:00
Iuri Matias 8d8ff671f7 if monitor is already running then init service 2017-03-11 11:48:12 -05:00
Iuri Matias 5cf287a747 implement stopCheck 2017-03-11 11:23:42 -05:00
Iuri Matias 2dec088a9b add service check error 2017-03-11 11:17:52 -05:00
Iuri Matias c514765d0b move misc utils modules to their own folder 2017-03-11 11:03:20 -05:00
Iuri Matias 92f9df4117 remove async extension to a module 2017-03-11 10:52:02 -05:00
Iuri Matias c2c41549c1 cleanup; remove unneded requires 2017-03-11 10:38:05 -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
Iuri Matias a4369ecd4e implement (previously empty) stopMonitor method 2017-03-10 06:44:17 -05:00
Iuri Matias 02cb5b7f1f Merge pull request #237 from nogueian/develop 
Fixed issue with logic to detect if IPFS node is online
 2017-03-08 20:34:20 -05:00
Todd Baur 83f3e1c5ee dot notation preferred 2017-03-08 23:52:17 +09:00
Andy Nogueira f5aafa4242 Setting host and port parameters back according to develop branch 2017-03-08 09:51:58 -05:00
Andy Nogueira 82042c01c6 Fixed issue with logic to detect if IPFS node is online. If the IPFS node is not running and there's another service in the computer running on port 5001 it could cause an exception. 2017-03-08 09:46:15 -05: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 96d1361dd8 support defaults when new config files are not found, for backwards compatibility 2017-03-05 21:27:33 -05:00
Iuri Matias 007be84f23 add config to the plugin api (temporary) 2017-03-05 20:25:09 -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 94cca83670 simplify test constructor 2017-03-03 21:06:44 -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
Iuri Matias b7cd296716 make abi generation independent of deployment 2017-02-28 23:29:16 -05:00
Iuri Matias 1674adee4a add config to specify available providers for each component 2017-02-28 21:43:03 -05:00
Iuri Matias 09e58977e4 generate final embarkjs file depending on components enabled 2017-02-28 21:26:15 -05:00
Iuri Matias 5477b7f11c fix options varible; make cc happy 2017-02-27 07:49:25 -05:00
Iuri Matias e806a14af6 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-02-27 06:57:30 -05:00
Iuri Matias 60a617a28e don't intercept console error in plugins, causes too much issues; need to research a better way 2017-02-26 18:47:52 -05:00
DeviateFish 2642325868 Fix scoping 2017-02-26 14:33:58 -08:00
DeviateFish 5cf9048099 Add more options to testing setup 
Ability to retrieve the logger from contract deployment, as well as
override the default `embark.json`
 2017-02-26 14:33:14 -08:00
Iuri Matias a153859caf herge branch 'refactor_e' into develop 2017-02-25 23:32:08 -05:00
DeviateFish 289ece9df6 Updates to boilerplate and template creation 
Update `test` command to run `embark test`
Update `name` in `package.json` to be something more easily replaceable.
Use `sed` to replace above flag with DApp name
 2017-02-25 14:34:45 -08:00
Iuri Matias e9ce9dc6f1 add redeploy; don't reload compiler if it's already loaded 2017-02-25 15:47:35 -05:00
Iuri Matias 3433c75554 refactor pipeline to use events instead 2017-02-24 06:18:57 -05:00
Iuri Matias 0db2b663ad make cc happy 2017-02-23 19:45:25 -05:00
Andy Nogueira de37c94b2e Implemented logic to show version of the connected IPFS node on the dashboard 2017-02-23 17:18:05 -05:00
Andy Nogueira e3cbf3c680 Better name for services. Output Geth version is important 2017-02-22 08:21:45 -05:00
Andy Nogueira dd03c747f7 Fixed logic to prevent node exception when running command 'embark blockchain' outside the Dapp folder 2017-02-21 15:45:10 -05:00
Iuri Matias 73a536c52e refactor to use method to determine app root path, instead of constantly using relative paths 2017-02-19 19:44:16 -05:00
Iuri Matias 5e4ad9a7e5 reorder requires in a more logical manner 2017-02-19 13:17:28 -05:00
Iuri Matias 1868788342 reorgnize code structure 2017-02-19 12:51:32 -05:00