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

1410 Commits

Author SHA1 Message Date
Iuri Matias 74df72fc0d lint is king 2018-06-01 19:35:41 -04:00
Iuri Matias 083961fc21 remove unneeded assignments 2018-06-01 19:32:14 -04:00
Iuri Matias 07e58bcd04 check window size in dashboard instead of index 2018-06-01 19:32:14 -04:00
Iuri Matias 60c687aa41 refactor storage module 2018-06-01 19:32:14 -04:00
Iuri Matias eadbeb0498 use monitor as a service 2018-06-01 19:32:14 -04:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Iuri Matias 0804779a20 don't sync i18n files anymore 2018-06-01 19:31:26 -04:00
Iuri Matias 0dbefad48b move requires to methods that actually need them 2018-06-01 19:30:51 -04:00
Iuri Matias a3de13e011 refactor to addPluginType 2018-06-01 19:30:51 -04:00
Iuri Matias 0282e7d71c
Merge pull request #476 from embark-framework/fix_events_limit_issue 
fix events limit issue
 2018-06-01 19:30:23 -04:00
Iuri Matias 2ade8cfd09 lint is king 2018-06-01 19:12:54 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 152dfe2815 initialize web3 in the whisper module itself; use defined configuration 2018-06-01 18:11:23 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville 91b8033ab5 fix using deployedAddress instead of address 2018-06-01 14:12:10 -04:00
Jonathan Rainville aa04279a6f Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi 
# Conflicts:
#	lib/contracts/contract_deployer.js
#	lib/i18n/locales/en.json
#	lib/tests/test.js
#	package-lock.json
 2018-06-01 13:57:39 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 57a194d20d remove timer 2018-06-01 13:44:54 -04:00
Jonathan Rainville 61a518f569 remove initCOnfig in tests because useless 2018-06-01 13:44:54 -04:00
Jonathan Rainville f3d55f6742 patch weird event max listeners bug 2018-06-01 13:44:54 -04:00
Jonathan Rainville 73fca42ce1 fix error messages for non deployed contracts 2018-06-01 13:44:54 -04:00
Jonathan Rainville d76ab75c4a remove initTest 2018-06-01 13:44:54 -04:00
Jonathan Rainville 88889a1a9d update test_app tests 2018-06-01 13:44:53 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville 33bd52e9ec add id to solc process to avoid multiple callback calls 2018-06-01 13:44:35 -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 b97c85d5f4 conflict in tests 2018-06-01 13:41:12 -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 491ff47cf8 conflict in en.json 2018-06-01 13:35:52 -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
Jonathan Rainville c234655acd resolve conflict in test.js 2018-06-01 13:33:11 -04:00
Jonathan Rainville 723a4ae805 reformat run_test 2018-06-01 13:32:23 -04:00
Jonathan Rainville ed1a2c4ddb remove timer 2018-06-01 13:31:22 -04:00
Jonathan Rainville 10f55910d2 remove initCOnfig in tests because useless 2018-06-01 13:30:08 -04:00
Jonathan Rainville 7cab30f4df patch weird event max listeners bug 2018-06-01 13:29:51 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Jonathan Rainville e5ec461f78 fix error messages for non deployed contracts 2018-06-01 11:30:02 -04:00
Jonathan Rainville eeb88010d5 remove initTest 2018-06-01 11:06:07 -04:00
Jonathan Rainville 55df42979f update test_app tests 2018-06-01 10:48:29 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
Jonathan Rainville a112f18d93 always deploy contracts when in tests and make all test work 2018-06-01 10:05:43 -04:00
Eric Mastro 421f9a4096 Merge in remote 2018-06-01 14:10:54 +10:00
emizzle 74d5ee3984 small fixes 2018-06-01 14:06:02 +10:00
emizzle 446f28ed6f de-dupe en.json 2018-06-01 13:39:00 +10:00
emizzle a11047c681 Further fixes for starting dappConnection processes automatically 
moved storage process launching to storage module

refactored all cases of storage url building to util methods

updated cors so that a processes will not include itself in cors list

changed child process command console output to trace, so it's visible when --logLevel == trace
 2018-06-01 13:36:46 +10:00
