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
Jonathan Rainville
94c493e854
redeploy with right config on config change
2018-04-27 15:10:24 -04:00
Iuri Matias
5aa05c8094
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
...
Fix adding a contract
2018-04-27 14:08:02 -04:00
Jonathan Rainville
2827deb418
fix on contract add
2018-04-27 13:50:57 -04:00
Jonathan Rainville
4a9ff1fe9d
check if testrpc is installed and warn if not
2018-04-27 09:16:29 -04:00
Iuri Matias
1cfe46db55
intercept logs in the app itself - stopgap fix
2018-04-26 17:19:45 -04:00
Iuri Matias
17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
...
Small fixes for plugin APIs
2018-04-26 17:06:05 -04:00
Iuri Matias
6a3add8e04
Merge pull request #383 from embark-framework/no_contracts
...
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:56:13 -04:00
Iuri Matias
3b736f56a7
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:15:43 -04:00
Jonathan Rainville
d046feb83d
fix a bug where upload cmd used plugin name
2018-04-26 14:00:41 -04:00
Jonathan Rainville
e4566f9f81
add more registers but generation one fails in run
2018-04-26 09:40:41 -04:00
Jonathan Rainville
61be2c7bd7
addFileToPipeline test and registerBeforeDeploy with new arg
2018-04-26 09:40:32 -04:00
Jonathan Rainville
c818326f2e
test add config and contract and add test
2018-04-26 09:40:26 -04:00
Eric Mastro
ef0bcbf405
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.
2018-04-26 21:37:00 +10:00
Eric Mastro
4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm
2018-04-26 19:05:56 +10:00
emizzle
f59a187bce
Removed unused host/port options passed in to the swarm service.
2018-04-26 12:59:57 +10:00
Jonathan Rainville
fba491592d
add function to check if context has specified context
2018-04-25 10:57:23 -04:00
Jonathan Rainville
f39acbdd42
get context from cmd ran and use arrays of contexts
2018-04-25 10:34:17 -04:00
Jonathan Rainville
97e91d4c44
only log loaded plugins in list plugins and warn when plugin is not right
2018-04-24 15:53:19 -04:00
Jonathan Rainville
51c2c8f880
check context and on changing context, load plugins that work
2018-04-24 14:42:56 -04:00
Jonathan Rainville
52d0c5a8dd
stop tests when deploy fails
2018-04-24 10:19:01 -04:00
emizzle
cc30ff390e
Implemented PR review changes
...
* Removed config init from `cmd.js` for upload.
* refactored `upload()` to use engine services instead of loading and using plugins directly.
* now passing web3 directly to the `Swarm` constructor
2018-04-24 10:27:11 +10:00
Iuri Matias
16909c7f1a
if version name doesn't have /, then just use the full name
2018-04-23 12:14:48 -04: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
ade2ad1a67
comply with linter
2018-04-20 19:59:47 -04:00
Iuri Matias
a63aa2ea0f
remove commented line; use beta 34
2018-04-20 19:58:16 -04:00
Iuri Matias
41f04234d0
clean up
2018-04-20 19:52:51 -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
c212a9b90c
make sure all file names are using forward slashes
2018-04-20 13:40:41 -04:00
Jonathan Rainville
d48c971471
improve url regexes
2018-04-20 12:04:27 -04:00
Jonathan Rainville
c1bed28c00
code and test importing the http contract
2018-04-20 11:39:17 -04:00
Jonathan Rainville
9bf06aebce
refacotr how we handle files already parsed
2018-04-20 10:03:03 -04:00
Jonathan Rainville
abc89b2015
add code to parse all files to check for http imports
2018-04-20 09:52:13 -04:00
emizzle
c05915b0e9
swarm deploy refactored to use web3.bzz instead of command line
...
* `Embark.upload()` refactored to build own `Engine` and services so `web3` could be passed to `Swarm` module
* `Swarm.deploy()` modified to use `web3.bzz.upload()`
* needs detection of running swarm node
2018-04-20 17:39:45 +10:00
Jonathan Rainville
9cdcc4f6d4
add code to import in solcP
2018-04-19 15:25:26 -04:00
Jonathan Rainville
60fb6b14d4
downlaod import files
2018-04-19 15:25:26 -04:00
Jonathan Rainville
05b1f61c9b
download files in full path of url
2018-04-19 15:25:26 -04:00
Jonathan Rainville
6c5415b27f
base code for import parse
2018-04-19 15:25:26 -04:00
Iuri Matias
e1a9023bb2
Merge pull request #370 from embark-framework/feature/log-level-as-argument
...
Support setting log level as an argument
2018-04-19 13:03:00 -04:00
emizzle
09ca551a22
Add --loglevel validation for `run` and `build`
2018-04-19 14:43:41 +10:00
emizzle
96495b99c3
Support setting log level as an argument
...
* Add loglevel and logfile switch to `embark build`
* Support existing `loglevel` and `logfile` switch for `embark run/upload`
* make casing consistent for `loglevel` and `logfile`
* remove passing engine to `build()` and instead pass needed objects in options.
* prevent duplicate plugin initiation (above point)
* allow `Events` object to be passed to `Engine` constructor and `init()`
* prevent echo of upload commands to allow interception and control via logging
2018-04-19 14:25:43 +10: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
b931efcf7d
fix dir in contractsDirectory
2018-04-18 12:59:58 -04:00
Jonathan Rainville
9faf644c31
add loading in file.js but includes a patch to fix
2018-04-18 12:09:42 -04:00
Jonathan Rainville
ce34d40fe7
integrate downloadCOntract function in contract get function
2018-04-18 09:07:39 -04:00
Jonathan Rainville
2568ec1aec
implement the download function
2018-04-17 16:34:37 -04:00
Jonathan Rainville
cf14b3784f
add getUrl function for external contracts + tests
2018-04-17 15:07:00 -04:00
Iuri Matias
e5ae6bc86e
Merge pull request #367 from embark-framework/refactor/vyper-utils
...
Refactor Vyper compiler
2018-04-17 11:35:38 -04:00
Jonathan Rainville
6f119eeb1b
move vyper contract compile to static util function
2018-04-17 11:25:46 -04:00
emizzle
d985a5ed69
Fixing `--logLevel` option for `embark run`
...
Intercepting logs for embark run and including logLevel for displayed logs.
2018-04-17 16:17:59 +10:00
emizzle
a3d2cc9a2c
Moved console "ready" message to write after outputDone event is emitted
2018-04-17 14:11:22 +10:00
Jonathan Rainville
dd1c10fe85
remove useless waterfall
2018-04-16 13:11:55 -04:00
Iuri Matias
ad136802da
Merge pull request #365 from embark-framework/bug_fix/fix-versions-with-spaces
...
Fix versions with spaces and add warning
2018-04-16 12:07:02 -04:00
Jonathan Rainville
891a4e0a0f
fix versions with spaces and add warning
2018-04-16 11:38:46 -04:00
Eric Mastro
8bdf79b19a
Handling for error during build.
2018-04-15 20:31:26 +10:00
Eric Mastro
8fc978eb50
* Removed duplicated code to build and deploy contracts and replaced with a call to the build function.
...
* Updated upload functions to use async `exec` and removed returns from the callbacks.
2018-04-15 20:31:16 +10:00
Eric Mastro
c1c61de2d5
Passed in success messaging to async callback.
2018-04-15 20:31:08 +10: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
Eric Mastro
6b7af4b647
#156326148 Build contracts and dapp before upload.
2018-04-15 20:30:52 +10:00
Jonathan Rainville
99c04b405f
fix clas name and bytecode
2018-04-13 15:48:19 -04:00
Jonathan Rainville
17e1c71506
submit contract for deployment, not working yet
2018-04-13 14:59:01 -04:00
Jonathan Rainville
dc9e6c168b
start vyper implementation
2018-04-13 14:59:01 -04:00
Jonathan Rainville
7d8c7b119c
add warning after compile for files without a compatible compiler
2018-04-13 14:59:01 -04:00
Jonathan Rainville
6647c31d38
hotfix: callback with wrong parameter order
2018-04-13 14:54:46 -04:00
Iuri Matias
82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts
...
Graphviz contracts
2018-04-13 11:29:23 -04:00
Iuri Matias
b56f20db8a
Merge pull request #359 from embark-framework/node_module_import
...
better mappings
2018-04-12 20:41:52 -04:00
Iuri Matias
5ed1e787b2
print error if contract file is not found
2018-04-12 20:30:20 -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
e0ab9cbde4
refactor findImports
2018-04-12 17:57:55 -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
emizzle
4a9b52e5df
Removed annoying [Object object] from the log that was appearing during contract compilation.
...
The warnings in object that were attempted to be logged were already being logged in a previous loop, so this was simply removed.
2018-04-12 13:47:34 +10:00
Iuri Matias
e0982e0427
Merge pull request #355 from embark-framework/bug_fix/node_name
...
restore properly display node name and version
2018-04-11 08:06:42 -04:00
Iuri Matias
282067649c
Merge pull request #356 from embark-framework/bug_fix/fix-tests-in-windows
...
Fix tests breaking because of line-endings
2018-04-10 17:08:27 -04:00
Jonathan Rainville
e90cead578
fix tests breaking because of line-endings
2018-04-10 16:38:49 -04:00
Jonathan Rainville
6905698bcc
fix swarm upload too
2018-04-10 16:02:59 -04:00
Iuri Matias
9d261472f9
extract node name and version (so it displays just like in 2.6.0)
2018-04-10 15:14:00 -04:00
Iuri Matias
044759ef52
get node name and version
2018-04-10 15:08:08 -04:00
Jonathan Rainville
e731495109
fix upload on windows
2018-04-10 14:17:59 -04:00
Jonathan Rainville
2907510b6e
fix arrows in ipfs get by using ipfsConnection.get
2018-04-10 13:33:13 -04:00
RJ Catalano
586ecd00c8
Merge pull request #352 from embark-framework/bug_fix/async_log_fix
...
Fix console.dir messing up the console
2018-04-09 16:22:02 -05:00
Jonathan Rainville
3ecb195b38
move import list out of loop to accelerate build process
2018-04-09 16:29:49 -04:00
Jonathan Rainville
f37b09a371
fix build process on windows
2018-04-09 16:14:07 -04:00
Iuri Matias
3a89b3f951
intercept dir and pass it to the logger
2018-04-09 15:24:01 -04:00
Richard Ramos
f56b42d91f
Linting
2018-04-05 11:41:28 -04:00
Richard Ramos
d038ed414d
Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts
2018-04-05 11:35:19 -04:00
Iuri Matias
5a91b2d44a
remove unneeded require
2018-04-02 15:32:09 -04:00
Iuri Matias
2ec7589f90
refactor to use dappPath
2018-04-02 15:30:16 -04:00
Iuri Matias
e0db5ed61a
refactor to use dappPath
2018-04-02 15:06:56 -04:00
Iuri Matias
10f7d21f81
fix tests, enable blockchain component by default
2018-04-02 14:44:55 -04:00
Iuri Matias
d3b0787895
eslint is king
2018-03-31 21:15:53 -04:00
Iuri Matias
02e407f90b
completly disable opted-out components
2018-03-31 21:08:25 -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
fffde9d4b6
tolerate lack of addCheck which means is not running in dashboard mode
2018-03-30 10:59:31 -04:00
Iuri Matias
4c82f309e0
add --simple option
2018-03-29 19:42:47 -04:00
Iuri Matias
a8e22ec45c
move demo and boilerplate to a templates folder
2018-03-29 19:23:24 -04:00
Iuri Matias
8b326d86db
fix typo in cmd description
2018-03-29 18:12:07 -04:00
Iuri Matias
324ba904e8
usd cwd instead of pwd
2018-03-26 15:26:37 -04:00
Iuri Matias
d5a21d579c
fallback to shelljs if pwd is empty (windows issue)
2018-03-26 15:08:07 -04:00
Iuri Matias
4b0925d425
fallback to shelljs if pwd is empty (windows issue)
2018-03-26 14:54:47 -04:00
Richard Ramos
0326890abe
Fix: Relationship was incorrect
2018-03-23 11:39:42 -04:00
Richard Ramos
58b5ea329e
Styles for contract instances
2018-03-23 11:37:56 -04:00
Richard Ramos
7dcae55b8b
Added events to graph and fixed problems in IDE
2018-03-23 10:02:23 -04:00
Richard Ramos
403f2daee2
Added relationships between contracts
2018-03-23 10:02:23 -04:00
Richard Ramos
01eaa0fe7f
Generating basic diagram that includes methods
2018-03-23 10:02:23 -04:00
Richard Ramos
d7b33a309b
Changed logic of deploy manager to be able to only compile the code and not deploy it
2018-03-23 10:02:23 -04:00
Richard Ramos
9e469cc83e
Initial commit for graphviz functionality
...
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
2018-03-23 10:02:23 -04:00
Iuri Matias
df765ed056
fix version issue causing a contract to be undefined due to a pipeline error
2018-03-22 15:36:20 -04:00
Iuri Matias
9582efbe65
fix logger call
2018-03-15 17:18:20 -04:00
Iuri Matias
c1d258b819
add events to logger
2018-03-15 16:44:05 -04:00
Iuri Matias
89616537b8
refactor command handler
2018-03-15 16:38:20 -04:00
Iuri Matias
cd9c3c8317
return cmd result in executeCmd callback
2018-03-15 16:34:30 -04:00
Iuri Matias
6479bf816b
only deploy configured contracts in the tests
2018-03-11 08:28:03 -04:00
Iuri Matias
83227beaa1
add option to specify a logfile to output the logs
2018-03-10 13:45:56 -05:00
Iuri Matias
c456c405c4
update tests
2018-03-10 12:52:37 -05:00
Iuri Matias
b7b5f1b365
move services state event call to monitor itself
2018-03-10 12:46:02 -05:00
Iuri Matias
05aadc5c10
support specifying contract args as an object
2018-03-04 20:07:39 -05:00
Iuri Matias
a03be15c4a
display in logs contracts with address specified in the config
2018-03-04 19:23:02 -05:00
Iuri Matias
33b42dd9c1
detect invalid addresses
2018-03-04 19:18:39 -05:00
Iuri Matias
ac79cef97b
fix 337; support contract references in array arguments
2018-03-04 18:46:12 -05:00
Iuri Matias
da7e5747f9
report error message instead of array
2018-03-02 18:01:48 -05:00
Iuri Matias
66a3388a9d
fix error reporting for wrong params
2018-03-02 17:48:30 -05:00
Iuri Matias
af9e27e078
fix ipfs service check
2018-03-02 17:25:59 -05:00
Iuri Matias
13e759bfee
support setting protocol in config; fix getUrl
2018-03-02 16:57:55 -05:00
Iuri Matias
bde067aabf
support specifying ipfs protocol in the storage provider
2018-03-02 11:02:52 -05:00
Iuri Matias
59678dd1fa
remove commented out lines
2018-02-28 18:23:07 -05:00
Iuri Matias
3c1156fc64
fix function identation
2018-02-28 18:14:41 -05:00
Iuri Matias
5ee99a1e5a
refactor: join duplicated code
2018-02-28 18:09:10 -05:00
Iuri Matias
62d4dd456d
restore pipeline plugin
2018-02-28 17:45:39 -05:00
Iuri Matias
a231f11062
fix issue with repeating console input
2018-02-27 19:19:04 -05:00
Iuri Matias
531af6234b
refactor console cmd exec
2018-02-27 19:19:00 -05:00
Iuri Matias
eb6236da65
add command handler for console cmd
2018-02-27 19:18:52 -05:00
Iuri Matias
445133cfdf
move setStatus from logger to event bus
2018-02-27 15:49:21 -05:00
Iuri Matias
66e9d6afa3
move contractsState from logger to event bus
2018-02-27 15:40:05 -05:00
Iuri Matias
96df409229
comply with linter
2018-02-24 09:26:43 -05:00
Iuri Matias
349807496a
improve directory copying
2018-02-23 20:36:11 -05:00
Iuri Matias
bb00987427
remove unneded msg when processing files in development
2018-02-23 19:37:42 -05:00
Iuri Matias
511b61c6c5
fix preset requires
2018-02-23 18:24:46 -05:00
Iuri Matias
8d255137d9
fix js error reporting
2018-02-23 14:04:08 -05:00
Iuri Matias
20f4e7621b
fix imports issue
2018-02-22 14:56:55 -05:00
Iuri Matias
9cd8449014
fix directory copying
2018-02-22 11:45:22 -05:00
Carl Larson
11b4c9b4c4
check if document already interactive (DOMContentLoaded won't fire if already interactive)
2018-02-22 12:32:01 +00:00
Iuri Matias
41baca4b51
don't redeploy if an asset has been changed and not a contract
2018-02-21 18:43:34 -05:00
Iuri Matias
ed530e8511
fix issue in which some files were not triggered change event
2018-02-21 14:04:08 -05:00
Iuri Matias
9df0ee9554
fix issue in which some files were not triggered change event
2018-02-21 13:51:48 -05:00
Iuri Matias
3b60793b25
remove old jshint directives
2018-02-07 19:49:54 -05:00
Iuri Matias
a8222df1eb
support ws providers
2018-02-07 19:41:11 -05:00
Iuri Matias
1c45d215ce
check error severity besides the type
2018-02-07 19:40:59 -05:00
Iuri Matias
7a7330e695
update solidity module to use compileStandard and the standard json
2018-01-27 15:07:48 -05:00
Iuri Matias
5c5ef44f2f
update tests
2018-01-23 19:36:02 -05:00
Heikki Hakala
6a229f2386
Revert "Add networkType rinkeby"
...
This reverts commit fd70689bec
.
2018-01-23 10:00:53 +02:00
Heikki Hakala
6b664fbfa8
Add light and fast from blockchain config
2018-01-22 09:57:35 +02:00
Heikki Hakala
fd70689bec
Add networkType rinkeby
2018-01-22 09:53:53 +02:00
Iuri Matias
639612579b
if no env present just return final object
2018-01-20 09:01:18 -05:00
Iuri Matias
b19194fc6b
refactor config code
2018-01-19 22:08:39 -05:00
Iuri Matias
10c4c75236
move tests related files to their own folder
2018-01-19 21:13:20 -05:00
Iuri Matias
f35718b6c0
error if account index is not found
2018-01-19 20:38:28 -05:00
hodlbank
776f07dc23
[*] Fixing #319 : option to use particular account for contract deployment.
2018-01-20 00:56:05 +00:00
Iuri Matias
5c0c7b45a5
remove old code
2018-01-19 13:59:39 -05:00
Iuri Matias
5300aa479b
better gas estimation
2018-01-19 13:57:35 -05:00
Iuri Matias
a6013b518c
remove extra comment
2018-01-19 11:18:31 -05:00
Iuri Matias
992b8c19e7
fix callback name
2018-01-18 14:46:53 -05:00
Iuri Matias
70f72f494d
refactor deployContract method
2018-01-18 14:41:33 -05:00
hodlbank
2a88bb8cde
[*] Fixed eslint warnings.
...
[+] Added proper asyncCallback for async.waterfall().
2018-01-17 23:34:38 +00:00
hodlbank
ffe9af74bb
Merge branch 'beforeDeploy' into develop
2018-01-17 23:08:22 +00:00
hodlbank
07c6be968a
[+] Added beforeDeploy handlers.
...
[+] Plugins can call embark.registerBeforeDeploy() to register beforeDeploy handlers.
2018-01-17 23:04:19 +00:00
Iuri Matias
d09b94a5db
refactor pipeline to remove duplicated code
2018-01-17 15:29:34 -05:00
Iuri Matias
80e8f6323a
display error when there is a unknown compilation error
2018-01-17 15:09:19 -05:00
Iuri Matias
ed8fe3a951
remove console logs
2018-01-17 14:55:22 -05:00
Iuri Matias
f4d2f5346d
import react bootstrap
2018-01-17 13:16:43 -05:00
Iuri Matias
7e8a594bf9
update tests
2018-01-17 11:29:30 -05:00
Iuri Matias
7b58a770d9
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2018-01-17 11:24:26 -05:00
Iuri Matias
32d63514bf
increase default gas value; add parameters
2018-01-17 11:23:32 -05:00
Iuri Matias
5985e6bea1
Merge pull request #326 from hodlbank/develop
...
Fixing issue #324 : add options to configure simulator's mnemonic and …
2018-01-17 10:13:10 -05:00
Iuri Matias
4d1368f388
fix lint; update tests
2018-01-17 10:04:11 -05:00
Iuri Matias
be1c5badd8
improve full support for es6
2018-01-16 19:17:52 -05:00
hodlbank
8471d8fa0f
Fixing issue #324 : add options to configure simulator's mnemonic and block time.
2018-01-15 21:55:28 +00:00
Iuri Matias
a322d03053
support external node in tests
2018-01-15 09:51:45 -05:00
Iuri Matias
ea8f3a2232
improve gas handling and errors
2018-01-13 11:38:10 -05:00
Iuri Matias
ef0bc04f77
clean up; fix gas requirements
2018-01-12 18:36:29 -05:00
Iuri Matias
e2aa46eac8
define default account for each contract
2018-01-12 18:06:51 -05:00
Iuri Matias
7cac969f16
default to boilerplate blockchain settings
2018-01-12 17:16:46 -05:00
Iuri Matias
4ab01744c6
update demo app
2018-01-12 16:33:16 -05:00
Iuri Matias
728aea6e04
fix imports issue
2018-01-12 14:21:36 -05:00
Iuri Matias
61c00819ec
add reset cmd
2018-01-11 09:22:58 -05:00
Iuri Matias
9fd39f36ba
add websocket config to blockchain config
2018-01-11 08:55:28 -05:00
Iuri Matias
82681fec8f
support versioning ipfs-api
2018-01-10 11:15:32 -05:00
Iuri Matias
59642b4160
fix web3 versioning
2018-01-10 10:43:25 -05:00
Iuri Matias
7a5e5947ee
cleanup
2018-01-05 15:34:31 -05:00
Iuri Matias
11ba67bb34
cleanup
2018-01-05 15:33:53 -05:00
Iuri Matias
a0fca8950d
cleanup
2018-01-05 15:32:32 -05:00
Iuri Matias
4fcfc6c142
update whisper check
2018-01-05 15:30:52 -05:00
Iuri Matias
59c3d82260
update web3.js
2018-01-05 15:10:47 -05:00
Iuri Matias
ae28df8f8e
display error & warning when choosing an unexistant file
2018-01-03 13:44:35 -05:00
Iuri Matias
569734a80d
re-add npm install for embark demo
2018-01-03 12:42:38 -05:00
Iuri Matias
0e502c1537
refactor service check
2017-12-30 21:44:59 -05:00
Iuri Matias
fe186a4443
move module js code to its own folder
2017-12-30 21:02:46 -05:00
Iuri Matias
37a126a6b8
move old code to a separate file
2017-12-30 20:42:52 -05:00
Iuri Matias
f4e81da630
refactor whisper code; separate old version
2017-12-30 20:09:46 -05:00
Iuri Matias
7e38a239b7
fix package name listener
2017-12-30 19:34:15 -05:00
Iuri Matias
1c38f3fb89
move lib
2017-12-30 18:25:59 -05:00
Iuri Matias
2f3abc37b7
use module command to get solc version
2017-12-30 18:12:16 -05:00
Iuri Matias
c7f8698e58
refactor events handler so it can handle multiple args
2017-12-30 17:51:52 -05:00
Iuri Matias
3e1f16c673
update tests
2017-12-30 17:07:13 -05:00
Iuri Matias
11af38268b
refactor: get versions from module instead of config
2017-12-30 16:48:53 -05:00
Iuri Matias
dee49ec5ed
add createPlugin; move cmds to library managers
2017-12-30 15:52:51 -05:00
Iuri Matias
947373eafc
remove unnecessary if
2017-12-29 18:35:47 -05:00
Iuri Matias
3fb02befea
comply with linter
2017-12-29 18:33:11 -05:00
Iuri Matias
92de2904f1
move webserver cmds to module
2017-12-29 18:29:56 -05:00
Iuri Matias
411ed41c84
fix console cmds api
2017-12-29 18:21:36 -05:00
Iuri Matias
b29e865cd6
extract to method duplicated code
2017-12-29 16:29:32 -05:00
Iuri Matias
d1a207941d
take into account available providers list
2017-12-29 16:11:45 -05:00
Iuri Matias
cb5230f569
comply with linter
2017-12-29 08:46:01 -05:00
Iuri Matias
f00fa1c4aa
refactor; flatten property list
2017-12-29 08:26:31 -05:00
Iuri Matias
4c1adf258b
refactor: add method to get directly property
2017-12-29 08:08:04 -05:00
Iuri Matias
8956992950
extract communication provider
2017-12-28 18:10:43 -05:00
Iuri Matias
9ca337eeb1
extract storage provider
2017-12-28 17:42:25 -05:00
Iuri Matias
9f40958e6a
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-28 13:54:22 -05:00
Iuri Matias
fc24b04bf6
comply with linter
2017-12-28 13:13:30 -05:00
Iuri Matias
310712567f
move whisper to a module
2017-12-28 12:40:11 -05:00
Iuri Matias
e833ebd019
move ipfs embarkjs code to module
2017-12-28 12:16:50 -05:00
Iuri Matias
ab5d3722b9
fix issue where contract was being deployed everytime when gas config was set; catch errors on individual onDeploy cmds
2017-12-28 08:27:20 -05:00
Iuri Matias
36d7890cfc
fix cyclic error when contract is actually just referring to itself
2017-12-28 08:26:02 -05:00
Iuri Matias
1f95418504
use for to avoid multiple callback calls
2017-12-28 07:30:41 -05:00
Iuri Matias
8de81c33bd
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-28 07:00:17 -05:00
Iuri Matias
24c34fcbe3
refactor setProvider
2017-12-27 21:04:12 -05:00
Iuri Matias
17a7dcf3e6
remove unsupported whisper protocol msg
2017-12-27 20:58:14 -05:00
Iuri Matias
a568835ceb
separate components; extract ipfs; add register method
2017-12-27 19:10:05 -05:00
Iuri Matias
174ba8ec9b
add more cmd line options to sim
2017-12-27 17:48:33 -05:00
Iuri Matias
aad78cc130
fix/improve error handling
2017-12-27 13:07:13 -05:00
Iuri Matias
750eace6ce
always define contract code so ondeploy cmds work
2017-12-27 11:40:21 -05:00
Iuri Matias
cff999def8
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-27 08:21:15 -05:00
Iuri Matias
eaf9016c79
move ipfs service check to its module
2017-12-26 20:32:51 -05:00
Iuri Matias
50f1072372
move upload to its own module
2017-12-26 19:55:42 -05:00
Iuri Matias
49d693dc1a
use givenProvider instead of currentProvider
2017-12-26 09:07:57 -05:00
Iuri Matias
cd0fd94386
updatests; include options
2017-12-22 13:07:43 -05:00
Iuri Matias
16afb4e405
implemet afterDeploy cmds
2017-12-21 11:21:36 -05:00
Iuri Matias
7cdba7e4e3
throw exception when finding CyclingDependencyError
2017-12-20 14:58:59 -05:00
Iuri Matias
52953a1d0d
warn about cycling dependencies
2017-12-20 14:54:47 -05:00
Iuri Matias
eb43fa2526
add onDeploy cmds to contract depedencies
2017-12-20 14:30:01 -05:00
Iuri Matias
281ebc643d
update & fix onDeploy
2017-12-20 14:09:35 -05:00
Iuri Matias
d005d3f668
fix on deploy
2017-12-20 11:32:11 -05:00
Iuri Matias
d2ccfa3145
suggest parent name instead of same contract
2017-12-20 09:41:12 -05:00
Iuri Matias
25d99bcf2f
fix linting error
2017-12-19 15:48:56 -05:00
Iuri Matias
02634d0bda
warn is terminal window is too small
2017-12-19 15:14:09 -05:00
Iuri Matias
535340794b
warn of contract typos
2017-12-19 14:07:48 -05:00
Iuri Matias
c63c9b8728
warn user of typos
2017-12-19 13:29:48 -05:00
Iuri Matias
bc34e00268
better errors when parsing invalid json
2017-12-19 12:57:03 -05:00
Iuri Matias
9404bfb2cc
don't attempt to link contract if it's not in the code
2017-12-19 11:13:27 -05:00
Iuri Matias
a99ee73ef8
add version command
2017-12-19 10:20:05 -05:00
Iuri Matias
6a27559de4
update linter rule
2017-12-19 09:54:39 -05:00
Iuri Matias
799da089af
refactor webserver code
2017-12-19 09:50:29 -05:00
Iuri Matias
76be683ed2
refactor webserver
2017-12-18 09:37:16 -05:00
Iuri Matias
8360295ed0
warn if server is already running or not
2017-12-17 19:18:35 -05:00
Iuri Matias
14d330a729
fix webserver service check
2017-12-17 18:58:55 -05:00
Iuri Matias
113bb25142
add webserver start/stop cmd
2017-12-17 18:34:41 -05:00
Iuri Matias
9efd29ec9e
add to help exit cmd
2017-12-16 18:16:53 -05:00
Iuri Matias
81f06bc984
include ipfs version in versions cmd
2017-12-16 18:15:44 -05:00
Iuri Matias
65ae827350
Merge branch 'mds' into develop
2017-12-16 17:55:38 -05:00
Iuri Matias
8999d619c5
update tests
2017-12-16 17:55:27 -05:00
Iuri Matias
158fb1414a
re-use same package if already downloaded
2017-12-16 17:36:52 -05:00
Iuri Matias
67dd4a22cb
update tests
2017-12-16 17:10:11 -05:00
Iuri Matias
ce6c570634
use utils joinPath instead of path.join
2017-12-16 17:10:11 -05:00
Iuri Matias
ce4f75ddc4
extract solc to its own module
2017-12-16 17:08:18 -05:00
Iuri Matias
f90321a23e
warn user if attempting to download package without internet connection
2017-12-16 17:05:37 -05:00
Iuri Matias
b764ecf4d6
fix logger call
2017-12-16 12:48:59 -05:00
Iuri Matias
9d78f995e8
refactor download
2017-12-16 12:44:52 -05:00
Iuri Matias
a216aa980f
extract tar extraction code
2017-12-16 12:23:02 -05:00
Iuri Matias
8e62a1f2e9
clean up
2017-12-16 12:01:45 -05:00
Iuri Matias
130b37f6fd
minor refactor
2017-12-16 11:48:20 -05:00
Iuri Matias
7e1493c039
clean up
2017-12-16 11:45:29 -05:00
Iuri Matias
26b070b27f
minor refactor: simplify options setting
2017-12-16 11:11:29 -05:00
Iuri Matias
fb8d3c4c0a
refactor availableServices
2017-12-16 10:54:17 -05:00
Iuri Matias
a76dbb69b9
tolerate lack of blockchain config file
2017-12-16 08:48:37 -05:00
Iuri Matias
747237de76
fix defaults when contracts config file is not present
2017-12-16 08:12:38 -05:00
Iuri Matias
e093ff5b30
refactor utils http get
2017-12-15 22:15:24 -05:00
Iuri Matias
301ba94ef6
refactor httpGet
2017-12-15 22:11:55 -05:00
Iuri Matias
e88b51bdfd
add err arg
2017-12-15 22:06:33 -05:00
Iuri Matias
510bc2c542
refactor httpsGet
2017-12-15 22:05:38 -05:00
Iuri Matias
bee4d0e1f2
extract file download
2017-12-15 21:53:11 -05:00
Iuri Matias
c4e13f9ea8
minor refactor on setprovider code
2017-12-15 18:02:50 -05:00
Iuri Matias
d42a34b342
comply with eslint
2017-12-15 17:30:29 -05:00
Iuri Matias
1666be1158
fix contract directories config
2017-12-15 17:14:00 -05:00
Iuri Matias
68886d7095
add error for reference issues
2017-12-15 16:39:13 -05:00
Iuri Matias
cfaccb307b
throw error when target lib is not found
2017-12-15 16:18:19 -05:00
Iuri Matias
7c33720c98
fix onDeploy cmds
2017-12-15 15:50:42 -05:00
Iuri Matias
0a4a757af8
fix deploy intention so interfaces can be detected automatically
2017-12-14 16:16:51 -05:00
Iuri Matias
34cec58f32
cleanup
2017-12-14 15:27:19 -05:00
Iuri Matias
1cb6581fde
better display error contract deployment errors in the dashbord
2017-12-14 15:03:08 -05:00
Iuri Matias
c55b011675
fix eslint issues
2017-12-13 20:15:57 -05:00
Iuri Matias
2c8f049f4a
remove unused import
2017-12-13 19:51:34 -05:00
Iuri Matias
bed7e7afc6
clean up
2017-12-13 19:49:59 -05:00
Iuri Matias
9211279f8e
fix eslint issues
2017-12-13 19:49:05 -05:00
Iuri Matias
6098d3cca6
add alias for exit cmd
2017-12-13 19:31:16 -05:00
Iuri Matias
ccb77051f8
import bootstrap in test_app
2017-12-13 19:24:20 -05:00
Iuri Matias
4106531bd7
warn user when IPFS comes back online
2017-12-13 18:15:59 -05:00
Iuri Matias
d32d5f50bd
check if geth command exists and warn user if not
2017-12-13 17:58:07 -05:00
Iuri Matias
19d061e5f3
remove commented out line
2017-12-13 17:25:29 -05:00
Iuri Matias
e2dcad07ce
update tests
2017-12-13 16:28:23 -05:00
Iuri Matias
0b00f99f09
include ipfs lib in embarkjs
2017-12-13 15:53:29 -05:00
Iuri Matias
3ddd492e83
refactor building web3 obj
2017-12-13 15:53:29 -05:00
Iuri Matias
c160ac616f
refactor building web3 obj
2017-12-13 15:53:29 -05:00
Iuri Matias
a174b94702
move basic import so it's always available
2017-12-13 15:53:29 -05:00
Iuri Matias
99a66a05ef
import web3 object on contract import
2017-12-13 15:53:29 -05:00
Iuri Matias
b7b5fae2c8
imports with shared web3 object
2017-12-13 15:53:29 -05:00
Iuri Matias
92e22ea519
support special imports
2017-12-13 15:53:29 -05:00
Iuri Matias
038f57e7d2
fix new index example
2017-12-13 15:53:29 -05:00
Iuri Matias
3d36aaaeb3
support both old system and imports in the pipeline
2017-12-13 15:53:29 -05:00
Iuri Matias
33711c8db2
support imports
2017-12-13 15:53:29 -05:00
Iuri Matias
aa0f774f1d
Merge branch 'release/2.6.0' into develop
2017-12-13 12:17:29 -05:00
Iuri Matias
daba3b9319
remove extra character in template causing issues with the console
2017-12-13 11:38:36 -05:00
Iuri Matias
58cf9ca78d
take into account config in ipfs service check
2017-12-07 10:26:17 -05:00
Iuri Matias
be64d2ff6b
fix IPFS dependency
2017-12-06 11:37:44 -05:00
Iuri Matias
e2cbc2a488
fix linting issues
2017-12-05 18:14:46 -05:00
Antonio Tenorio Fornés
4bb77ae8d5
Merge branch 'develop' into buildFixes
2017-10-24 20:56:57 +02:00
Iuri Matias
2690ada62d
Merge branch 'next' into develop
2017-10-22 09:47:11 -04:00
Iuri Matias
05ebefff9a
downgrade to 0.4.17
2017-10-22 09:44:32 -04:00
Iuri Matias
f3a8e68c60
Merge branch 'next' into develop
2017-10-22 08:37:24 -04:00
Iuri Matias
38b1cf480e
update solc version
2017-10-21 15:17:54 -04:00
Iuri Matias
398aff3af7
fix multiple issues with multiple file writes
2017-10-21 14:21:18 -04:00
Iuri Matias
8c1b9b56cf
update bundle; don't double add shh option
2017-10-21 08:42:29 -04:00
Iuri Matias
a18fb65e53
Merge branch 'next' into develop
2017-10-19 19:16:18 -04:00
Iuri Matias
e23e4bc417
add blockchain ws config support; fix whisper provider setting
2017-10-19 18:55:49 -04:00
Iuri Matias
dd8135445d
Merge branch 'next' into develop
2017-10-17 07:03:54 -04:00