127 Commits

Author SHA1 Message Date
Jonathan Rainville
30a8263569 enable using accounts and balances 2018-06-07 13:01:12 -04:00
Jonathan Rainville
435e5eba03 fix calling back with accounts 2018-06-06 13:54:20 -04:00
RJ Catalano
60e4f9f07d
Merge pull request #491 from embark-framework/alias_address
alias address
2018-06-06 12:16:21 -05:00
Iuri Matias
a4196be958 alias address 2018-06-06 12:47:16 -04:00
Iuri Matias
1e4838d25a
Merge pull request #490 from embark-framework/fix_assert
make assert global like before
2018-06-06 11:24:27 -04:00
Iuri Matias
fdd462af79 make lint happy; always make it happy 2018-06-06 11:10:31 -04:00
Iuri Matias
da6572bb11 make assert global like before 2018-06-06 11:00:30 -04:00
Iuri Matias
cd6dcb7548 fix setting default account 2018-06-06 10:39:02 -04:00
Jonathan Rainville
b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias
74df72fc0d lint is king 2018-06-01 19:35:41 -04:00
Iuri Matias
60c687aa41 refactor storage module 2018-06-01 19:32:14 -04:00
Iuri Matias
17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias
8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville
b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville
88889a1a9d update test_app tests 2018-06-01 13:44:53 -04:00
Jonathan Rainville
5fb4e3330c conflict in packagelock 2018-06-01 13:44:30 -04:00
Jonathan Rainville
dbb2352928 fix contracts that are instances of 2018-06-01 13:44:14 -04:00
Jonathan Rainville
6712fc294c change another storage test 2018-06-01 13:44:14 -04:00
Jonathan Rainville
beb0df8985 make running config() without callback work 2018-06-01 13:44:14 -04:00
Jonathan Rainville
ab92457319 fix missing default from 2018-06-01 13:43:48 -04:00
Jonathan Rainville
4040c1eec9 use object assign to assign new values to contract 2018-06-01 13:43:48 -04:00
Jonathan Rainville
8664570d7c conflict in test 2018-06-01 13:43:43 -04:00
Jonathan Rainville
d0a289a450 conflict in deployManager 2018-06-01 13:42:05 -04:00
Jonathan Rainville
3555575ff9 change another storage test 2018-06-01 13:35:58 -04:00
Jonathan Rainville
049af73294 make running config() without callback work 2018-06-01 13:35:58 -04:00
Jonathan Rainville
d647ea791e fix missing default from 2018-06-01 13:35:18 -04:00
Jonathan Rainville
72da3b4a35 use object assign to assign new values to contract 2018-06-01 13:35:18 -04:00
Jonathan Rainville
a1d32e72e7 conflict in deployManager 2018-06-01 13:35:15 -04:00
Jonathan Rainville
9dcb64bde3 conflict in deployManager 2018-06-01 13:34:23 -04:00
Iuri Matias
9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Iuri Matias
f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
emizzle
85117cf55c Dynamic selection of storage provider now working based on improved storage config.
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:35:11 +10:00
emizzle
942a57aa3a Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-06-01 13:33:44 +10:00
emizzle
0cb79d84a0 Dynamic selection of storage provider now working based on improved storage config.
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:30:01 +10:00
emizzle
f6667b6948 Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-06-01 13:28:05 +10:00
Iuri Matias
69e5af2308 replace beforeAction plugin api with event action api 2018-05-30 13:35:36 -04:00
Iuri Matias
3f9c55131b use requests instead of contractsManager directly 2018-05-30 13:35:36 -04:00
emizzle
5b4e829675 * Adds auto cors updates to geth command when blockchain started via run command.
* Fixes issues with storage/webserver configs not enabled but still having their values put in to geth cors
* Adds fixes for not including port when port  == false
* Refactors of cors logic, and also now in a generic location so can be used by both `embark blockchain` and when blockchain started in separate process
2018-05-25 11:00:26 +10:00
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
e510e846f5 update to 3.0.3 2018-05-11 14:41:42 -04:00
Iuri Matias
a09ae900cd update default dev networkid to be the same as --dev option chainId 2018-05-11 10:39:33 -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
21a8303e84 add isDev blockchain option 2018-05-09 15:34:11 -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