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

3840 Commits

Author SHA1 Message Date
Iuri Matias 2586b0dc14
Merge pull request #888 from embark-framework/bugfix/resolve-private-key-path 
Resolve private key path instead of forcing inside dApp root
 2018-09-21 18:29:02 -04:00
Iuri Matias da9880a9d2
Merge pull request #892 from embark-framework/features/travis-node-current 
test node current release (10) in addition to node LTS release (8)
 2018-09-21 18:28:15 -04:00
Iuri Matias 6db81f012a
Merge pull request #887 from embark-framework/features/travis-osx 
configure travis to test on both Linux and macOS
 2018-09-21 18:27:18 -04:00
Iuri Matias 2c280456e3
Merge pull request #890 from embark-framework/misc_fixes 
Misc fixes
 2018-09-21 18:27:04 -04:00
Iuri Matias 50effc0a6c revert change made on ens module 2018-09-21 18:26:18 -04:00
Michael Bradley, Jr 152535f3a6 test node current release (10) in addition to node LTS release (8) 2018-09-21 17:22:35 -05:00
Iuri Matias 9ac3f56c98 update template option message 2018-09-21 18:18:21 -04:00
Iuri Matias cafe472727 add missing space 2018-09-21 18:16:47 -04:00
Iuri Matias c45c262f38
Merge pull request #891 from embark-framework/features/better-npm-scripts 
better npm scripts
 2018-09-21 18:14:36 -04:00
Michael Bradley, Jr 90d5657060 simplify appveyor, travis scripts 2018-09-21 17:00:08 -05:00
Michael Bradley, Jr 373a67b4a3 rev testdapp scripts -- INIT_CWD compat 2018-09-21 17:00:08 -05:00
Michael Bradley, Jr 2b1bdc6a14 pkg lock -- cross-env 2018-09-21 16:59:54 -05:00
Michael Bradley, Jr 6b48726ec3 deps -- cross-env 2018-09-21 16:57:56 -05:00
Michael Bradley, Jr 0602661530 pkg lock -- npm-run-all 2018-09-21 16:57:26 -05:00
Iuri Matias 78814dc9d6 only add & deploy fifs register if it's actually a non live env 2018-09-21 17:53:42 -04:00
Iuri Matias 3b6251eeb1 improve some deployment error messages 2018-09-21 17:52:32 -04:00
Iuri Matias 4af9114681 fix blockchain node not found msg so it actually shows red 2018-09-21 17:51:53 -04:00
Iuri Matias af823f98b6 clarify template option; hide ens option; update typo suggestion list 2018-09-21 17:51:33 -04:00
Michael Bradley, Jr bf61fe2757 deps -- npm-run-all 2018-09-21 16:43:04 -05:00
Michael Bradley, Jr f33962954a alpha sort devDeps 2018-09-21 16:41:53 -05:00
Andre Medeiros 0bdafc273f Fetch IPFS dir hash deterministically 2018-09-21 16:52:39 -04:00
Andre Medeiros 12c495502d Resolve private key path instead of forcing inside dApp root 2018-09-21 14:04:04 -04:00
Michael Bradley, Jr 18239f539b have travis run the tests on osx (macOS) in addition to linux 2018-09-21 11:31:09 -05:00
Iuri Matias 636e5a09ac
Merge pull request #886 from embark-framework/features/shrinkwrap 
package-lock.json -> npm-shrinkwrap.json
 2018-09-21 12:16:09 -04:00
Michael Bradley, Jr de9c6d0e3b package-lock.json -> npm-shrinkwrap.json 2018-09-21 09:38:20 -05:00
Anthony Laibe 1b649d0e3a
Merge pull request #885 from embark-framework/bugfix/blockchain-not-done 
Bugfix/blockchain not done
 2018-09-21 15:11:20 +01:00
