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

189 Commits

Author SHA1 Message Date
Jonathan Rainville 764a4f863b trigger travis 2018-08-21 16:11:06 -04:00
Jonathan Rainville 8e50bfd976 conflict in package json 2018-08-21 16:11:06 -04:00
Iuri Matias 951246da70 update version to avoid confusion with stable version 2018-08-21 16:10:22 -04:00
Michael Bradley, Jr 1852809cb0 bump embarkjs dep (to ver w/ corresponding babel7rc1 fixes) 2018-08-21 16:09:49 -04:00
Michael Bradley, Jr 7bd9a5f81d bump @babel deps to 7.0.0-rc.1, no caret ranges 2018-08-21 16:09:48 -04:00
Michael Bradley, Jr 2a00fd824f pkg-up dependency 2018-08-21 16:09:48 -04:00
Andre Medeiros 8e396a17d8 Progress 2018-08-21 16:09:13 -04:00
Jonathan Rainville dd510ff6a1 add associate event in ens (not yet tested) 2018-08-21 16:05:58 -04:00
Anthony Laibe 70f777f0b0 Update embarkjs version 2018-08-21 16:05:58 -04:00
Anthony Laibe e57a13809a Revert package change 2018-08-21 16:05:58 -04:00
Anthony Laibe b548f9efae PR feedback 2018-08-21 16:05:39 -04:00
Anthony Laibe d6849bf04f Add IPNS demo 2018-08-21 16:05:39 -04:00
Jonathan Rainville f5e3f2f274 up embarkJS version 2018-08-21 15:54:45 -04:00
Jonathan Rainville fc8560c15b update package lock 2018-08-21 15:53:39 -04:00
Anthony Laibe b679d3031a Remove code dependencies to underscore 2018-08-21 15:47:05 -04:00
Andre Medeiros 6d1dfd3581 Bump grunt-contrib-coffee 2018-08-21 15:33:00 -04:00
Andre Medeiros 058e81f61d Remove node-http-proxy as we don't use it anywhere 2018-08-21 15:33:00 -04:00
Andre Medeiros 9c2208edd6 Bump Mocha to 5.2.0 2018-08-21 15:31:55 -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 3eba066969 remove mine script 2018-08-21 15:20:12 -04:00
Jonathan Rainville f49e79d4e2 revert caca code 2018-08-21 15:18: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 276bef103c package lock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-08-21 15:03:33 -04:00
VoR0220 467e36b44e package lock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-08-21 15:03:07 -04:00
Iuri Matias d04f7622ce update to 3.1.10 2018-08-20 10:03:13 -04:00
Iuri Matias 500e1af1b3 Revert "update package lock" 
This reverts commit 00597c2ade.
 2018-08-20 09:35:26 -04:00
Jonathan Rainville 6da4f7527e 3.1.9 2018-08-15 09:51:10 -04:00
Jonathan Rainville 00597c2ade update package lock 2018-08-15 09:50:59 -04:00
Iuri Matias c577ad6b16 update to 3.1.7 2018-07-30 07:01:36 -04:00
Iuri Matias 258358558b update to 3.1.6 2018-07-19 11:18:48 +03:00
emizzle 11d6980f70 further dev funding 2018-07-16 18:48:32 +02:00
Jonathan Rainville 446787447d 3.1.5 2018-07-06 10:50:41 -04:00
Iuri Matias 5bb1d33739 update to 3.1.4 2018-07-04 17:05:01 +03:00
Jonathan Rainville 3228ff2086 3.1.3 2018-07-03 15:12:27 -04:00
Jonathan Rainville dc2247a290 update package lock 2018-07-03 15:12:22 -04:00
Iuri Matias 8800da6b42 update to 3.1.2 2018-06-25 13:37:36 -04:00
Iuri Matias bb21490d87 update to 3.1.1 2018-06-21 21:24:37 -04:00
Iuri Matias 6a5020402f update to 3.1 2018-06-19 17:54:10 -04:00
emizzle b56def7c57 Updated web3 endpoint for use with infura api key and https 
Allows `protocol` to be specified in config/contract.js[on] for `<env>/deployment/protocol`.
 2018-06-19 14:43:55 +10:00
Iuri Matias 1f49c71850 re-add mocha to dependencies 2018-06-18 13:18:54 -04:00
Jonathan Rainville f517cc104f use new npm package instead of fork 2018-06-18 09:13:09 -04:00
emizzle bb4fdbe369 Run `ipfs init` for the case when user has installed ipfs, but not initialised it. 
Runs `ipfs daemon` first, reads stdout for message regarding ipfs not initialised, then runs `ipfs init`, then re-runs `ipfs daemon`.
 2018-06-18 22:34:42 +10:00