emizzle 927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-06-01 13:35:25 +10:00
emizzle 7aa44c7fe3 Added improvements to storage config 2018-06-01 13:35:11 +10: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 6ac8672a31 Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:34:49 +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 ec15823dbc Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-06-01 13:28:28 +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
Jonathan Rainville 0ab151500d add id to solc process to avoid multiple callback calls 2018-05-31 13:32:02 -04:00
Jonathan Rainville ac69f2f9fd Merge branch 'develop' of https://github.com/embark-framework/embark into develop 2018-05-31 10:38:09 -04:00
Iuri Matias 75c91992e3
Merge pull request #469 from embark-framework/refactor_contracts_part2 
Refactor contracts part2
 2018-05-31 10:37:43 -04:00
Jonathan Rainville 30c6555649 hotfix tag for github urls 2018-05-31 10:37:40 -04:00
Iuri Matias 9929415da8 remove unneded passing of contracts manager 2018-05-31 10:09:26 -04:00
Iuri Matias 20d7496980 take into account errors when determining arguments 2018-05-31 10:02:57 -04:00
Jonathan Rainville a0cfe525a9 fix contracts that are instances of 2018-05-31 09:52:37 -04:00
Jonathan Rainville 4b4ae66c93 change another storage test 2018-05-31 08:38:25 -04:00
Jonathan Rainville 827a3b309f make running config() without callback work 2018-05-31 08:38:25 -04:00
Jonathan Rainville 756d77a9b1 conflict en.json 2018-05-31 08:38:20 -04:00
Jonathan Rainville 622f54bda9 fix missing default from 2018-05-31 08:37:21 -04:00
Jonathan Rainville 641a77c2dc use object assign to assign new values to contract 2018-05-31 08:37:21 -04:00
Jonathan Rainville 1176a2e8be make require and test work 2018-05-31 08:37:21 -04:00
Jonathan Rainville 093bd13c6a build only once 2018-05-31 08:37:21 -04:00
Jonathan Rainville 41aaa5c20d conflict package json 2018-05-31 08:37:17 -04:00
Jonathan Rainville 68fb70f788 reformat run_test 2018-05-31 08:37:00 -04:00
emizzle 0aa96aa504 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-05-31 20:18:25 +10:00
emizzle 6d77aae6de Added improvements to storage config 2018-05-31 15:19:09 +10:00
emizzle 30f0f4dc72 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-05-31 15:18:58 +10:00
emizzle 0a331e9352 Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP. 2018-05-31 15:18:10 +10:00
emizzle d0d73320aa 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-05-31 15:18:10 +10:00
Iuri Matias 7ee62adb24 remove unused assignment 2018-05-30 17:30:51 -04:00
Iuri Matias b3173c1ff3 register ipfs cmd correctly 2018-05-30 17:22:12 -04:00
Iuri Matias b43a766de7 cleanup module call 2018-05-30 13:38:08 -04:00
Iuri Matias 7d795fa180 remove unused var 2018-05-30 13:38:08 -04:00
Iuri Matias 4f20d31b4c add emitAndRunActionsForEvent 2018-05-30 13:38:08 -04:00
Iuri Matias 45f7767313 remove contracts manager dependency from deploy manager 2018-05-30 13:38:08 -04:00
Iuri Matias 1d782c0e53 emit contractsDeployed event only 2018-05-30 13:38:08 -04:00
Iuri Matias 68e6782f49 remove unneded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 9b368bc1b3 remove unneeded assignment 2018-05-30 13:38:08 -04:00
Iuri Matias 1912981d7d move contract deploy code to contract deployer; move it to events 2018-05-30 13:38:08 -04:00
Iuri Matias 70f38d863e fix code generator event 2018-05-30 13:35:36 -04:00
Iuri Matias f1cb7d1187 lint is king 2018-05-30 13:35:36 -04:00
Iuri Matias 69e5af2308 replace beforeAction plugin api with event action api 2018-05-30 13:35:36 -04:00
Iuri Matias 8458acd207 filter for plugins that have defined properties 2018-05-30 13:35:36 -04:00
Iuri Matias 3f20f400dd certify pluginTypes are uniques, to avoid issue with a plugin call being called twice or more 2018-05-30 13:35:36 -04:00
Iuri Matias 71cd523f30 remove old methods 2018-05-30 13:35:36 -04:00
Iuri Matias 16653d491b move onDeploy to new api 2018-05-30 13:35:36 -04:00
Iuri Matias 93e5003c64 cleanup 2018-05-30 13:35:36 -04:00
Iuri Matias 4f45b4fa13 add new plugin method for generalized event actions 2018-05-30 13:35:36 -04:00
Iuri Matias f08bb56337 simplify determine args method 2018-05-30 13:35:36 -04:00
Iuri Matias cf13f098ac refactor deploy method 2018-05-30 13:35:36 -04:00
Iuri Matias f4010bd66e remove unnecessary determin params call 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 742632eccf remove contractsManager dependency 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
Iuri Matias 5f64376c84 refactor generateContractsJson 2018-05-30 13:35:36 -04:00
Iuri Matias cf999ce997 refactor runcode to use events instead; remove dependencies 2018-05-30 13:35:36 -04:00
Iuri Matias fc92b69211 use self 2018-05-30 13:35:03 -04:00
Jonathan Rainville e35474f726 early return 2018-05-30 13:23:18 -04:00
Jonathan Rainville 4db2d40ef5 fix swarm 2018-05-30 12:58:32 -04:00
Jonathan Rainville b5e96beb81 little oopsie 2018-05-30 12:07:48 -04:00
Jonathan Rainville ff0d24aa1f Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process 
# Conflicts:
#	lib/contracts/blockchain.js
 2018-05-30 12:02:30 -04:00
