Jonathan Rainville
47591a39dd
restart web3 service on proces launch
2018-05-23 11:17:01 -04:00
Jonathan Rainville
7e058e5016
set verbosity to 0 in process
2018-05-23 11:17:01 -04:00
Jonathan Rainville
3fcc36a7a1
launch blockchain in separate process
...
works but still cant getAccounts
2018-05-23 11:17:01 -04:00
Jonathan Rainville
aea270af02
detect no node using request
2018-05-23 11:17:01 -04:00
Iuri Matias
d1c3f36d02
update translations
2018-05-23 11:17:01 -04:00
Iuri Matias
201ec6c652
remove unneeded web3 object assignment
2018-05-23 11:17:01 -04:00
Jonathan Rainville
5f3361d030
conflict in en.json
2018-05-23 11:16:56 -04:00
Iuri Matias
3e9376138b
move runCode
2018-05-23 11:16:17 -04:00
Jonathan Rainville
592b4ed4fd
conflict in code_generator
2018-05-23 11:16:13 -04:00
Iuri Matias
30b1975e34
use request to get contract
2018-05-23 11:15:06 -04:00
Iuri Matias
c83064adf6
use request to get contract
2018-05-23 11:15:06 -04:00
Iuri Matias
7cebbec7b6
make determine arguments async
2018-05-23 11:15:06 -04:00
Iuri Matias
c0549a6642
refactor to waterfall, in preparation to making determine arguments async
2018-05-23 11:15:06 -04:00
Iuri Matias
3fb2b6fa60
remove direct reference to contracts manager, use a request instead
2018-05-23 11:15:06 -04:00
Iuri Matias
98c5b2dd06
move contractsState emit to contracts
2018-05-23 11:15:06 -04:00
Iuri Matias
250e0b8798
adjust contracts events emission
2018-05-23 11:15:06 -04:00
Iuri Matias
a664492d1f
move onDeploy to special configs module
2018-05-23 11:15:06 -04:00
Iuri Matias
31833579a7
finish converting afterDeploy module
2018-05-23 11:15:06 -04:00
Iuri Matias
c800598e9b
move afterDeploy code into a special configs module
2018-05-23 11:15:06 -04:00
Iuri Matias
21026e07ae
remove unnecessary passing of params around
2018-05-23 11:15:06 -04:00
Iuri Matias
000d7beb27
move code to assert connection to blockchain module
2018-05-23 11:15:06 -04:00
Iuri Matias
0ec4698e6b
fix compiler tests
2018-05-23 11:15:05 -04:00
Iuri Matias
16eaacbd54
call compiler through a request
2018-05-23 11:15:05 -04:00
Iuri Matias
af8a720e90
guard against currentChain not set
2018-05-23 11:15:05 -04:00
Iuri Matias
0fcf508e17
associate address to contract
2018-05-23 11:15:05 -04:00
Iuri Matias
2ac38fb84a
if no chain set then contract is not tracked
2018-05-23 11:15:05 -04:00
Iuri Matias
ba29f0e928
move deploy tracker into a module
2018-05-23 11:15:05 -04:00
Iuri Matias
78f64945ab
remove web3 dependency from deploy tracker; use request instead to get block
2018-05-23 11:15:05 -04:00
Iuri Matias
68c277cad1
remove unneded references to web3 objects; leave clarifying notes
2018-05-23 11:15:05 -04:00
Iuri Matias
ac45b7a19b
remove unneded assigment; add clarification/TODO
2018-05-23 11:15:05 -04:00
Iuri Matias
a8e29976b7
move deploy to blockchain component
2018-05-23 11:15:05 -04:00
Iuri Matias
9b1a78cdaa
move Contract object to blockchain module
2018-05-23 11:15:05 -04:00
Iuri Matias
84dcfca254
move getBlock to blockchain module
2018-05-23 11:15:05 -04:00
Iuri Matias
1547a115a4
move getCode to blockchain
2018-05-23 11:15:05 -04:00
Iuri Matias
ae93d78cc2
move accounts to web3 module
2018-05-23 11:15:04 -04:00
Iuri Matias
4d0ebc03ad
move web3 init to its own module
2018-05-23 11:15:04 -04:00
Iuri Matias
28ef2ed067
move web3 utils to utils module
2018-05-23 11:15:04 -04:00
Eric Mastro
ab1113fc31
Fixed bug where dist folder is created before placeholder page
...
If dist folder did not already exist, the folder is created prior to creation of the placeholder page. Without this, the dapp files are never built.
2018-05-23 13:35:18 +10:00
Eric Mastro
f10abc8da1
Merge branch 'develop' into features/show-building-placeholder
2018-05-23 09:36:11 +10:00
emizzle
ab738c05f9
Moved placeholder page html to code generator and ejs template.
2018-05-23 09:33:05 +10:00
Jonathan Rainville
48836b3d5b
Merge pull request #446 from alaibe/fr-translation
...
Adding fr translation
2018-05-22 15:34:07 -04:00
Anthony Laibe
77dbcd4424
Improve fr translation (PR feedback)
2018-05-22 20:31:28 +01:00
Iuri Matias
ceb48ebb21
Merge pull request #445 from embark-framework/features/improve-imports
...
Improve dapp imports to allow alternate syntax for importing contracts
2018-05-22 12:06:22 -04:00
emizzle
db9fbef140
Add loading placeholder page while embark is building asset files.
...
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
2018-05-22 15:15:34 +10:00
emizzle
46e040f861
Merged in merge conflicts from remote
2018-05-22 12:16:13 +10:00
emizzle
85919a4f6d
Update to make the imports 'shim' more readable as requested.
2018-05-22 12:11:45 +10:00
RJ Catalano
6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object
...
make Ipfs object available in environment
2018-05-21 10:31:30 -05:00
Eric Mastro
295152de82
Merge branch 'develop' into features/improve-imports
2018-05-21 21:46:14 +10:00
Eric Mastro
d4c04bbed7
Improve dapp imports to allow alternate syntax for importing contracts
...
* Now supports alternate import statements:
* import {Token} from 'Embark/contracts';
* import * as Contracts from 'Embark/contracts';
as well as the existing syntax:
* import Token from 'Embark/contracts/Token';
* Contracts js files moved from .embark to .embark/contracts
* .embark/contracts/index.js generated on the fly which requires all contracts in .embark/contract automatically and then creates a module.exports with each of them.
2018-05-21 21:43:36 +10:00
Anthony Laibe
a297407e99
Adding fr translation
2018-05-20 20:53:08 +01:00
Ricardo Guilherme Schmidt
56b20becfb
make getAccounts a simple web3 wrapper.
...
Maybe could even be like Test.prototype.getAccounts = web3.eth.getAccounts; ?
2018-05-18 20:44:14 -03:00
Iuri Matias
0ff5930427
Merge pull request #433 from natachadelarosa/develop
...
[FIX #421 ] Add Spanish Translation to embark
2018-05-18 17:45:24 -04:00
Iuri Matias
9013af29cd
Merge pull request #438 from embark-framework/features/improve-process-wrapper
...
Improve Process Launcher
2018-05-18 16:03:13 -04:00
Iuri Matias
0363c676d4
initialized ipfs object to environment
2018-05-18 15:56:36 -04:00
Iuri Matias
e2c2373249
accept hash of objects as second param for runcode
2018-05-18 15:55:34 -04:00
Iuri Matias
db6b90e77f
Merge pull request #439 from embark-framework/uv_close_fix
...
only close watcher when it's actually ready
2018-05-18 14:51:05 -04:00
Iuri Matias
c6970cfa4b
Merge pull request #435 from embark-framework/features/fund-user-in-dev
...
Fund user accounts in dev
2018-05-18 14:46:08 -04:00
Jonathan Rainville
b829643f61
use once in pipeline
2018-05-18 14:25:20 -04:00
Jonathan Rainville
a7be2cda26
convert solcw to use once
2018-05-18 14:22:58 -04:00
Jonathan Rainville
c5c00fc3b4
conflict in solcW
2018-05-18 14:11:29 -04:00
Iuri Matias
46c2be16de
don't unnecessary reload solc
2018-05-18 13:41:25 -04:00
Jonathan Rainville
6c1d9d9b39
rename startProvider to startWeb3Provider
2018-05-18 13:39:35 -04:00
Jonathan Rainville
4c17aa9d40
fix some PR comments
2018-05-18 13:39:35 -04:00
Jonathan Rainville
09cdab7e2b
fund account only in dev
2018-05-18 13:39:35 -04:00
Jonathan Rainville
a1e3c741a0
remove remaning of accounts config in blockchain
2018-05-18 13:39:34 -04:00
Jonathan Rainville
6c8653ef09
move code to front end. funds on provider start
2018-05-18 13:39:34 -04:00
Jonathan Rainville
418c55851b
remove warning when dev
2018-05-18 13:39:34 -04:00
Jonathan Rainville
372266418f
too many spaces
2018-05-18 13:39:34 -04:00
Jonathan Rainville
50103a8c02
conflict in en.json
2018-05-18 13:39:29 -04:00
Jonathan Rainville
94f0d98e28
get accounts and generate script with the right address
2018-05-18 13:38:53 -04:00
Jonathan Rainville
c3c4518cb4
move account parsing to its own module
2018-05-18 13:38:53 -04:00
Jonathan Rainville
668fd3a064
add fundAccount script that keeps the user's account funded
2018-05-18 13:38:53 -04:00
Iuri Matias
c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper
...
update solc wrapper
2018-05-18 13:17:01 -04:00
Iuri Matias
4439f8b601
Merge pull request #436 from embark-framework/fixConsolePluginCmdOutput
...
Fixed Returns From Plugin Modules
2018-05-18 11:45:02 -04:00
VoR0220
fee40c8935
remove trailing whitespace
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:43:56 -05:00
VoR0220
b2e45ed95c
remove unneeded code line
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:42:08 -05:00
VoR0220
dc0c8c5622
fix profiler and this is ready to go
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:41:23 -05:00
VoR0220
8411f36e06
trying this
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:18:00 -05:00
VoR0220
28fa906bbf
concentrate undefined logic in the plugin output
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:04:49 -05:00
VoR0220
bef490f5c7
get rid of console logs and try reworking the undefined handling
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 09:42:30 -05:00
VoR0220
5af4eb5b25
now profiler and other plugins will be able to benefit from undefined return output for logs only plugins
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:54:25 -05:00
Iuri Matias
14eb48fa6b
Merge pull request #434 from embark-framework/addScroller
...
should add scroller to available services
2018-05-18 09:30:37 -04:00
VoR0220
c2086b94ae
should add scroller to available services
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:10:59 -05:00
Natacha De la Rosa
bc681a5b4f
[ FIX #421 ] Add Spanish Translation to embark
...
added spanish translation to Emabrk.
2018-05-17 22:21:41 -04:00
RJ Catalano
380b2258e7
Merge pull request #432 from embark-framework/addCompileOnlyFlag
...
add command for only compiling contracts in build command
2018-05-17 16:56:50 -05:00
VoR0220
dd9e85fa27
add command for only compiling contracts in build command
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-17 15:37:57 -05:00
Iuri Matias
c94d8e9f91
update old solc process to new process wrapper
2018-05-17 15:26:44 -04:00
Jonathan Rainville
f2e52d1dbc
create processLauncher that launches and subscribes to process
2018-05-17 15:26:44 -04:00
Iuri Matias
c1de9defcd
Merge pull request #424 from embark-framework/features/remove-upload-option
...
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
2018-05-17 15:20:47 -04:00
Iuri Matias
a967b304e3
Merge pull request #422 from 3esmit/patch-1
...
Initialize web3 provider before deployAll
2018-05-17 15:08:29 -04:00
Jonathan Rainville
8e2af920b8
early callback in compiler
2018-05-17 10:02:53 -04:00
Jonathan Rainville
bcb7c80758
Early return if no sol files
2018-05-17 09:49:50 -04:00
Jonathan Rainville
dd78aef3db
fix vyper .vy
2018-05-17 09:40:38 -04:00
Iuri Matias
f828e9d87e
add missing comma
2018-05-17 08:58:26 -04:00
emizzle
627bf0c939
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
...
Removed duplicates from en.json.
Fixed upload error message bug showing encoded interpolated string
2018-05-17 17:38:17 +10:00
Ricardo Guilherme Schmidt
bc57ca62e3
add missing semicol
2018-05-17 03:00:23 -03:00
Ricardo Guilherme Schmidt
25e95c1002
add EmbarkSpec.getAccounts(cb)
2018-05-16 20:24:08 -03:00
Ricardo Guilherme Schmidt
bfcf72b09a
Initialize web3 provider before deployAll
...
This makes possible to load accounts before deploying the contracts.
2018-05-16 19:40:24 -03:00
Iuri Matias
01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline
...
Refactor pipeline
2018-05-16 18:15:51 -04:00
Iuri Matias
b1fab3e77c
remove console logs
2018-05-16 18:15:23 -04:00
Iuri Matias
965c34d3ed
replace the es file with one that contains all the existing keys
2018-05-16 18:11:39 -04:00
Jonathan Rainville
c1f72061e3
add tests for processLauncher
2018-05-16 16:41:25 -04:00
Jonathan Rainville
441063dd10
add docs for eventWrapper
2018-05-16 16:41:25 -04:00
Jonathan Rainville
80c382557f
add jsdoc to processWrapper
2018-05-16 16:41:25 -04:00
Jonathan Rainville
d17256dc40
add JS Doc for processLauncher
2018-05-16 16:41:25 -04:00
Jonathan Rainville
1ffc9ffe08
enable events calling for request and on
2018-05-16 16:41:25 -04:00
Jonathan Rainville
953ce6659e
reorg subscribe to message method
2018-05-16 16:41:25 -04:00
Jonathan Rainville
1c125a019c
conflict in en.json
2018-05-16 16:41:15 -04:00
Jonathan Rainville
3c0fda5a40
add eventWrapper not tested
2018-05-16 16:40:17 -04:00
Jonathan Rainville
36850895cf
add process wrapper to handle logs
2018-05-16 16:40:17 -04:00
Iuri Matias
18e23ae334
Merge pull request #419 from embark-framework/bug_fix/max-listeners-warning
...
set max listeners to 50
2018-05-16 16:02:04 -04:00
Iuri Matias
52c9e51deb
add keys for es
2018-05-16 15:28:17 -04:00
Jonathan Rainville
e651884473
set to 200 per Iuri's request
2018-05-16 15:27:38 -04:00
Iuri Matias
597d40e824
add missing keys
2018-05-16 15:26:57 -04:00
Iuri Matias
00e3af9012
lint is king
2018-05-16 15:18:12 -04:00
Jonathan Rainville
0611fee841
set max listeners to 50
2018-05-16 15:08:22 -04:00
Iuri Matias
8ae6c6a646
simplify buildContracts and buildWeb3JS methodsgst
2018-05-16 15:07:47 -04:00
Iuri Matias
4dcd644b7c
remove listeners for command handlers
2018-05-16 13:57:27 -04:00
Iuri Matias
44d6cc32df
remove old remove listener; fix callback
2018-05-16 13:56:23 -04:00
Iuri Matias
ce781ab96e
remove previous listener (for now)
2018-05-16 13:11:44 -04:00
Iuri Matias
b7fc3f9054
refactor write contracts
2018-05-16 12:48:17 -04:00
Iuri Matias
d8a1894803
remove extra method
2018-05-16 10:09:46 -04:00
Iuri Matias
da84cfa769
add missing require
2018-05-16 10:03:05 -04:00
Iuri Matias
6544c2a999
move contracts generation from pipeline to code generator module
2018-05-16 10:00:56 -04:00
Iuri Matias
7271b00cf4
make file changes in the pipelins
2018-05-15 18:21:00 -04:00
Iuri Matias
1f6e386d9b
build web3js generation from pipeline to code_generator
2018-05-15 18:05:44 -04:00
Iuri Matias
256276c884
Merge pull request #415 from embark-framework/features/cargo
...
Add a cargo to not run file write for each file
2018-05-15 18:01:25 -04:00
Iuri Matias
760bd984d8
only close watcher when it's actually ready
2018-05-15 17:20:43 -04:00
Jonathan Rainville
38cf7a4aa8
throttle contracts too
2018-05-15 15:41:24 -04:00
Jonathan Rainville
6bff25f3b6
hotfix hide logs of hard-source
2018-05-15 15:01:38 -04:00
Jonathan Rainville
8cee44cbd7
conflict in package lock
2018-05-15 14:42:06 -04:00
Jonathan Rainville
38dffb9eed
move provider to contracts
2018-05-15 12:45:38 -04:00
Jonathan Rainville
fdf8791c1c
fix mnemonic accounts
2018-05-15 11:33:19 -04:00
Jonathan Rainville
c5f80c72b9
add 0x if private key doesn't have it
2018-05-14 16:38:15 -04:00
Jonathan Rainville
7b1a219b51
pass isDev to engine so that it can show a warning
2018-05-14 14:32:19 -04:00
Jonathan Rainville
3f09d5d3f0
add tests for getContract
2018-05-14 14:04:26 -04:00
Jonathan Rainville
e470a63905
enable comma separated keys in file
2018-05-14 13:30:13 -04:00
Jonathan Rainville
24c4c51232
add locales
2018-05-14 12:14:05 -04:00
Jonathan Rainville
890faf260d
remove sync methods as they are now unsupported
2018-05-14 12:12:14 -04:00
Jonathan Rainville
37ca90ad9b
add wallet and clean up
2018-05-14 12:08:03 -04:00
Jonathan Rainville
00bc3050ba
intercept get accounts
2018-05-14 11:18:48 -04:00
Jonathan Rainville
b7908a3797
conflict in package lock
2018-05-14 11:18:48 -04:00
Jonathan Rainville
a32c04c751
fix conflict in engine
2018-05-14 11:18:48 -04:00
Iuri Matias
a03757a5e6
Merge pull request #412 from embark-framework/js_config
...
support for js configs
2018-05-12 13:13:15 -04:00
Iuri Matias
e8210607b7
fix for when config is specified in embark.json
2018-05-11 19:09:38 -04:00
Iuri Matias
b804f51de5
fix getting .json config file
2018-05-11 18:22:03 -04:00
Iuri Matias
8b22305833
support js files besides json files
2018-05-11 18:10:48 -04:00
Iuri Matias
7d8dd02db1
silence bluebird warning
2018-05-11 16:18:53 -04:00
Iuri Matias
26187cfa1d
add missing default from
2018-05-11 16:18:44 -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
7686ad561f
detect web3 version and get accounts correctly
2018-05-11 08:20:03 -04:00
Iuri Matias
4236f56147
add missing option
2018-05-10 15:36:24 -04:00
Iuri Matias
2e324484d4
add missing option
2018-05-10 15:26:09 -04:00
Iuri Matias
854fa0deb0
add locale option to most cmds
2018-05-10 15:02:03 -04:00
Iuri Matias
517a3bf234
move i18n and locales to its own folder; abstract it a bit; detect at initialization; add cmd line option
2018-05-10 15:01:34 -04:00
Iuri Matias
0b70f32bb9
initial work for i18n
2018-05-10 15:01:34 -04:00
Jonathan Rainville
1bb808a767
Merge pull request #404 from embark-framework/chore/webpack-optimization
...
Add a plugin that caches to increase file processing speed
2018-05-10 14:46:52 -04:00
Jonathan Rainville
59c61d6be1
hode messages from plugin
2018-05-10 14:45:35 -04:00
Jonathan Rainville
fbd36b58e5
ignore tmp files
2018-05-10 13:42:02 -04:00
Jonathan Rainville
a3f8c809a0
add queue for changes to do only one file build at the time
2018-05-10 13:28:12 -04:00
Jonathan Rainville
986ef520fc
add plugin that caches
2018-05-10 12:22:58 -04:00
Jonathan Rainville
a35ce6f73e
pass normalizeInput
2018-05-10 11:14:25 -04:00
Jonathan Rainville
83f97407e8
touch ups
2018-05-10 10:48:06 -04:00
Jonathan Rainville
31e82e31d0
do a process for each file
2018-05-10 10:43:10 -04:00
Jonathan Rainville
ed1d0ce67c
make only webpack in a separate process
2018-05-10 10:10:09 -04:00
Iuri Matias
911efe4e84
Merge pull request #400 from embark-framework/features/write-files-process
...
Write files in a different process
2018-05-09 16:57:43 -04:00
Jonathan Rainville
8cc485ac94
add isDev blockchain option
2018-05-09 15:16:46 -04:00
Jonathan Rainville
2913617a81
fix command (reset)
2018-05-09 15:16:46 -04:00
Jonathan Rainville
92c8d70dd5
change warning to tell about --reset
2018-05-09 15:16:46 -04:00
Jonathan Rainville
46e1ccd81b
use --dev when in development
2018-05-09 15:16:46 -04:00
Jonathan Rainville
edbc77afca
hotfix console
2018-05-08 14:51:51 -04:00
VoR0220
cdf46f2b30
fix linting errors and clean up ze code
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:53:34 -05:00
VoR0220
ab53bfba0c
fix linting errors
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:41:38 -05:00
Jonathan Rainville
dc7a002c1e
improve logging
2018-05-08 11:31:47 -04:00
VoR0220
819dec1bc3
profile me officer, here's a new module
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:30:46 -05:00
Jonathan Rainville
7d64b705a3
touch ups
2018-05-08 09:52:06 -04:00
Jonathan Rainville
a03777dc65
async buildContractJs
2018-05-08 09:41:19 -04:00
Jonathan Rainville
4ec7fbb9db
async buildContracts
2018-05-08 09:36:50 -04:00
Jonathan Rainville
2dd9e8f2ea
async contract write
2018-05-08 09:25:37 -04:00
Jonathan Rainville
af38383e0f
lint
2018-05-08 09:04:53 -04:00
Jonathan Rainville
1fe6f4ee2c
more async
2018-05-08 09:02:46 -04:00
Jonathan Rainville
1d5f015aaa
async some functions
2018-05-08 08:54:10 -04:00
Jonathan Rainville
e85d8b1ae5
fix file writing, now working
2018-05-07 16:33:30 -04:00
Jonathan Rainville
d2d29be334
fix getting web3 location and provider code
2018-05-07 15:48:01 -04:00
Jonathan Rainville
148a74f3d6
make pipeline js in a different process (still doesnt work)
2018-05-07 14:30:30 -04:00
Richard Ramos
3f8450f060
Extra functionality for deciding which elements to include in a graph
2018-05-04 16:17:12 -04:00
Iuri Matias
b1a499cf0e
update template message
2018-05-03 17:32:10 -04:00
Iuri Matias
be7723e077
Merge pull request #392 from embark-framework/bug_fix/whisper-demo
...
Fix Whisper demo
2018-05-02 16:12:33 -04:00
Jonathan Rainville
3266f20a0f
fix glob in windows
2018-05-02 15:48:06 -04:00
Jonathan Rainville
41b2741ba5
add optionnal callback
2018-05-02 12:10:11 -04:00
Iuri Matias
0cffff067a
Merge pull request #390 from embark-framework/features/add-swarm-to-embarkjs
...
Added swarm support in embarkjs, isAvailable for messages/storage, swarm/ipfs checks
2018-05-01 18:52:22 -04:00
Jonathan Rainville
3bf5093f1b
more linting and add condition in case of no hash
2018-05-01 10:20:27 -04:00
Jonathan Rainville
2ad852667e
add early returns and lint
2018-05-01 09:38:13 -04:00
Jonathan Rainville
67c932c77d
fix contracts in dashboard by removing the double evaluation
2018-05-01 09:20:19 -04:00
emizzle
b93b3b4e47
Merge branches 'features/add-swarm-to-embarkjs' and 'features/add-swarm-to-embarkjs' of https://github.com/embark-framework/embark into features/add-swarm-to-embarkjs
2018-05-01 00:06:26 +10:00
emizzle
6ef78ff770
include fix for bug
2018-05-01 00:03:31 +10:00
Jonathan Rainville
0d20d422ce
hotfix for watch not defined
2018-04-30 09:29:31 -04:00
emizzle
72cce7d4d2
Fixes to make lint and tests happy
2018-04-30 22:07:37 +10: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
0dd2938abe
reset watchers after build to make sure files remain watch
2018-04-27 16:34:13 -04:00