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

1945 Commits

Author SHA1 Message Date
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
Iuri Matias 9a79df68d9
Merge pull request #371 from embark-framework/features/download-imports-too 
Download Imports for downloaded contracts
 2018-04-19 15:38:16 -04:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -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 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
Iuri Matias 849e34a16b
Merge pull request #369 from embark-framework/features/mapping-urls 
Add new mappings for Solidity (HTTP and Github)
 2018-04-18 15:42:54 -04:00
Jonathan Rainville a435bcc328 oopsie removed zeppelin config 2018-04-18 15:36:54 -04:00
Jonathan Rainville 5ca9dd73de package locks 2018-04-18 15:04:04 -04: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
Jonathan Rainville 0948b04366
Merge pull request #368 from embark-framework/await_tests 
convert example tests to use await
 2018-04-17 14:59:57 -04:00
Iuri Matias 424c7afc70 convert example tests to use await 2018-04-17 14:48:31 -04:00
Iuri Matias 1415ce0d62 upgrade to latest web3.js 2018-04-17 14:48:17 -04:00
Iuri Matias eb599a479d remove testing node 6 from travis (no longer supported) 2018-04-17 14:48:08 -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
Iuri Matias 114bf7ff64
Merge pull request #366 from embark-framework/bug_fix/fix-ready-printed-before-complete 
Moved console "ready" message to write after outputDone event is emitted
 2018-04-17 08:38:49 -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
Iuri Matias 39c7e3c625
Merge pull request #364 from embark-framework/bug_fix/build-before-upload-fixed 
Bug fix/build before upload fixed
 2018-04-16 11:13:09 -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
Iuri Matias f9b7f5c034 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2018-04-13 16:56:10 -04:00
Iuri Matias 1d80f80823 remove unnnecessary chains files 2018-04-13 16:55:55 -04:00
Iuri Matias 1bd0b9931c
Merge pull request #363 from embark-framework/features/vyper-plugin 
Add Vyper contract support
 2018-04-13 16:25:53 -04:00
Jonathan Rainville d3e9dc75ec update readme to include Vyper doc 2018-04-13 16:06:56 -04: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