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

224 Commits

Author SHA1 Message Date
Anthony Laibe 9ed162bc26 Change connection 2018-08-21 16:05:59 -04:00
Michael Bradley, Jr 314edadb57 Revert "Merge pull request #663 from embark-framework/revert-656-bug_fix/dot.embark_versions_modules" 
This reverts commit 7859c384ca, reversing
changes made to a58f21c303.
 2018-08-21 16:05:58 -04:00
Jonathan Rainville 212eb79754 fix small oopsies and make it work 2018-08-21 16:05:58 -04:00
Iuri Matias 63b01a32d4 Revert ".embark/versions modules" 2018-08-21 16:05:58 -04:00
Michael Bradley, Jr d2a83e3930 change test_app devdep to babel 7 version 2018-08-21 16:04:22 -04:00
Iuri Matias 2e3bec0f00 re-enable proxy 2018-08-21 16:03:35 -04:00
Iuri Matias 2ea982d0e5 move blockchain process to own module 2018-08-21 16:01:14 -04:00
Jonathan Rainville 8ecf1d854d do not deploy ens contracts (fix for upload) 2018-08-21 15:53:39 -04:00
Jonathan Rainville d14630f636 use setInterval to wait for deploy complete 2018-08-21 15:53:39 -04:00
Jonathan Rainville bb9f058b15 small cleanups 2018-08-21 15:53:20 -04:00
Jonathan Rainville 01de35aab9 up timeout 2018-08-21 15:53:02 -04:00
Jonathan Rainville b1c04c6027 add test for ENS 2018-08-21 15:53:02 -04:00
Michael Bradley, Jr da85f39424 bump jquery dep, src in test_apps/test_app re: npm security warning 2018-08-21 15:47:05 -04:00
Iuri Matias 5d8f236df3 remove custom web3 js; use packaged one instead 2018-08-21 15:35:55 -04:00
Andre Medeiros 6d1dfd3581 Bump grunt-contrib-coffee 2018-08-21 15:33:00 -04:00
Jonathan Rainville 4f4cb094d6 fix webserver errors 2018-08-21 15:29:32 -04:00
Jonathan Rainville 26243e21e0 remove provider-engine as it has been creating lots of issues 2018-08-21 15:28:02 -04:00
Jonathan Rainville 01900f8c6e wip fixes 2018-08-21 15:26:31 -04:00
Jonathan Rainville 92d5fc8e1e hotfix blockchain configs for privatenet 2018-08-21 15:22:59 -04:00
Jonathan Rainville 63cd508e06 change templates to add privatenet 2018-08-21 15:22:07 -04:00
Jonathan Rainville 0e71dca03f update templates to use isDev false 2018-08-21 15:20:12 -04:00
Jonathan Rainville 5581964fab conflict in package json 2018-08-21 15:17:05 -04:00
emizzle efe649e4e6 Removed p-iteration from embark altogether. 
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
 2018-08-21 15:12:07 -04:00
VoR0220 056b5a0ab9 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-08-21 15:03:34 -04:00
Jonathan Rainville bd9e86cd46 remove log 2018-08-21 15:03:34 -04:00
Jonathan Rainville 75a7b93d69 intercept logs by adding the name only 2018-08-21 15:03:34 -04:00
Iuri Matias f2213970f7 first stab at funding accounts in geth given config 2018-07-13 15:56:59 +03:00
Iuri Matias 5ee9843973
Merge pull request #541 from embark-framework/bug_fix/testnet-hang 
remove deprecated geth params
 2018-06-15 16:46:16 -04:00
Iuri Matias dae9e4ae7f
Merge pull request #460 from embark-framework/fix_overridecompiler 
Allow plugins to override core compilers
 2018-06-15 16:39:09 -04: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 950ae2df88 replicate in contracts app 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-15 13:27:14 -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
Jonathan Rainville 2ed6842e71 trigger CI build 2018-06-15 09:16:03 -04:00
Jonathan Rainville 8766c9b761 show warning if dependency is not deploying 2018-06-13 13:47:11 -04:00
Iuri Matias cd5ce085bf
Merge pull request #511 from embark-framework/event-test 
add a test to test events
 2018-06-12 12:15:58 -04:00
Iuri Matias ad4c79390a
Merge pull request #504 from embark-framework/conn-proxy 
Proxy for inspecting function calls for contracts and retrieve trx information and display it on console
 2018-06-12 12:02:20 -04:00
Jonathan Rainville d19c473b81 add a test to test events 2018-06-12 11:38:25 -04:00
Richard Ramos 3ae6bbf5a4 Adding proxy to testapp 2018-06-11 17:14:02 -04:00
Iuri Matias c4ca4e52b8 support embarkjs in the tests 2018-06-10 12:11:34 -04:00
Iuri Matias 9f18c7ff0e add test for balance and web3 object 2018-06-08 13:10:47 -04:00
Iuri Matias 3db8ccd44e remove unnecessary config 2018-06-07 20:21:01 -04:00
Iuri Matias edbbaa160b make config params optional 2018-06-07 20:21:01 -04:00
Iuri Matias 402ee19722 default contracts fields 2018-06-07 20:20:24 -04:00
Iuri Matias 1c6df9db8d remove data parameter 2018-06-07 20:20:24 -04:00
Iuri Matias 8fa7357d07 fix default from and data; add single test spec 2018-06-07 20:20:24 -04:00
Jonathan Rainville e902c86ed2 conflicts in tests 2018-06-07 16:14:42 -04:00
Jonathan Rainville 4ffb5c401f enable setting balance in mutliple formats 2018-06-07 13:01:12 -04:00
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 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