Commit Graph

1145 Commits

Author SHA1 Message Date
Jonathan Rainville f2e52d1dbc create processLauncher that launches and subscribes to process 2018-05-17 15:26:44 -04:00
Iuri Matias c1de9defcd
Merge pull request #424 from embark-framework/features/remove-upload-option
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
2018-05-17 15:20:47 -04:00
Iuri Matias a967b304e3
Merge pull request #422 from 3esmit/patch-1
Initialize web3 provider before deployAll
2018-05-17 15:08:29 -04:00
Jonathan Rainville 8e2af920b8 early callback in compiler 2018-05-17 10:02:53 -04:00
Jonathan Rainville bcb7c80758 Early return if no sol files 2018-05-17 09:49:50 -04:00
Jonathan Rainville dd78aef3db fix vyper .vy 2018-05-17 09:40:38 -04:00
Iuri Matias f828e9d87e add missing comma 2018-05-17 08:58:26 -04:00
emizzle 627bf0c939 Removed `platform` from the upload command line option as it is being specified in the storage.json config.
Removed duplicates from en.json.

Fixed upload error message bug showing encoded interpolated string
2018-05-17 17:38:17 +10:00
Ricardo Guilherme Schmidt bc57ca62e3 add missing semicol 2018-05-17 03:00:23 -03:00
Ricardo Guilherme Schmidt 25e95c1002 add EmbarkSpec.getAccounts(cb) 2018-05-16 20:24:08 -03:00
Ricardo Guilherme Schmidt bfcf72b09a
Initialize web3 provider before deployAll
This makes possible to load accounts before deploying the contracts.
2018-05-16 19:40:24 -03:00
Iuri Matias 01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline
Refactor pipeline
2018-05-16 18:15:51 -04:00
Iuri Matias b1fab3e77c remove console logs 2018-05-16 18:15:23 -04:00
Iuri Matias 965c34d3ed replace the es file with one that contains all the existing keys 2018-05-16 18:11:39 -04:00
Jonathan Rainville c1f72061e3 add tests for processLauncher 2018-05-16 16:41:25 -04:00
Jonathan Rainville 441063dd10 add docs for eventWrapper 2018-05-16 16:41:25 -04:00
Jonathan Rainville 80c382557f add jsdoc to processWrapper 2018-05-16 16:41:25 -04:00
Jonathan Rainville d17256dc40 add JS Doc for processLauncher 2018-05-16 16:41:25 -04:00
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville 953ce6659e reorg subscribe to message method 2018-05-16 16:41:25 -04:00
Jonathan Rainville 1c125a019c conflict in en.json 2018-05-16 16:41:15 -04:00
Jonathan Rainville 3c0fda5a40 add eventWrapper not tested 2018-05-16 16:40:17 -04:00
Jonathan Rainville 36850895cf add process wrapper to handle logs 2018-05-16 16:40:17 -04:00
Iuri Matias 18e23ae334
Merge pull request #419 from embark-framework/bug_fix/max-listeners-warning
set max listeners to 50
2018-05-16 16:02:04 -04:00
Iuri Matias 52c9e51deb add keys for es 2018-05-16 15:28:17 -04:00
Jonathan Rainville e651884473 set to 200 per Iuri's request 2018-05-16 15:27:38 -04:00
Iuri Matias 597d40e824 add missing keys 2018-05-16 15:26:57 -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 8ae6c6a646 simplify buildContracts and buildWeb3JS methodsgst 2018-05-16 15:07:47 -04:00
Iuri Matias 4dcd644b7c remove listeners for command handlers 2018-05-16 13:57:27 -04:00
Iuri Matias 44d6cc32df remove old remove listener; fix callback 2018-05-16 13:56:23 -04:00
Iuri Matias ce781ab96e remove previous listener (for now) 2018-05-16 13:11:44 -04:00
Iuri Matias b7fc3f9054 refactor write contracts 2018-05-16 12:48:17 -04:00
Iuri Matias d8a1894803 remove extra method 2018-05-16 10:09:46 -04:00
Iuri Matias da84cfa769 add missing require 2018-05-16 10:03:05 -04:00
Iuri Matias 6544c2a999 move contracts generation from pipeline to code generator module 2018-05-16 10:00:56 -04:00
Iuri Matias 7271b00cf4 make file changes in the pipelins 2018-05-15 18:21:00 -04:00
Iuri Matias 1f6e386d9b build web3js generation from pipeline to code_generator 2018-05-15 18:05:44 -04:00
Iuri Matias 256276c884
Merge pull request #415 from embark-framework/features/cargo
Add a cargo to not run file write for each file
2018-05-15 18:01:25 -04:00
Iuri Matias 760bd984d8 only close watcher when it's actually ready 2018-05-15 17:20:43 -04:00
Jonathan Rainville 38cf7a4aa8 throttle contracts too 2018-05-15 15:41:24 -04:00
Jonathan Rainville 6bff25f3b6 hotfix hide logs of hard-source 2018-05-15 15:01:38 -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 24c4c51232 add locales 2018-05-14 12:14:05 -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 a03757a5e6
Merge pull request #412 from embark-framework/js_config
support for js configs
2018-05-12 13:13:15 -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 7d8dd02db1 silence bluebird warning 2018-05-11 16:18:53 -04:00
Iuri Matias 26187cfa1d add missing default from 2018-05-11 16:18:44 -04:00
Iuri Matias 3a62f6a121 update default dev networkid to be the same as --dev option chainId 2018-05-11 10:23:52 -04:00
Iuri Matias 7686ad561f detect web3 version and get accounts correctly 2018-05-11 08:20:03 -04:00
Iuri Matias 4236f56147 add missing option 2018-05-10 15:36:24 -04:00
Iuri Matias 2e324484d4 add missing option 2018-05-10 15:26:09 -04:00
Iuri Matias 854fa0deb0 add locale option to most cmds 2018-05-10 15:02:03 -04:00
Iuri Matias 517a3bf234 move i18n and locales to its own folder; abstract it a bit; detect at initialization; add cmd line option 2018-05-10 15:01:34 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Jonathan Rainville 1bb808a767
Merge pull request #404 from embark-framework/chore/webpack-optimization
Add a plugin that caches to increase file processing speed
2018-05-10 14:46:52 -04:00
Jonathan Rainville 59c61d6be1 hode messages from plugin 2018-05-10 14:45:35 -04:00
Jonathan Rainville fbd36b58e5 ignore tmp files 2018-05-10 13:42:02 -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 986ef520fc add plugin that caches 2018-05-10 12:22:58 -04:00
Jonathan Rainville a35ce6f73e pass normalizeInput 2018-05-10 11:14:25 -04:00
Jonathan Rainville 83f97407e8 touch ups 2018-05-10 10:48:06 -04:00
Jonathan Rainville 31e82e31d0 do a process for each file 2018-05-10 10:43:10 -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
Jonathan Rainville 8cc485ac94 add isDev blockchain option 2018-05-09 15:16:46 -04:00
Jonathan Rainville 2913617a81 fix command (reset) 2018-05-09 15:16:46 -04:00
Jonathan Rainville 92c8d70dd5 change warning to tell about --reset 2018-05-09 15:16:46 -04:00
Jonathan Rainville 46e1ccd81b use --dev when in development 2018-05-09 15:16:46 -04:00
Jonathan Rainville edbc77afca hotfix console 2018-05-08 14:51:51 -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 a03777dc65 async buildContractJs 2018-05-08 09:41:19 -04:00
Jonathan Rainville 4ec7fbb9db async buildContracts 2018-05-08 09:36:50 -04:00
Jonathan Rainville 2dd9e8f2ea async contract write 2018-05-08 09:25:37 -04:00
Jonathan Rainville af38383e0f lint 2018-05-08 09:04:53 -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
Richard Ramos 3f8450f060 Extra functionality for deciding which elements to include in a graph 2018-05-04 16:17:12 -04:00
Iuri Matias b1a499cf0e update template message 2018-05-03 17:32:10 -04:00
Iuri Matias be7723e077
Merge pull request #392 from embark-framework/bug_fix/whisper-demo
Fix Whisper demo
2018-05-02 16:12:33 -04:00
Jonathan Rainville 3266f20a0f fix glob in windows 2018-05-02 15:48:06 -04:00
Jonathan Rainville 41b2741ba5 add optionnal callback 2018-05-02 12:10:11 -04:00
Iuri Matias 0cffff067a
Merge pull request #390 from embark-framework/features/add-swarm-to-embarkjs
Added swarm support in embarkjs, isAvailable for messages/storage, swarm/ipfs checks
2018-05-01 18:52:22 -04:00
Jonathan Rainville 3bf5093f1b more linting and add condition in case of no hash 2018-05-01 10:20:27 -04:00
Jonathan Rainville 2ad852667e add early returns and lint 2018-05-01 09:38:13 -04:00
Jonathan Rainville 67c932c77d fix contracts in dashboard by removing the double evaluation 2018-05-01 09:20:19 -04:00
emizzle b93b3b4e47 Merge branches 'features/add-swarm-to-embarkjs' and 'features/add-swarm-to-embarkjs' of https://github.com/embark-framework/embark into features/add-swarm-to-embarkjs 2018-05-01 00:06:26 +10: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
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
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
Iuri Matias 5aa05c8094
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
Fix adding a contract
2018-04-27 14:08:02 -04:00
Jonathan Rainville 2827deb418 fix on contract add 2018-04-27 13:50:57 -04:00
Jonathan Rainville 4a9ff1fe9d check if testrpc is installed and warn if not 2018-04-27 09:16:29 -04:00
Iuri Matias 1cfe46db55 intercept logs in the app itself - stopgap fix 2018-04-26 17:19:45 -04:00
Iuri Matias 17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
Small fixes for plugin APIs
2018-04-26 17:06:05 -04:00
Iuri Matias 6a3add8e04
Merge pull request #383 from embark-framework/no_contracts
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:56:13 -04:00
Iuri Matias 3b736f56a7 don't error if it's an empty dapp with no contracts yet 2018-04-26 14:15:43 -04:00
Jonathan Rainville d046feb83d fix a bug where upload cmd used plugin name 2018-04-26 14:00:41 -04:00
Jonathan Rainville e4566f9f81 add more registers but generation one fails in run 2018-04-26 09:40:41 -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 ef0bcbf405 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.
2018-04-26 21:37:00 +10: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
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 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 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 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 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
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
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
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
Iuri Matias e5ae6bc86e
Merge pull request #367 from embark-framework/refactor/vyper-utils
Refactor Vyper compiler
2018-04-17 11:35:38 -04:00
Jonathan Rainville 6f119eeb1b move vyper contract compile to static util function 2018-04-17 11:25:46 -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
emizzle a3d2cc9a2c Moved console "ready" message to write after outputDone event is emitted 2018-04-17 14:11:22 +10:00
Jonathan Rainville dd1c10fe85 remove useless waterfall 2018-04-16 13:11:55 -04:00
Iuri Matias ad136802da
Merge pull request #365 from embark-framework/bug_fix/fix-versions-with-spaces
Fix versions with spaces and add warning
2018-04-16 12:07:02 -04:00
Jonathan Rainville 891a4e0a0f fix versions with spaces and add warning 2018-04-16 11:38:46 -04:00
Eric Mastro 8bdf79b19a Handling for error during build. 2018-04-15 20:31:26 +10:00
Eric Mastro 8fc978eb50 * Removed duplicated code to build and deploy contracts and replaced with a call to the build function.
* Updated upload functions to use async `exec` and removed returns from the callbacks.
2018-04-15 20:31:16 +10:00
Eric Mastro c1c61de2d5 Passed in success messaging to async callback. 2018-04-15 20:31:08 +10:00
Eric Mastro 31a2a27e9a #156326148 Updates to build and upload process and fixes for test_app/test.html
* Updated build to include deployment of contracts 
* updated the plugin uploadCmd to be a Promise for better bubbling of errors and messaging.
* updated test.js imports so functionality works correctly.
2018-04-15 20:30:59 +10:00
Eric Mastro 6b7af4b647 #156326148 Build contracts and dapp before upload. 2018-04-15 20:30:52 +10:00
Jonathan Rainville 99c04b405f fix clas name and bytecode 2018-04-13 15:48:19 -04:00
Jonathan Rainville 17e1c71506 submit contract for deployment, not working yet 2018-04-13 14:59:01 -04:00
Jonathan Rainville dc9e6c168b start vyper implementation 2018-04-13 14:59:01 -04:00
Jonathan Rainville 7d8c7b119c add warning after compile for files without a compatible compiler 2018-04-13 14:59:01 -04:00
Jonathan Rainville 6647c31d38 hotfix: callback with wrong parameter order 2018-04-13 14:54:46 -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 b56f20db8a
Merge pull request #359 from embark-framework/node_module_import
better mappings
2018-04-12 20:41:52 -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 e0ab9cbde4 refactor findImports 2018-04-12 17:57:55 -04:00
Iuri Matias db61e355c1 look for contract import in dapp dir and node_modules 2018-04-12 17:55:57 -04:00
Iuri Matias e3fde1ad22 support mapping contract file in contracts config 2018-04-12 17:54:08 -04:00
emizzle 4a9b52e5df Removed annoying [Object object] from the log that was appearing during contract compilation.
The warnings in object that were attempted to be logged were already being logged in a previous loop, so this was simply removed.
2018-04-12 13:47:34 +10: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 282067649c
Merge pull request #356 from embark-framework/bug_fix/fix-tests-in-windows
Fix tests breaking because of line-endings
2018-04-10 17:08:27 -04:00
Jonathan Rainville e90cead578 fix tests breaking because of line-endings 2018-04-10 16:38:49 -04:00
Jonathan Rainville 6905698bcc fix swarm upload too 2018-04-10 16:02:59 -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
Jonathan Rainville e731495109 fix upload on windows 2018-04-10 14:17:59 -04:00
Jonathan Rainville 2907510b6e fix arrows in ipfs get by using ipfsConnection.get 2018-04-10 13:33:13 -04:00
RJ Catalano 586ecd00c8
Merge pull request #352 from embark-framework/bug_fix/async_log_fix
Fix console.dir messing up the console
2018-04-09 16:22:02 -05:00
Jonathan Rainville 3ecb195b38 move import list out of loop to accelerate build process 2018-04-09 16:29:49 -04:00
Jonathan Rainville f37b09a371 fix build process on windows 2018-04-09 16:14:07 -04:00
Iuri Matias 3a89b3f951 intercept dir and pass it to the logger 2018-04-09 15:24:01 -04:00
Richard Ramos f56b42d91f Linting 2018-04-05 11:41:28 -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