35 Commits

Author SHA1 Message Date
Jonathan Rainville
415df3312f fix webserver errors 2018-07-06 14:43:01 -04:00
Jonathan Rainville
92c8f00ba8 wip fixes 2018-06-29 17:09:19 -04:00
Jonathan Rainville
dee09a87f5 change templates to add privatenet 2018-06-28 10:40:40 -04:00
Jonathan Rainville
02e4c0257f conflict in package json 2018-06-27 14:32:13 -04:00
VoR0220
e3bdbd520f bare bones bulk registration example spec
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

add registrars to system

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-21 11:24:31 -05:00
Jonathan Rainville
d77083ee8c enable syncMode 2018-06-15 16:33:59 -04:00
Jonathan Rainville
26447c9362 remove deprecated geth params 2018-06-15 16:23:55 -04:00
VoR0220
7926a697c4 change directories for passwords to replicate good behavior and add light and fast modes
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 14:03:48 -05:00
VoR0220
44a77aa065 add rinkeby option for testing purposes
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 13:21:32 -05:00
VoR0220
391777d5bf fix test app config and swap olympic for rinkeby as testnet option
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 13:18:37 -05:00
Richard Ramos
3ae6bbf5a4 Adding proxy to testapp 2018-06-11 17:14:02 -04:00
Iuri Matias
cd6dcb7548 fix setting default account 2018-06-06 10:39:02 -04:00
Iuri Matias
60c687aa41 refactor storage module 2018-06-01 19:32:14 -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
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
3a62f6a121 update default dev networkid to be the same as --dev option chainId 2018-05-11 10:23:52 -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
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
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
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
e3fde1ad22 support mapping contract file in contracts config 2018-04-12 17:54:08 -04:00
Iuri Matias
03f0b07d81 support versions on embark json config 2018-03-31 19:35:20 -04:00
Iuri Matias
d855ade8d4 add missing parameters to the genesis config files 2018-03-30 11:16:47 -04:00
Iuri Matias
a00119f5dc move test_app to test_apps 2018-03-29 18:20:45 -04:00