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
4669922090
Merge pull request #471 from embark-framework/features/improve-storage-config
...
Improve storage config
2018-06-01 12:07:30 -04:00
9a1eefc838
Merge branch 'develop' into features/improve-storage-config
2018-06-01 12:01:51 -04:00
d2b41be908
Merge pull request #472 from embark-framework/remove_orbit
...
remove orbit
2018-06-01 12:00:07 -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
d29b033a8a
merge in changes from remote
2018-06-01 08:33:01 +10:00
0ab151500d
add id to solc process to avoid multiple callback calls
2018-05-31 13:32:02 -04:00
a8507998d9
update other tests
2018-05-31 11:27:38 -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
7d28cdfd01
Merge pull request #470 from embark-framework/ipfs_cmd_fix
...
register ipfs cmd correctly
2018-05-31 09:46:36 -04:00
2ec94feaec
Merge branch 'features/test-revamp' of https://github.com/embark-framework/embark into features/test-revamp
...
# Conflicts:
# lib/i18n/locales/en.json
# package-lock.json
2018-05-31 08:39:45 -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
Jonathan Rainville
Iuri Matias
Eric Mastro