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

456 Commits

Author SHA1 Message Date
VoR0220 8b07039907 should work to create the reverse lookup 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 16:53:39 -05:00
VoR0220 fe84cc8de4 last major issue 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 13:05:42 -05:00
VoR0220 793a618c12 more fixes 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 13:00:34 -05:00
VoR0220 bf40bdb93b linting fixes and import fixes and some cleanup of the logic 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 12:13:06 -05:00
VoR0220 ea17e235f3 fix further linting issues 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:55:11 -05:00
VoR0220 8748084a6b fix indentations for linting purposes 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:50:55 -05:00
VoR0220 5028bd90e0 flesh out the index for ENS a bit further 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:47:57 -05:00
VoR0220 4de830ca29 resolve appears to be done, now I just need some help wiring the module together 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:47:57 -05:00
VoR0220 3aa4c9fd1f beginning of creating the ens provider 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:47:57 -05:00
Jonathan Rainville 29a50ea9cd refactor assertNodeConnection to use it in watch 2018-05-23 11:17:02 -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
Iuri Matias a664492d1f move onDeploy to special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias 31833579a7 finish converting afterDeploy 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 af8a720e90 guard against currentChain not set 2018-05-23 11:15:05 -04:00
Iuri Matias 2ac38fb84a if no chain set then contract is not tracked 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 ac45b7a19b remove unneded assigment; add clarification/TODO 2018-05-23 11:15:05 -04:00
RJ Catalano 6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object 
make Ipfs object available in environment
 2018-05-21 10:31:30 -05:00
Iuri Matias 0363c676d4 initialized ipfs object to environment 2018-05-18 15:56:36 -04:00
Jonathan Rainville a7be2cda26 convert solcw to use once 2018-05-18 14:22:58 -04:00
Jonathan Rainville c5c00fc3b4 conflict in solcW 2018-05-18 14:11:29 -04:00
Iuri Matias 46c2be16de don't unnecessary reload solc 2018-05-18 13:41:25 -04:00
Iuri Matias c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper 
update solc wrapper
 2018-05-18 13:17:01 -04:00
VoR0220 dc0c8c5622 fix profiler and this is ready to go 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:41:23 -05:00
VoR0220 8411f36e06 trying this 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:18:00 -05:00
VoR0220 5af4eb5b25 now profiler and other plugins will be able to benefit from undefined return output for logs only plugins 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 08:54:25 -05:00
Iuri Matias c94d8e9f91 update old solc process to new process wrapper 2018-05-17 15:26:44 -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 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -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
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 41b2741ba5 add optionnal callback 2018-05-02 12:10:11 -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
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
Eric Mastro 4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm 2018-04-26 19:05:56 +10: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
Jonathan Rainville c1bed28c00 code and test importing the http contract 2018-04-20 11:39:17 -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
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 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 6f119eeb1b move vyper contract compile to static util function 2018-04-17 11:25:46 -04:00
Jonathan Rainville dd1c10fe85 remove useless waterfall 2018-04-16 13:11:55 -04: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 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
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
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 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
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 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
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
Iuri Matias e0db5ed61a refactor to use dappPath 2018-04-02 15:06:56 -04:00
Iuri Matias fffde9d4b6 tolerate lack of addCheck which means is not running in dashboard mode 2018-03-30 10:59:31 -04:00
Iuri Matias d5a21d579c fallback to shelljs if pwd is empty (windows issue) 2018-03-26 15:08:07 -04:00
Iuri Matias 4b0925d425 fallback to shelljs if pwd is empty (windows issue) 2018-03-26 14:54:47 -04:00
Iuri Matias da7e5747f9 report error message instead of array 2018-03-02 18:01:48 -05:00
Iuri Matias af9e27e078 fix ipfs service check 2018-03-02 17:25:59 -05:00
Iuri Matias 13e759bfee support setting protocol in config; fix getUrl 2018-03-02 16:57:55 -05:00
Iuri Matias bde067aabf support specifying ipfs protocol in the storage provider 2018-03-02 11:02:52 -05:00
Iuri Matias 445133cfdf move setStatus from logger to event bus 2018-02-27 15:49:21 -05:00
Iuri Matias 3b60793b25 remove old jshint directives 2018-02-07 19:49:54 -05:00
Iuri Matias 1c45d215ce check error severity besides the type 2018-02-07 19:40:59 -05:00
Iuri Matias 7a7330e695 update solidity module to use compileStandard and the standard json 2018-01-27 15:07:48 -05:00
Iuri Matias 80e8f6323a display error when there is a unknown compilation error 2018-01-17 15:09:19 -05:00
Iuri Matias 82681fec8f support versioning ipfs-api 2018-01-10 11:15:32 -05:00
Iuri Matias 4fcfc6c142 update whisper check 2018-01-05 15:30:52 -05:00
Iuri Matias 0e502c1537 refactor service check 2017-12-30 21:44:59 -05:00
Iuri Matias fe186a4443 move module js code to its own folder 2017-12-30 21:02:46 -05:00
Iuri Matias 37a126a6b8 move old code to a separate file 2017-12-30 20:42:52 -05:00
Iuri Matias f4e81da630 refactor whisper code; separate old version 2017-12-30 20:09:46 -05:00
Iuri Matias 7e38a239b7 fix package name listener 2017-12-30 19:34:15 -05:00
Iuri Matias 1c38f3fb89 move lib 2017-12-30 18:25:59 -05:00
Iuri Matias 2f3abc37b7 use module command to get solc version 2017-12-30 18:12:16 -05:00
Iuri Matias 11af38268b refactor: get versions from module instead of config 2017-12-30 16:48:53 -05:00
Iuri Matias 3fb02befea comply with linter 2017-12-29 18:33:11 -05:00
Iuri Matias 92de2904f1 move webserver cmds to module 2017-12-29 18:29:56 -05:00
Iuri Matias d1a207941d take into account available providers list 2017-12-29 16:11:45 -05:00
Iuri Matias 8956992950 extract communication provider 2017-12-28 18:10:43 -05:00
Iuri Matias 9ca337eeb1 extract storage provider 2017-12-28 17:42:25 -05:00
Iuri Matias fc24b04bf6 comply with linter 2017-12-28 13:13:30 -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 aad78cc130 fix/improve error handling 2017-12-27 13:07:13 -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 6a27559de4 update linter rule 2017-12-19 09:54:39 -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 ce6c570634 use utils joinPath instead of path.join 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