850 Commits

Author SHA1 Message Date
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
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