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

68 Commits

Author SHA1 Message Date
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
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
Iuri Matias a8e22ec45c move demo and boilerplate to a templates folder 2018-03-29 19:23:24 -04:00
Richard Ramos 0326890abe Fix: Relationship was incorrect 2018-03-23 11:39:42 -04:00
Richard Ramos 58b5ea329e Styles for contract instances 2018-03-23 11:37:56 -04:00
Richard Ramos 7dcae55b8b Added events to graph and fixed problems in IDE 2018-03-23 10:02:23 -04:00
Richard Ramos 403f2daee2 Added relationships between contracts 2018-03-23 10:02:23 -04:00
Richard Ramos 01eaa0fe7f Generating basic diagram that includes methods 2018-03-23 10:02:23 -04:00
Richard Ramos 9e469cc83e Initial commit for graphviz functionality 
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
 2018-03-23 10:02:23 -04:00
Iuri Matias 5c5ef44f2f update tests 2018-01-23 19:36:02 -05:00
Heikki Hakala 6a229f2386 Revert "Add networkType rinkeby" 
This reverts commit fd70689bec.
 2018-01-23 10:00:53 +02:00
Heikki Hakala 6b664fbfa8 Add light and fast from blockchain config 2018-01-22 09:57:35 +02:00
Heikki Hakala fd70689bec Add networkType rinkeby 2018-01-22 09:53:53 +02:00
Iuri Matias 7e8a594bf9 update tests 2018-01-17 11:29:30 -05:00
Iuri Matias 7b58a770d9 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2018-01-17 11:24:26 -05:00
Iuri Matias 32d63514bf increase default gas value; add parameters 2018-01-17 11:23:32 -05:00
hodlbank 8471d8fa0f Fixing issue #324: add options to configure simulator's mnemonic and block time. 2018-01-15 21:55:28 +00:00
Iuri Matias 7cac969f16 default to boilerplate blockchain settings 2018-01-12 17:16:46 -05:00
Iuri Matias 728aea6e04 fix imports issue 2018-01-12 14:21:36 -05:00
Iuri Matias 61c00819ec add reset cmd 2018-01-11 09:22:58 -05:00
Iuri Matias 9fd39f36ba add websocket config to blockchain config 2018-01-11 08:55:28 -05:00
Iuri Matias 569734a80d re-add npm install for embark demo 2018-01-03 12:42:38 -05:00
Iuri Matias 174ba8ec9b add more cmd line options to sim 2017-12-27 17:48:33 -05:00
Iuri Matias c55b011675 fix eslint issues 2017-12-13 20:15:57 -05:00
Iuri Matias d32d5f50bd check if geth command exists and warn user if not 2017-12-13 17:58:07 -05:00
Iuri Matias f3a8e68c60 Merge branch 'next' into develop 2017-10-22 08:37:24 -04:00
Iuri Matias 8c1b9b56cf update bundle; don't double add shh option 2017-10-21 08:42:29 -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 704a1ff517 cleanup 2017-10-14 06:06:09 -04:00
Iuri Matias ec6fc4d967 get rid of npm install 2017-07-02 00:30:09 -04:00
Iuri Matias 590dfe8925 fix template generator 2017-06-26 16:48:05 -04:00
Iuri Matias 4bb7f18155 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-06-19 06:33:07 -04:00
Carl Mönnig f38b9bc1d6 fix for no accounts on init with warning messages 2017-06-18 13:16:11 +02:00
Iuri Matias 2373d14d6b add options to runCommand 2017-04-02 14:30:00 -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 8a5604eec6 var -> let 2017-03-30 20:52:49 +09:00
Todd Baur 7599f43a3b fixed problem with double this.client in blockchain.js 2017-03-30 20:48:22 +09:00
Todd Baur fbe3f302b2 cleanup code from linter feedback 2017-03-30 20:38:14 +09:00
Todd Baur 648b27920c merge develop branch 2017-03-30 20:26:03 +09:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Iuri Matias 504e68d5fc Merge pull request #259 from Exartu/develop 
readme documentation update
 2017-03-30 07:02:52 -04:00
ramiro 604635f3e3 added async simulator 2017-03-29 17:47:04 -03:00
Todd Baur a66f002a18 swap path -> util.joinPath 2017-03-30 03:13:48 +09:00
Todd Baur 5bf1475ea4 swap more var -> let 2017-03-30 02:50:05 +09:00
Todd Baur e3b9c01205 fix linter complaints 2017-03-30 02:18:00 +09:00
Todd Baur 20baf5ee9f call path.join once and store in fspath var 2017-03-22 21:46:59 +09:00
Todd Baur 37a7259999 this fixes problems where concatenating the path string would fail, e.g. non-unix systems. 2017-03-22 20:32:16 +09:00