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

62 Commits

Author SHA1 Message Date
VoR0220 0bb1b7bf1c attempting to craft the onReady bit...I think this works? 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-11 11:27:27 -05:00
Jonathan Rainville 41b2741ba5 add optionnal callback 2018-05-02 12:10:11 -04: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
Richard Ramos 2313426a37 Adding data option to contract when web3 1.0 is used 2018-03-28 16:51:09 -04:00
Iuri Matias 3b60793b25 remove old jshint directives 2018-02-07 19:49:54 -05:00
Iuri Matias 471fb1a061 throw exeption if provider has not been set 2018-01-10 11:31:26 -05:00
Iuri Matias 24c34fcbe3 refactor setProvider 2017-12-27 21:04:12 -05:00
Iuri Matias e46fce4c48 fix whisper code 2017-12-27 20:57:10 -05:00
Iuri Matias ff6a092ecc extract whisper 2017-12-27 20:19:41 -05:00
Iuri Matias a568835ceb separate components; extract ipfs; add register method 2017-12-27 19:10:05 -05:00
Iuri Matias 5f6ec0f584 clean up embark.js 2017-12-13 17:24:12 -05:00
Iuri Matias d0afd27969 revert web3.js version check 2017-12-13 17:10:33 -05:00
Iuri Matias e2dcad07ce update tests 2017-12-13 16:28:23 -05:00
Iuri Matias 12c8e223d6 update ipfs lib 2017-12-13 15:53:29 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias b7b5fae2c8 imports with shared web3 object 2017-12-13 15:53:29 -05:00
Iuri Matias 92e22ea519 support special imports 2017-12-13 15:53:29 -05:00
Iuri Matias 8b313a0fc7 fix storage getUrl method override issue 2017-12-06 11:42:13 -05:00
Iuri Matias 2f25876722 fix jshint issues 2017-10-09 09:11:37 -04:00
Iuri Matias 09db4eaa53 re-add support for whisper 5 2017-10-09 08:59:02 -04:00
Iuri Matias 69fa1b24c3 adapt test app to work with 1.0 2017-10-07 21:02:05 -04:00
Iuri Matias a9e63069fb fix connecting to correct provider 2017-10-07 15:20:51 -04:00
Iuri Matias 42aa072811 clean up 2017-08-03 19:12:49 -04:00
Iuri Matias 29c343463b add support for whisper v5; make get url ipfs get configurable 2017-07-24 07:27:52 -04:00
Iuri Matias 2bf91b6d9a make storage getUrl configurable 2017-07-23 08:15:40 -04:00
Iuri Matias 5b60c3effa fix issue with orbit config 2017-06-26 15:25:22 -04:00
Iuri Matias 84f7149aaf fix contracts loading; add warning for whisper version; update web3.js 2017-06-25 12:56:14 -04:00
Iuri Matias a6c8e83d40 fix conflicts 2017-06-24 22:35:27 -04:00
Iuri Matias d800c1cee0 add aliases to embarkjs 2017-04-02 14:12:12 -04:00
Andy Nogueira 47aaa5bb19 Added missing semi-colons 2017-03-18 10:14:19 -04:00
Andy Nogueira c1f72ae10e Refactoring Storage logic to allow multiple storages and keep backwards compatibility 2017-03-17 10:02:26 -04:00
Andy Nogueira a0af3ff5d9 Fixing logic to return reject in promise 2017-03-14 12:37:58 -04:00
Andy Nogueira fdf0129e5d Refactored EmbarkJS Storage logic to allow multiple storage providers 2017-03-14 11:39:09 -04:00
Andy Nogueira 494e776f05 Initial refactoring of EmbarkJS to support multiple storage providers 2017-03-13 09:38:30 -04:00
Andy Nogueira c9a4a3156d Added logic to return error in case Storage get method fails to retrieve text from IPFS 2017-03-12 18:19:56 -04:00
Andy Nogueira f1b8438cbb Fixing some logic on Embark.Storage.setProvider 2017-03-12 17:59:21 -04:00
Iuri Matias fb4681aa9c support specifying gas limit when deploying client side 2017-03-06 22:48:14 -05:00
Iuri Matias 8348f0a224 tolerate when whisper is not available; support latest geth 2017-03-06 22:44:16 -05:00
Iuri Matias b7cd296716 make abi generation independent of deployment 2017-02-28 23:29:16 -05:00
Iuri Matias d1d4d0810c remove bluebird 2017-02-27 20:50:00 -05:00
Iuri Matias 8b107355cb wait for mined transaction in embarkjs when applicable 2017-02-27 20:32:26 -05:00
Iuri Matias cf0ea4299e support disabling blockchain stack; tolerate lack of web3 object 2017-02-20 17:12:13 -05:00
Iuri Matias 9d2f9c3054 implement whisper stop watch; add callback so sendMessage become async 2017-02-06 06:51:27 -05:00
Iuri Matias 439fbf6b41 make jshint happy 2017-01-08 16:15:25 -05:00
Iuri Matias 0b73194e12 workaround for topics issue 2017-01-07 10:13:23 -05:00
Iuri Matias 6389884851 fix unneeded ascii conversion for topics 2017-01-07 09:32:10 -05:00
Iuri Matias 8f434df926 return general and original message object in listenTo callback 2017-01-07 08:38:34 -05:00
Iuri Matias 61ae426781 post orbit message on listen to callback 2017-01-07 00:10:29 -05:00
Iuri Matias 13cf92a4f5 add orbit to embarkjs 2017-01-07 00:03:03 -05:00
Iuri Matias 5ac4c0f327 automatically connect to ipfs when attempting to use a storage functionality 2016-12-02 06:48:02 -05:00