Iuri Matias 787c15aebf
Merge pull request #882 from embark-framework/features/save-exact 
exact versions for all dependencies
 2018-09-21 09:43:24 -04:00
Iuri Matias ed9ab19dbd
Merge pull request #879 from embark-framework/features/autominer-documentation 
add autominer config example to templates with comments
 2018-09-21 09:40:41 -04:00
Iuri Matias 1f23e33c99
Merge pull request #881 from embark-framework/linter/allow-bangbang 
allow coercion w/ `!!`
 2018-09-21 09:38:09 -04:00
Iuri Matias 71cbb07ad8
Merge pull request #878 from embark-framework/bug_fix/minewhenneeded-fixes-3 
Fix datadir for miner (PR for next branch)
 2018-09-21 09:36:06 -04:00
Iuri Matias 9a914d0b5a
Merge pull request #877 from embark-framework/bug_fix/proxy-setup-awaits-blockchain 
proxy should try to wait on target endpoint
 2018-09-21 09:31:48 -04:00
Iuri Matias d975c2ad81
Merge pull request #876 from embark-framework/bug_fix/redeploy-instanceOf 
fix for instance contracts not redploying when parent changes
 2018-09-21 09:21:36 -04:00
Michael Bradley, Jr 269bb64a5d pkg lock -- manually replace remaining "http" w/ "https" 2018-09-20 14:53:43 -05:00
Michael Bradley, Jr c23868f95b spec exact versions per `npm ls --depth=0` 2018-09-20 14:51:32 -05:00
Michael Bradley, Jr 51b8346763 save-exact by default 2018-09-20 14:51:03 -05:00
Michael Bradley, Jr 515c4aced0 pkg lock -- all changes involve only "http" -> "https" 2018-09-20 14:33:55 -05:00
Michael Bradley, Jr 8b91a98145 allow coercion w/ `!!` 2018-09-20 12:40:38 -05:00
emizzle db365f1870 fix typo 2018-09-20 23:00:11 +10:00
Anthony Laibe 09de3201a1 Set default account back 2018-09-20 11:49:05 +01:00
Anthony Laibe d5d0aa1600 EmbarkJS blockchain must be done 2018-09-20 11:15:48 +01:00
Anthony Laibe 907b486531 Send ready only when the proxy is started 2018-09-20 10:16:48 +01:00
emizzle ec625bd3f6 Removed development folder in template config 2018-09-20 16:24:08 +10:00
emizzle 46cce5266d add autominer config example to templates with comments 
Updated the demo template config and the boilerplate template config with documentation for the `mineWhenNeeded`, and `genesisBlock` options.
 2018-09-20 16:21:29 +10:00
Iuri Matias 4a321e3c0c coerce boolean value using more commmon !! 2018-09-20 15:33:33 +10:00
emizzle ab7784c1e9 Fix datadir for miner 
The datadir path was not being passed to the miner, was resolving as `undefined`, and therefore, was not setting up an ipc connection correctly and no communication was happening.

The fix passes the `datadir` from the blockchain config to the miner in the constructor.
 2018-09-20 15:30:06 +10:00
emizzle c477445896 Start HTTP and WS proxies individually 
As geth is starting up, the output is monitored for endpoint info. Once the HTTP or WS endpoints are opened, the corresponding proxies are started.

This is more maintainable in the long run in case the geth process being started does not allow for rpc or websockets, or geth modifies the order in which endpoint are opened.
 2018-09-20 15:08:02 +10:00
Michael Bradley, Jr eba9ce361e setupProxy should not be conditional on isDev 2018-09-19 22:31:54 -05:00
Michael Bradley, Jr 917757b04c outer function doesn't need to be async 2018-09-19 21:13:19 -05:00
Michael Bradley, Jr e19b3b2f51 simplify syntax 2018-09-19 21:13:06 -05:00
Michael Bradley, Jr 2b816af9a8 eslint doesn't like `void 0` here 2018-09-19 21:12:37 -05:00