Jonathan Rainville b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville 138aaf39ff fix processes on ubuntu 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2f3a94f3a1 little fixes 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2023689eb2 fix tests 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4df669ab52 add more error management to ipfs 2018-05-30 11:03:33 -04:00
Jonathan Rainville d06a7f43ac fix swarm spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville c86c50fb4e boot swarm with spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville 8655b49a39 change ipfs to spawn too 2018-05-30 11:03:33 -04:00
Jonathan Rainville 73db1a6133 something en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville 3f671c2fb0 conflict in en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville d36af9f5e1 fix blockchain start 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4e20e82edf conflict in blockchain 2018-05-30 11:03:33 -04:00
Jonathan Rainville a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00
Jonathan Rainville b0a64cc043 use right version 2018-05-30 10:57:25 -04:00
Jonathan Rainville e02648dbef add error if user uses ipfs 0.4.14 or lower 2018-05-30 10:57:25 -04:00
Jonathan Rainville 023d8f7f5f fix logs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 3c7bdbf6cf set cors domain depending on the webserverConfig 2018-05-30 10:57:25 -04:00
Jonathan Rainville ac7612136e start storage node on run too 2018-05-30 10:57:25 -04:00
Jonathan Rainville 857c7d8c85 small fixes 2018-05-30 10:57:25 -04:00
Jonathan Rainville f08c700151 reverse plugin.js changes 2018-05-30 10:57:25 -04:00
Jonathan Rainville 2b54dfd7cc conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 0f07a00791 detect swarm started signal 2018-05-30 10:57:25 -04:00
Jonathan Rainville e67fafdc29 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville bc853ef899 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 70d3e6a46f conflict en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville e3a93a6d61 add storageProcessesLauncher that can work for swarm or ipfs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
Jonathan Rainville d969eb0065 fix processes on ubuntu 2018-05-30 10:52:15 -04:00
Jonathan Rainville 4d0453fede
Merge pull request #468 from embark-framework/fix_service_check 
early return if failing to connect to node
 2018-05-30 08:24:15 -04:00
VoR0220 302476e95e fix simulator preferential treatment 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-29 14:19:25 -05:00
Iuri Matias cd96aebdcd early return if failing to connect to node 2018-05-28 17:55:59 -04:00
Jonathan Rainville a7bc9755c3 little fixes 2018-05-28 16:02:44 -04:00
Jonathan Rainville 729c43bae1 fix tests 2018-05-28 15:56:03 -04:00
Jonathan Rainville 7a754ac97f add more error management to ipfs 2018-05-28 15:43:27 -04:00