Iuri Matias 37ab60d6de
Merge pull request #538 from embark-framework/features/ws-node 
Enable connection to websocket node
 2018-06-15 18:01:12 -04:00
Iuri Matias 4beb320385 fix package lock 2018-06-15 17:45:08 -04:00
Iuri Matias c9ad938c9a fix package lock 2018-06-15 17:43:25 -04:00
Iuri Matias 1acea7b178 lock version to avoid suprises 2018-06-15 17:31:17 -04:00
Iuri Matias b0daf96865 use neo-blessed 2018-06-15 17:31:17 -04:00
Eric Mastro 286848030c package-lock conflict 2018-06-15 17:31:17 -04:00
Iuri Matias 043ac87d80 use neo-blessed 2018-06-15 17:29:19 -04:00
emizzle 279e63e3d8 package-lock conflict fix 2018-06-15 17:06:59 -04:00
emizzle 79ca004de6 remove .vscode launch tasks and fix package-lock conflict. 2018-06-15 17:06:59 -04:00
Eric Mastro 6033617f5c package-lock conflict 2018-06-15 17:06:59 -04:00
emizzle 6d6c398a6d Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 17:06:59 -04:00
Iuri Matias 49b15d020e lock version to avoid suprises 2018-06-15 17:06:59 -04:00
Iuri Matias 16cb513e34 use neo-blessed 2018-06-15 17:06:59 -04:00
Iuri Matias 4100ab87e0 update references to package 2018-06-15 17:06:59 -04:00
Iuri Matias 6730322784 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-15 17:06:59 -04:00
emizzle b96df79c59 Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 17:06:59 -04:00
Iuri Matias 4c16d7dd08 lock version to avoid suprises 2018-06-15 17:02:54 -04:00
Iuri Matias 0ca9446a4c use neo-blessed 2018-06-15 17:02:54 -04:00
Iuri Matias a75dded16d update references to package 2018-06-15 17:02:54 -04:00
Iuri Matias 5f839a829b point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-15 17:02:54 -04:00
emizzle eedcdc77a7 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:02:53 -04:00
Eric Mastro a046acb732 package-lock conflict 2018-06-15 17:02:53 -04:00
Iuri Matias daf2eba36d lock version to avoid suprises 2018-06-15 16:58:39 -04:00
Iuri Matias c367ac2c88 use neo-blessed 2018-06-15 16:58:39 -04:00
Iuri Matias 6946883490 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-15 16:56:41 -04:00
emizzle 62f3b85bc4 Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 16:54:08 -04:00
Jonathan Rainville c8c0a5c42f enable websocket provider 2018-06-15 14:35:50 -04:00
Iuri Matias 0429703790 lock version to avoid suprises 2018-06-13 12:03:00 -04:00
Iuri Matias 3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix 
use neo blessed
 2018-06-13 11:44:47 -04:00
Iuri Matias daaee7d828 use neo-blessed 2018-06-13 11:17:55 -04:00
Iuri Matias 19aa117503 update references to package 2018-06-13 09:40:19 -04:00
Iuri Matias e8b11d9841 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-13 09:05:51 -04:00
Jonathan Rainville ef5e1e2707 stop test execution if file doesn't exist 2018-06-12 15:12:50 -04:00
Iuri Matias e6ed016cc0
Merge pull request #510 from embark-framework/gastimation 
Gastimation
 2018-06-12 14:11:28 -04:00
VoR0220 335670f2ca package lock update and linting errors fixed 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:39:45 -05:00
Richard Ramos 610b6de008 Updating branch with changes from 
'develop'
 2018-06-08 15:36:11 -04:00
Richard Ramos 586e7c7bbc Moved proxy to core libraries, and logging on console methods invoked 2018-06-08 11:05:51 -04:00
Jonathan Rainville eecd719515 put message if swarm or ipfs is not installed 2018-06-08 10:40:01 -04:00
Jonathan Rainville e902c86ed2 conflicts in tests 2018-06-07 16:14:42 -04:00
VoR0220 f8b79904cb package lock update 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
Jonathan Rainville e49a474380 Ping parent and die when 3 errors 2018-06-05 12:09:57 -04:00
Jonathan Rainville b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 061ff51f83
Merge pull request #475 from embark-framework/fix/pipeline-not-building 
fix pipeline not building by removing the `once`s
 2018-06-01 18:12:23 -04:00
Iuri Matias 8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 33bd52e9ec add id to solc process to avoid multiple callback calls 2018-06-01 13:44:35 -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 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 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 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 fe34d84ff4 put back package lock 2018-05-30 11:03:33 -04:00
Jonathan Rainville 64bebc2bbf remove package lock 2018-05-30 11:03:33 -04:00
Jonathan Rainville a6ee63d7aa package json pls fix this 2018-05-30 11:03:33 -04:00