dae9e4ae7f
Merge pull request #460 from embark-framework/fix_overridecompiler
...
Allow plugins to override core compilers
2018-06-15 16:39:09 -04:00
d77083ee8c
enable syncMode
2018-06-15 16:33:59 -04:00
ad6a6cf328
small fixes to ensure something of a better experience for error reporting on the profiler side
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 15:22:27 -05:00
e9becec515
sorry senior lint
2018-06-15 15:58:19 -04:00
2996f51314
fix watch for simple apps
2018-06-15 15:50:23 -04:00
eb0ccbe7cc
remove useless param
2018-06-15 15:22:06 -04:00
55bd69baa5
rmeove logs
2018-06-15 15:18:39 -04:00
f32ac90e71
enable connecting to ws node in tests
2018-06-15 15:16:55 -04:00
c8c0a5c42f
enable websocket provider
2018-06-15 14:35:50 -04:00
391777d5bf
fix test app config and swap olympic for rinkeby as testnet option
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-15 13:18:37 -05:00
6991215b40
catch error and warn if no provider
2018-06-15 10:04:19 -04:00
24e1ed36f7
Fixed issue with IPFS not starting when swarm failed.
...
Added logging when starting of all storage providers has completed, and whether or not there were errors during starting of one of the providers.
Added parallel processing for starting dappConnection storage providers.
Removed irrelevant IPFS error from trace logs when IPFS not available.
2018-06-15 16:35:05 +10:00
6d4d904825
sort by internal so first ones are internal and plugins last
2018-06-14 16:58:03 -04:00
930aa72bc6
revert original changes, sorry Ramos
2018-06-14 16:57:38 -04:00
dac06c10ea
Change based in code review
2018-06-14 16:29:23 -04:00
02de6089ed
Changed code to allow registering more than one compiler for same ext.
2018-06-14 16:29:23 -04:00
a058fbd349
Removing warning from appveyor
2018-06-14 16:29:23 -04:00
3dd4b2ada9
Verify that compiler for extension hasn't been loaded
2018-06-14 16:29:22 -04:00
dcbd868b78
get gasPrice if no gasPrice set in contract.json
2018-06-14 15:22:50 -04:00
a09f680ca7
fix testnet and olympic network types
2018-06-14 15:22:01 -04:00
9a261681da
Merge pull request #530 from embark-framework/bug_fix/after-deploy-dev
...
Add file build to embark build and fix afterDeploy
2018-06-14 12:11:16 -04:00
502788c7e0
Merge pull request #528 from embark-framework/cached_gas_issue
...
fix cached gas issue
2018-06-14 11:17:54 -04:00
a62a74d162
callback error from runCode and use that in onDeploy codes
2018-06-14 11:10:31 -04:00
a48a05cd27
remove unnended event listeners
2018-06-14 11:03:06 -04:00
d90d591fdc
fix after deploy and build files
2018-06-14 10:39:39 -04:00
50ff4d4a48
Merge pull request #527 from embark-framework/bug_fix/test-app-file-bug
...
Fix watch by not restarting anymore and enable config for contracts
2018-06-14 09:54:12 -04:00
5a2cf62ee5
reload config; create a config so it doens't damage original
2018-06-14 09:22:13 -04:00
be6ada2909
remove old instructions
2018-06-14 09:22:13 -04:00
37b69b43ff
fix watch by not restarting anymore and enable config for contracts
2018-06-14 09:15:31 -04:00
8fe9ccedf2
don't send message if process isn't connected
2018-06-13 14:56:26 -04:00
977b472217
Merge pull request #523 from embark-framework/bug_fix/bad-branch
...
Fix callback already called on file download fail
2018-06-13 14:42:08 -04:00
e1c5487ba4
fix callback already called on file download fail
2018-06-13 14:37:15 -04:00
d44021d7f9
Merge pull request #522 from embark-framework/zombie_fix
...
track if couldn't send message to parent process
2018-06-13 14:23:59 -04:00
f1f4f2520c
reset counter
2018-06-13 14:09:59 -04:00
9219c17924
return process send
2018-06-13 14:00:21 -04:00
a62122a6d3
track if couldn't send message to parent process
2018-06-13 13:53:55 -04:00
8766c9b761
show warning if dependency is not deploying
2018-06-13 13:47:11 -04:00
3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix
...
use neo blessed
2018-06-13 11:44:47 -04:00
06eb0eda95
Merge pull request #517 from embark-framework/package_fix
...
point to a forked npm package (for now), to avoid the npm install iss…
2018-06-13 11:36:12 -04:00
daaee7d828
use neo-blessed
2018-06-13 11:17:55 -04:00
8205f91802
enable loglevel for test logger and actually log
2018-06-13 09:44:19 -04:00
19aa117503
update references to package
2018-06-13 09:40:19 -04:00
735e72703b
Merge pull request #515 from embark-framework/jsonfix
...
fix support for .json file in embark.json
2018-06-12 18:03:43 -04:00
aa01bd37a8
Merge pull request #514 from embark-framework/bug_fix/no-good-file
...
stop test execution if file doesn't exist
2018-06-12 18:01:06 -04:00
5ccbdbb41c
Merge pull request #513 from embark-framework/remove_backtrace
...
remove anoying backtrace
2018-06-12 18:00:02 -04:00
4131cf42ef
fix support for .json file in embark.json
2018-06-12 17:59:14 -04:00
0f84fe2127
fix callback
2018-06-12 15:32:38 -04:00
ef5e1e2707
stop test execution if file doesn't exist
2018-06-12 15:12:50 -04:00
e6ed016cc0
Merge pull request #510 from embark-framework/gastimation
...
Gastimation
2018-06-12 14:11:28 -04:00
e0ff5b3580
remove anoying backtrace
2018-06-12 13:58:21 -04:00
41f77793f4
more patchy mcpatchface
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:54:41 -05:00
3ede75ce50
Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation
2018-06-12 12:52:36 -05:00
258d9b3fe0
patchy mcpatchface
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:52:23 -05:00
a88513f58d
Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation
2018-06-12 13:24:30 -04:00
1dcd30b3a8
don't crash and instead inform user if contract cannot be profiled
2018-06-12 13:24:21 -04:00
acf67071c8
fix name
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:21:31 -05:00
cd67500dd1
minor cleanup
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:16:19 -05:00
539c035aa6
unnecessary declaration
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:14:02 -05:00
a601541bb0
get rid of one more line and get rid of unused cb
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:12:37 -05:00
43c8525d48
fix callbacks in gas estimator, add more fallback support and clean up console logs to better display potential errors
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 12:10:35 -05:00
5b1eeab7ed
make debug a default api option
2018-06-12 12:21:46 -04:00
4ebeb86c3c
Merge pull request #506 from embark-framework/bug_fix/slow-pipeline
...
Speed up the webpack process a little bit
2018-06-12 12:15:02 -04:00
03870953a7
Merge pull request #508 from embark-framework/test_fixes
...
warn if configured account has no funds
2018-06-12 12:10:05 -04:00
79282f8d64
Merge branch 'develop' into bug_fix/slow-pipeline
2018-06-12 12:06:01 -04:00
ad4c79390a
Merge pull request #504 from embark-framework/conn-proxy
...
Proxy for inspecting function calls for contracts and retrieve trx information and display it on console
2018-06-12 12:02:20 -04:00
e0470b8ef4
clean up junk and fix logger formatting
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:44:21 -05:00
335670f2ca
package lock update and linting errors fixed
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:39:45 -05:00
57f098239d
add support for null inputs and fallback and constructor types
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
0ff39f48b3
fix the callback schema for async and pretty it up a bit
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
90f342b65a
redo logic so that it uses the async library
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
5c7e9f0054
changes to the logic around gas estimator and profiler
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
311ec7d9cb
switch the keys around and make a few logical changes to the way things are structured. Currently stuck at method calling
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
fedbe0d2bc
first attempt at gas estimation using a 3 round fuzzer and linking it into the profiler
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-12 10:36:41 -05:00
8f52dd4cf3
Missing semicolon
2018-06-12 10:15:54 -04:00
a9065b1eae
Websocket handling
2018-06-12 08:50:49 -04:00
787162575e
Merge pull request #507 from embark-framework/bug_fix/webpack-piling
...
kill webpack processes when they are done
2018-06-11 17:31:30 -04:00
56724aecd4
lint is king
2018-06-11 17:22:08 -04:00
a50e7c25a9
Not all messages received are json objects
2018-06-11 16:46:57 -04:00
9e92069667
Fixing conflicts
2018-06-11 16:44:34 -04:00
03483052ea
Adding error messages
2018-06-11 16:43:26 -04:00
38e6a9571d
Updating tests
2018-06-11 16:43:26 -04:00
48a3f2afdc
Fixing conflicts
2018-06-11 16:43:08 -04:00
e46f6aa5b7
color output
2018-06-11 16:40:59 -04:00
a4985fde40
make proxy mode the default
2018-06-11 16:40:59 -04:00
80052fc5e1
Displays json as a string in the console
2018-06-11 16:40:59 -04:00
6040509942
Adding line break
2018-06-11 16:40:59 -04:00
f467fc5a31
Launching ipc connection depending on role
2018-06-11 16:40:59 -04:00
09c11662aa
Removing unused variables
2018-06-11 16:40:59 -04:00
0f853ba841
Typo
2018-06-11 16:40:59 -04:00
a669538e70
Adding proxy to config, and closing on error
2018-06-11 16:40:59 -04:00
c9a2014ac7
Formatting input parameters
2018-06-11 16:40:59 -04:00
39d510cef4
Displaying status, gas and block number
2018-06-11 16:40:59 -04:00
8ef2dc124f
Extracted console logging to its own file
2018-06-11 16:40:59 -04:00
c1621c4029
Websocket support
2018-06-11 16:40:59 -04:00
bf25381fa6
Rebasing changes from develop
2018-06-11 16:40:14 -04:00
05f5a145f1
Added proxy to blockchain
2018-06-11 16:38:29 -04:00
84c01c3197
Extracted proxy to its own file
2018-06-11 16:38:29 -04:00
339ffa5869
Adding proxy for simulator
2018-06-11 16:38:29 -04:00
20acb5425f
remove comment
2018-06-11 16:34:41 -04:00
812cefafb1
kill processes when they are over
2018-06-11 15:55:57 -04:00
4aab8cd374
warn if configured account has no funds
2018-06-11 14:39:17 -04:00
046cb46ff4
move requires inside functions that need them
2018-06-11 14:36:52 -04:00
6b26f2a9d7
set default gas
2018-06-11 13:37:06 -04:00
8783f04a9c
add node version of embarkjs to avoid export issues with webpack.. (for now...)
2018-06-10 12:55:59 -04:00
c4ca4e52b8
support embarkjs in the tests
2018-06-10 12:11:34 -04:00
c6e63af12d
remove unneded param
2018-06-08 13:55:24 -04:00
aff1dabb3a
Merge pull request #499 from embark-framework/dont_continue_on_errors
...
Fix tests error reporting when there are deployment errors
2018-06-08 13:02:13 -04:00
7fd7c770de
Merge pull request #501 from embark-framework/bug_fix/storage-message
...
Put message if swarm or ipfs is not installed
2018-06-08 12:55:29 -04:00
cdfa30ebd2
remove listeners correctly
2018-06-08 12:51:04 -04:00
1b6ac99ea2
remove listeners to avoid leaks
2018-06-08 12:30:44 -04:00
33de740fff
Merge pull request #498 from embark-framework/single_test
...
fix from and data options; add single test support
2018-06-08 11:33:14 -04:00
0214447476
tigger build
2018-06-08 11:20:14 -04:00
eecd719515
put message if swarm or ipfs is not installed
2018-06-08 10:40:01 -04:00
46e085b011
lint is king
2018-06-08 09:40:23 -04:00
c8b52a1746
fix errors handling so it doesn't attempt to continue building when there are fatal errors compiling contracts
2018-06-08 07:07:27 -04:00
2efea55d2b
lint is king
2018-06-08 06:17:51 -04:00
ede4926069
don't continue testing file if there was deploy errors; avoids unrelated errors for each 'it'
2018-06-08 06:14:46 -04:00
edbbaa160b
make config params optional
2018-06-07 20:21:01 -04:00
402ee19722
default contracts fields
2018-06-07 20:20:24 -04:00
1c6df9db8d
remove data parameter
2018-06-07 20:20:24 -04:00
c1590d0b48
change deploy to beforeAll, so it takes priority over the test before
2018-06-07 20:20:24 -04:00
8fa7357d07
fix default from and data; add single test spec
2018-06-07 20:20:24 -04:00
dd4088fd08
Merge pull request #480 from embark-framework/bug_fix/solc-loading-issue
...
Updates console to inform user of an ongoing package download.
2018-06-07 19:00:39 -04:00
9f0ab86c2d
Merge pull request #497 from embark-framework/features/test-connect-node
...
Connect to a node in tests
2018-06-07 18:59:27 -04:00
e902c86ed2
conflicts in tests
2018-06-07 16:14:42 -04:00
cbe456bf1e
remove useless config
2018-06-07 16:09:54 -04:00
a6a5bac053
use new provider when using account with a node specified
2018-06-07 16:07:58 -04:00
1b89199f50
fund accounts in wallet using contracts config
2018-06-07 13:06:09 -04:00
9c9bb761a4
add error when using deployAll
2018-06-07 13:01:13 -04:00
a5ecd9f1f4
add tests for getBalance
2018-06-07 13:01:13 -04:00
bb3e87d85e
move getBalance in accountParser
2018-06-07 13:01:12 -04:00
3d70028cc5
fixing small stuff
2018-06-07 13:01:12 -04:00
2a61b2251c
use web3 utils function instead
2018-06-07 13:01:12 -04:00
4ffb5c401f
enable setting balance in mutliple formats
2018-06-07 13:01:12 -04:00
30a8263569
enable using accounts and balances
2018-06-07 13:01:12 -04:00
ac631f90dc
fix missing error callback
2018-06-07 13:01:12 -04:00
bfc8663a61
change account funding order to enable starting a node before
2018-06-07 12:55:07 -04:00
b5ac5626cb
Merge pull request #494 from embark-framework/missing_contract_name
...
add missing variable
2018-06-06 15:58:21 -04:00
c4880535a4
add missing variable
2018-06-06 15:45:16 -04:00
435e5eba03
fix calling back with accounts
2018-06-06 13:54:20 -04:00
60e4f9f07d
Merge pull request #491 from embark-framework/alias_address
...
alias address
2018-06-06 12:16:21 -05:00
a4196be958
alias address
2018-06-06 12:47:16 -04:00
1e4838d25a
Merge pull request #490 from embark-framework/fix_assert
...
make assert global like before
2018-06-06 11:24:27 -04:00
e2f2c84aa2
Merge pull request #489 from embark-framework/avoid_zombies
...
avoid sending messages to disconnected processes
2018-06-06 11:24:16 -04:00
ab20b10d5d
use existing process send to avoid the extra if
2018-06-06 11:09:06 -04:00
6a10ef7187
Merge pull request #488 from embark-framework/default_account_fix
...
fix setting default account
2018-06-06 11:01:55 -04:00
da6572bb11
make assert global like before
2018-06-06 11:00:30 -04:00
805091aa66
Merge pull request #482 from embark-framework/fuzzer
...
Fuzzer
2018-06-06 10:54:28 -04:00
2c2540417c
avoid sending messages to disconnected processes
2018-06-06 10:42:06 -04:00
cd6dcb7548
fix setting default account
2018-06-06 10:39:02 -04:00
7e2f5624ba
Increased time before reporting of library download duration goes red to 4 seconds.
...
Incrased travis build version to node 8, as embark only supports 8.10, and also perf_hooks requires 8.5
2018-06-06 12:04:30 +10:00
bbaf1676fb
Updates console to inform user of an ongoing package download.
...
Console message turns red after 1 second.
2018-06-06 11:39:13 +10:00
f44ed981b5
Merge pull request #481 from embark-framework/ipc
...
add socket support
2018-06-05 16:42:44 -04:00
a41cf99be0
reverse condition
2018-06-05 16:13:17 -04:00
e42cbb4ade
one last change
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 15:07:41 -05:00
95a06e0bf9
formatting fixes
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
one more
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 14:44:05 -05:00
773f5a7921
convert console logs to embark logger and this baby is ready to rock
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 14:16:38 -05:00
a7629d2ac0
fix linting
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:54:43 -05:00
df3c5c2fd0
fix blockchain already booted
2018-06-05 14:39:18 -04:00
ffe26d052a
some changes to the way randomness is calculated and getting rid of unnecessary garbage and added logging
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
28d1d585fe
checkpoint
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
4858f8a19f
convert to BN instead of number
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
2056a7e9ad
finish engine addition
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
a0d0d9692b
flesh it out further and add a console command and fix annoying bugs
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
7812951164
wip
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
f4bca2710f
gas estimator and fuzzer
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-05 13:39:18 -05:00
d3c4f6275c
hotfix for zombie killer
2018-06-05 13:24:16 -04:00
6b941d09d2
fix typo
2018-06-05 12:15:47 -04:00
820fd45c46
remove killer code
2018-06-05 12:14:46 -04:00
e49a474380
Ping parent and die when 3 errors
2018-06-05 12:09:57 -04:00
0e6d526ab4
comply with linter
2018-06-05 08:37:27 -04:00
85443959e0
remove unneded option
2018-06-05 08:04:27 -04:00
c45fdb12df
Improve storage logging (during --loglevel trace)
...
Includes IPFS command run
Includes response from IPFS/Swarm service checks
Includes url being checked during IPFS/Swarm service checks.
2018-06-05 11:39:28 +10:00
c0e559a7d9
assign roles so ipc connections don't conflict; fallback if can't connect to ipc
2018-06-04 18:15:37 -04:00
a57bce2a40
refactor to use callbacks on ipc requests
2018-06-04 18:15:37 -04:00
37ade68804
debug console logs
2018-06-04 18:15:37 -04:00
1821e89346
refactor ipc to a module
2018-06-04 18:15:37 -04:00
6e37c2d91b
only reply to compile action
2018-06-04 18:15:37 -04:00
e96842f9da
use .embark instead of /tmp
2018-06-04 18:15:37 -04:00
b16c06025b
use ipc for compiler
2018-06-04 18:15:37 -04:00
b32c90b56e
compile tests only once
2018-06-04 10:45:50 -04:00
6e424f36b0
use const instead of let
2018-06-02 10:06:58 -04:00
72e24f5e1b
improve loading time by only doing require when needed
2018-06-02 09:54:32 -04:00
74df72fc0d
lint is king
2018-06-01 19:35:41 -04:00
083961fc21
remove unneeded assignments
2018-06-01 19:32:14 -04:00
07e58bcd04
check window size in dashboard instead of index
2018-06-01 19:32:14 -04:00
60c687aa41
refactor storage module
2018-06-01 19:32:14 -04:00
eadbeb0498
use monitor as a service
2018-06-01 19:32:14 -04:00
37d54e22db
refactor services monitor to use events instead of passing addCheck around
2018-06-01 19:32:14 -04:00
0804779a20
don't sync i18n files anymore
2018-06-01 19:31:26 -04:00
0dbefad48b
move requires to methods that actually need them
2018-06-01 19:30:51 -04:00
a3de13e011
refactor to addPluginType
2018-06-01 19:30:51 -04:00
0282e7d71c
Merge pull request #476 from embark-framework/fix_events_limit_issue
...
fix events limit issue
2018-06-01 19:30:23 -04:00
2ade8cfd09
lint is king
2018-06-01 19:12:54 -04:00
17f5bb3905
Merge branch 'develop' into features/test-revamp-multi
2018-06-01 18:14:32 -04:00
152dfe2815
initialize web3 in the whisper module itself; use defined configuration
2018-06-01 18:11:23 -04:00
876a9a3103
fix pipeline not building by removing the `once`s
2018-06-01 15:48:10 -04:00
91b8033ab5
fix using deployedAddress instead of address
2018-06-01 14:12:10 -04:00
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
b727d85358
small fixes
2018-06-01 13:53:09 -04:00
57a194d20d
remove timer
2018-06-01 13:44:54 -04:00
61a518f569
remove initCOnfig in tests because useless
2018-06-01 13:44:54 -04:00
f3d55f6742
patch weird event max listeners bug
2018-06-01 13:44:54 -04:00
73fca42ce1
fix error messages for non deployed contracts
2018-06-01 13:44:54 -04:00
d76ab75c4a
remove initTest
2018-06-01 13:44:54 -04:00
88889a1a9d
update test_app tests
2018-06-01 13:44:53 -04:00
2d1a37d63b
conflict in pakcgae lock
2018-06-01 13:44:49 -04:00
33bd52e9ec
add id to solc process to avoid multiple callback calls
2018-06-01 13:44:35 -04:00
dbb2352928
fix contracts that are instances of
2018-06-01 13:44:14 -04:00
6712fc294c
change another storage test
2018-06-01 13:44:14 -04:00
beb0df8985
make running config() without callback work
2018-06-01 13:44:14 -04:00
ab92457319
fix missing default from
2018-06-01 13:43:48 -04:00
4040c1eec9
use object assign to assign new values to contract
2018-06-01 13:43:48 -04:00
8664570d7c
conflict in test
2018-06-01 13:43:43 -04:00
d0a289a450
conflict in deployManager
2018-06-01 13:42:05 -04:00
b97c85d5f4
conflict in tests
2018-06-01 13:41:12 -04:00
3555575ff9
change another storage test
2018-06-01 13:35:58 -04:00
049af73294
make running config() without callback work
2018-06-01 13:35:58 -04:00
491ff47cf8
conflict in en.json
2018-06-01 13:35:52 -04:00
d647ea791e
fix missing default from
2018-06-01 13:35:18 -04:00
72da3b4a35
use object assign to assign new values to contract
2018-06-01 13:35:18 -04:00
a1d32e72e7
conflict in deployManager
2018-06-01 13:35:15 -04:00
9dcb64bde3
conflict in deployManager
2018-06-01 13:34:23 -04:00
c234655acd
resolve conflict in test.js
2018-06-01 13:33:11 -04:00
723a4ae805
reformat run_test
2018-06-01 13:32:23 -04:00
ed1a2c4ddb
remove timer
2018-06-01 13:31:22 -04:00
10f55910d2
remove initCOnfig in tests because useless
2018-06-01 13:30:08 -04:00
7cab30f4df
patch weird event max listeners bug
2018-06-01 13:29:51 -04:00
9a1eefc838
Merge branch 'develop' into features/improve-storage-config
2018-06-01 12:01:51 -04:00
e5ec461f78
fix error messages for non deployed contracts
2018-06-01 11:30:02 -04:00
eeb88010d5
remove initTest
2018-06-01 11:06:07 -04:00
55df42979f
update test_app tests
2018-06-01 10:48:29 -04:00
f3e7d03204
remove orbit
2018-06-01 10:15:41 -04:00
a112f18d93
always deploy contracts when in tests and make all test work
2018-06-01 10:05:43 -04:00
421f9a4096
Merge in remote
2018-06-01 14:10:54 +10:00
74d5ee3984
small fixes
2018-06-01 14:06:02 +10:00
446f28ed6f
de-dupe en.json
2018-06-01 13:39:00 +10:00
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
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
7aa44c7fe3
Added improvements to storage config
2018-06-01 13:35:11 +10:00
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
6ac8672a31
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:34:49 +10:00
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
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
ec15823dbc
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:28:28 +10:00
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
0ab151500d
add id to solc process to avoid multiple callback calls
2018-05-31 13:32:02 -04:00
ac69f2f9fd
Merge branch 'develop' of https://github.com/embark-framework/embark into develop
2018-05-31 10:38:09 -04:00
75c91992e3
Merge pull request #469 from embark-framework/refactor_contracts_part2
...
Refactor contracts part2
2018-05-31 10:37:43 -04:00
30c6555649
hotfix tag for github urls
2018-05-31 10:37:40 -04:00
9929415da8
remove unneded passing of contracts manager
2018-05-31 10:09:26 -04:00
20d7496980
take into account errors when determining arguments
2018-05-31 10:02:57 -04:00
a0cfe525a9
fix contracts that are instances of
2018-05-31 09:52:37 -04:00
4b4ae66c93
change another storage test
2018-05-31 08:38:25 -04:00
827a3b309f
make running config() without callback work
2018-05-31 08:38:25 -04:00
756d77a9b1
conflict en.json
2018-05-31 08:38:20 -04:00
622f54bda9
fix missing default from
2018-05-31 08:37:21 -04:00
641a77c2dc
use object assign to assign new values to contract
2018-05-31 08:37:21 -04:00
1176a2e8be
make require and test work
2018-05-31 08:37:21 -04:00
093bd13c6a
build only once
2018-05-31 08:37:21 -04:00
41aaa5c20d
conflict package json
2018-05-31 08:37:17 -04:00
68fb70f788
reformat run_test
2018-05-31 08:37:00 -04:00
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
6d77aae6de
Added improvements to storage config
2018-05-31 15:19:09 +10:00
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
0a331e9352
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-05-31 15:18:10 +10:00
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
7ee62adb24
remove unused assignment
2018-05-30 17:30:51 -04:00
b3173c1ff3
register ipfs cmd correctly
2018-05-30 17:22:12 -04:00
b43a766de7
cleanup module call
2018-05-30 13:38:08 -04:00
7d795fa180
remove unused var
2018-05-30 13:38:08 -04:00
4f20d31b4c
add emitAndRunActionsForEvent
2018-05-30 13:38:08 -04:00
45f7767313
remove contracts manager dependency from deploy manager
2018-05-30 13:38:08 -04:00
1d782c0e53
emit contractsDeployed event only
2018-05-30 13:38:08 -04:00
68e6782f49
remove unneded assignment
2018-05-30 13:38:08 -04:00
9b368bc1b3
remove unneeded assignment
2018-05-30 13:38:08 -04:00
1912981d7d
move contract deploy code to contract deployer; move it to events
2018-05-30 13:38:08 -04:00
70f38d863e
fix code generator event
2018-05-30 13:35:36 -04:00
f1cb7d1187
lint is king
2018-05-30 13:35:36 -04:00
69e5af2308
replace beforeAction plugin api with event action api
2018-05-30 13:35:36 -04:00
8458acd207
filter for plugins that have defined properties
2018-05-30 13:35:36 -04:00
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
71cd523f30
remove old methods
2018-05-30 13:35:36 -04:00
16653d491b
move onDeploy to new api
2018-05-30 13:35:36 -04:00
93e5003c64
cleanup
2018-05-30 13:35:36 -04:00
4f45b4fa13
add new plugin method for generalized event actions
2018-05-30 13:35:36 -04:00
f08bb56337
simplify determine args method
2018-05-30 13:35:36 -04:00
cf13f098ac
refactor deploy method
2018-05-30 13:35:36 -04:00
f4010bd66e
remove unnecessary determin params call
2018-05-30 13:35:36 -04:00
8cc86e0b0f
remove legacy events
2018-05-30 13:35:36 -04:00
742632eccf
remove contractsManager dependency
2018-05-30 13:35:36 -04:00
3f9c55131b
use requests instead of contractsManager directly
2018-05-30 13:35:36 -04:00
5f64376c84
refactor generateContractsJson
2018-05-30 13:35:36 -04:00
cf999ce997
refactor runcode to use events instead; remove dependencies
2018-05-30 13:35:36 -04:00
fc92b69211
use self
2018-05-30 13:35:03 -04:00
e35474f726
early return
2018-05-30 13:23:18 -04:00
4db2d40ef5
fix swarm
2018-05-30 12:58:32 -04:00
b5e96beb81
little oopsie
2018-05-30 12:07:48 -04:00
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
b5d9a86680
start blockchain process at false and deploy on ready
2018-05-30 12:00:44 -04:00
138aaf39ff
fix processes on ubuntu
2018-05-30 11:03:33 -04:00
2f3a94f3a1
little fixes
2018-05-30 11:03:33 -04:00
2023689eb2
fix tests
2018-05-30 11:03:33 -04:00
4df669ab52
add more error management to ipfs
2018-05-30 11:03:33 -04:00
d06a7f43ac
fix swarm spawn
2018-05-30 11:03:33 -04:00
c86c50fb4e
boot swarm with spawn
2018-05-30 11:03:33 -04:00
8655b49a39
change ipfs to spawn too
2018-05-30 11:03:33 -04:00
73db1a6133
something en.json
2018-05-30 11:03:33 -04:00
3f671c2fb0
conflict in en.json
2018-05-30 11:03:33 -04:00
d36af9f5e1
fix blockchain start
2018-05-30 11:03:33 -04:00
4e20e82edf
conflict in blockchain
2018-05-30 11:03:33 -04:00
a88ab82261
conflict in blockchain.js
2018-05-30 11:02:01 -04:00
b0a64cc043
use right version
2018-05-30 10:57:25 -04:00
e02648dbef
add error if user uses ipfs 0.4.14 or lower
2018-05-30 10:57:25 -04:00
023d8f7f5f
fix logs
2018-05-30 10:57:25 -04:00
3c7bdbf6cf
set cors domain depending on the webserverConfig
2018-05-30 10:57:25 -04:00
ac7612136e
start storage node on run too
2018-05-30 10:57:25 -04:00
857c7d8c85
small fixes
2018-05-30 10:57:25 -04:00
f08c700151
reverse plugin.js changes
2018-05-30 10:57:25 -04:00
2b54dfd7cc
conflict in en.json
2018-05-30 10:57:25 -04:00
0f07a00791
detect swarm started signal
2018-05-30 10:57:25 -04:00
e67fafdc29
conflict in en.json
2018-05-30 10:57:25 -04:00
bc853ef899
conflict in en.json
2018-05-30 10:57:25 -04:00
70d3e6a46f
conflict en.json
2018-05-30 10:57:25 -04:00
e3a93a6d61
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-30 10:57:25 -04:00
56f25ebba1
clonflict for silent
2018-05-30 10:57:25 -04:00
d969eb0065
fix processes on ubuntu
2018-05-30 10:52:15 -04:00
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
302476e95e
fix simulator preferential treatment
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:19:25 -05:00
cd96aebdcd
early return if failing to connect to node
2018-05-28 17:55:59 -04:00
a7bc9755c3
little fixes
2018-05-28 16:02:44 -04:00
729c43bae1
fix tests
2018-05-28 15:56:03 -04:00
7a754ac97f
add more error management to ipfs
2018-05-28 15:43:27 -04:00
9338b6e37f
fix swarm spawn
2018-05-28 15:37:25 -04:00
52524c2f59
eliminate nasty outdated test
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 13:22:48 -05:00
6c921e3a85
fix typo
2018-05-28 13:58:49 -04:00
1eee68e901
fix typo; default environment to development
2018-05-28 13:53:10 -04:00
6fe3064edd
spelling correction of metamask
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:45:14 -05:00
f34bd5df4f
env check
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:28:38 -05:00
90b42bccb2
template correction to check for development environment and whether metamask is engaged and log that it is
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:27:55 -05:00
7a05a9ac79
boot swarm with spawn
2018-05-28 12:54:06 -04:00
3c32f98f71
change ipfs to spawn too
2018-05-28 12:49:44 -04:00
6fa472ae11
something en.json
2018-05-28 12:31:29 -04:00
033613d7f6
lint is king
2018-05-28 12:29:47 -04:00
45bf11ff2b
conflict in en.json
2018-05-28 11:55:16 -04:00
dd1b01a643
fix blockchain start
2018-05-28 11:54:35 -04:00
3e86e21878
conflict in blockchain
2018-05-28 11:54:31 -04:00
8d9c192e91
fix little oopsie in waterfall
2018-05-28 11:53:35 -04:00
b003675ee8
use right version
2018-05-28 11:53:35 -04:00
33e78a589e
add error if user uses ipfs 0.4.14 or lower
2018-05-28 11:53:35 -04:00
Iuri Matias
Jonathan Rainville
VoR0220
emizzle
Richard Ramos