Commit Graph

186 Commits

Author SHA1 Message Date
Iuri Matias 24eadbd94f convert test_app contracts config from json format to js object 2018-05-11 18:22:32 -04:00
Iuri Matias 2793432b87 convert test_app contracts.json to contracts.js 2018-05-11 18:11:05 -04:00
Iuri Matias 3a62f6a121 update default dev networkid to be the same as --dev option chainId 2018-05-11 10:23:52 -04:00
Iuri Matias 9e1778f62c comment web3 test override to avoid confusion in the test_app 2018-05-10 19:57:26 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Jonathan Rainville 8cc485ac94 add isDev blockchain option 2018-05-09 15:16:46 -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
Iuri Matias 782044ef7c
Merge pull request #375 from embark-framework/fix_package_management
Fix package management
2018-04-20 20:10:38 -04:00
Iuri Matias cf02a10656 use web3 naming instead of web3.js; check if package already exists 2018-04-20 19:45:57 -04:00
Iuri Matias 1b6d747dbd fixing package management test 2018-04-20 17:17:49 -04:00
Jonathan Rainville c1bed28c00 code and test importing the http contract 2018-04-20 11:39:17 -04:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -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 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
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
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 7243c6ea8b revert to lower versions of solc 2018-04-12 18:52:13 -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 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
Iuri Matias 2ec7589f90 refactor to use dappPath 2018-04-02 15:30:16 -04:00
Iuri Matias bab0171120 revert versions update for now; support granular config on embark json 2018-03-31 21:06:00 -04:00
Iuri Matias 03f0b07d81 support versions on embark json config 2018-03-31 19:35:20 -04:00
Iuri Matias 94887f933d update finalhandler npm package 2018-03-30 12:47:15 -04:00
Iuri Matias 6cafb319ac update commander, css-loader, ejs packages 2018-03-30 12:07:58 -04:00
Iuri Matias 66187aef9a update eslint version 2018-03-30 11:48:35 -04:00
Iuri Matias d855ade8d4 add missing parameters to the genesis config files 2018-03-30 11:16:47 -04:00
Iuri Matias 8907753dec remove unneded dependencies from contracts_app 2018-03-30 10:05:01 -04:00
Iuri Matias 1e2b22c25b simplify test contracts app 2018-03-29 19:05:30 -04:00
Iuri Matias 0d71b077b9 update contracts appp 2018-03-29 18:35:10 -04:00
Iuri Matias a00119f5dc move test_app to test_apps 2018-03-29 18:20:45 -04:00